Changeset 79848 in webkit

Timestamp:

Feb 28, 2011 3:06:46 AM (13 years ago)

Author:

commit-queue@webkit.org

Message:

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:

Location:

trunk

Files:

• ChangeLog (modified) (1 diff)
• Source/WebKit/qt/ChangeLog (modified) (1 diff)
• Source/WebKit/qt/qt_webkit_version.pri (modified) (1 diff)
• Source/sync.profile (added)

trunk/ChangeLog

@@ +1 @@
+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>
 

trunk/Source/WebKit/qt/ChangeLog

@@ +1 @@
+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>
 

trunk/Source/WebKit/qt/qt_webkit_version.pri

@@ -3 +3 @@
 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.")
+}