2011-02-28 Kristian Amlie <kristian.amlie@nokia.com>

        Reviewed by Andreas Kling.

        Added full webkit module profile and a syncqt profile.

        This is for modularized Qt.

        [Qt] WebKit patches required to work with a modularized version of Qt
        https://bugs.webkit.org/show_bug.cgi?id=53916

        * Source/sync.profile: Added.
2011-02-28  Kristian Amlie  <kristian.amlie@nokia.com>

        Reviewed by Andreas Kling.

        Added full webkit module profile and a syncqt profile.

        This is for modularized Qt.

        [Qt] WebKit patches required to work with a modularized version of Qt
        https://bugs.webkit.org/show_bug.cgi?id=53916

        * qt_webkit_version.pri:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@79848 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/ChangeLog b/ChangeLog
index cd15fd0cf5e759e23ff794751f3bd1cee28f56b3..a97a22ef5f51ed9218e8f0833aa7f556f42e857a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2011-02-28  Kristian Amlie  <kristian.amlie@nokia.com>
+
+        Reviewed by Andreas Kling.
+
+        Added full webkit module profile and a syncqt profile.
+
+        This is for modularized Qt.
+
+        [Qt] WebKit patches required to work with a modularized version of Qt
+        https://bugs.webkit.org/show_bug.cgi?id=53916
+
+        * Source/sync.profile: Added.
+
 2011-02-26  Dihan Wickremasuriya  <dihan.wickremasuriya@nokia.com>
 
         Reviewed by Laszlo Gombos.

diff --git a/Source/WebKit/qt/ChangeLog b/Source/WebKit/qt/ChangeLog
index 7898033e2a16ba2419cf6bbc163144e9fbeee96f..cb474eac1b05c3cf4b2bfac12ccd0a94fcb6c75f 100644 (file)
--- a/Source/WebKit/qt/ChangeLog
+++ b/Source/WebKit/qt/ChangeLog
@@ -1,3 +1,16 @@
+2011-02-28  Kristian Amlie  <kristian.amlie@nokia.com>
+
+        Reviewed by Andreas Kling.
+
+        Added full webkit module profile and a syncqt profile.
+
+        This is for modularized Qt.
+
+        [Qt] WebKit patches required to work with a modularized version of Qt
+        https://bugs.webkit.org/show_bug.cgi?id=53916
+
+        * qt_webkit_version.pri:
+
 2011-02-27  Aparna Nandyal  <aparna.nand@wipro.com>
 
         Reviewed by Antonio Gomes.

diff --git a/Source/WebKit/qt/qt_webkit_version.pri b/Source/WebKit/qt/qt_webkit_version.pri
index 4147d8f5dbca18f022c5cacb7c08215eea9725be..9f6ba20e2df12baa3087e774cb40316f563a7f29 100644 (file)
--- a/Source/WebKit/qt/qt_webkit_version.pri
+++ b/Source/WebKit/qt/qt_webkit_version.pri
@@ -2,4 +2,15 @@ QT_WEBKIT_VERSION = 4.9.0
 QT_WEBKIT_MAJOR_VERSION = 4
 QT_WEBKIT_MINOR_VERSION = 9
 QT_WEBKIT_PATCH_VERSION = 0
-QT_CONFIG += webkit
+
+QT.webkit.name = QtWebKit
+QT.webkit.includes = $$QT_MODULE_INCLUDE_BASE $$QT_MODULE_INCLUDE_BASE/QtWebKit
+QT.webkit.sources = $$QT_MODULE_BASE
+QT.webkit.libs = $$QT_MODULE_LIB_BASE
+QT.webkit.depends = core gui opengl network xmlpatterns script phonon
+
+!contains(QT_CONFIG, modular)|contains(QT_ELIGIBLE_MODULES, webkit) {
+    QT_CONFIG += webkit
+} else {
+    warning("Attempted to include $$QT.webkit.name in the build, but it was not enabled in configure.")
+}

diff --git a/Source/sync.profile b/Source/sync.profile
new file mode 100644 (file)
index 0000000..d456bff
--- /dev/null
+++ b/Source/sync.profile
@@ -0,0 +1,17 @@
+%modules = ( # path to module name map
+    "QtWebKit" => "$basedir/WebCore",
+);
+%moduleheaders = ( # restrict the module headers to those found in relative path
+    "QtWebKit" => "../WebKit/qt/Api",
+);
+%classnames = (
+);
+%mastercontent = (
+    "core" => "#include <QtCore/QtCore>\n",
+    "gui" => "#include <QtGui/QtGui>\n",
+    "network" => "#include <QtNetwork/QtNetwork>\n",
+    "script" => "#include <QtScript/QtScript>\n",
+);
+%modulepris = (
+    "QtWebKit" => "$basedir/WebKit/qt/qt_webkit_version.pri",
+);