Changeset 79072 in webkit

Timestamp:

Feb 18, 2011 7:25:55 PM (13 years ago)

Author:

commit-queue@webkit.org

Message:

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

Reviewed by Kenneth Rohde Christiansen.

Avoided UiTools dependency if the module is not present.

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

• Source/WebKit.pri:

Location:

trunk

Files:

• ChangeLog (modified) (1 diff)
• Source/WebKit.pri (modified) (1 diff)

trunk/ChangeLog

@@ +1 @@
+2011-02-18  Kristian Amlie  <kristian.amlie@nokia.com>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        Avoided UiTools dependency if the module is not present.
+
+        [Qt] WebKit patches required to work with a modularized version of Qt
+        https://bugs.webkit.org/show_bug.cgi?id=53916
+
+        * Source/WebKit.pri:
+
 2011-02-18  Ryuan Choi  <ryuan.choi@samsung.com>
 

trunk/Source/WebKit.pri

@@ -101 +101 @@
 ####
 
-disable_uitools: DEFINES *= QT_NO_UITOOLS
+contains(QT_CONFIG, modular):!contains(QT_CONFIG, uitools)|disable_uitools: DEFINES *= QT_NO_UITOOLS
 
 !contains(QT_CONFIG, modular) {