Changeset 60677 in webkit

Timestamp:

Jun 4, 2010 6:26:15 AM (14 years ago)

Author:

Simon Hausmann

Message:

[Qt] Compilation fails when compiling against Qt 4.7 and Qt Mobility is installed
​https://bugs.webkit.org/show_bug.cgi?id=40116

Reviewed by Tor Arne Vestbø.

CONFIG += mobility has the side-effect of pulling in mobility includes, which conflict
with Qt 4.7's bearer managenent includes and break the build.

• WebCore.pro:

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• WebCore.pro (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-06-04  Simon Hausmann  <simon.hausmann@nokia.com>
+
+        Reviewed by Tor Arne Vestbø.
+
+        [Qt] Compilation fails when compiling against Qt 4.7 and Qt Mobility is installed
+        https://bugs.webkit.org/show_bug.cgi?id=40116
+
+        CONFIG += mobility has the side-effect of pulling in mobility includes, which conflict
+        with Qt 4.7's bearer managenent includes and break the build.
+
+        * WebCore.pro:
+
 2010-06-04  Vangelis Kokkevis  <vangelis@chromium.org>
 

trunk/WebCore/WebCore.pro

@@ -2622 +2622 @@
         platform/network/qt/NetworkStateNotifierQt.cpp
 
-    CONFIG += mobility
-    MOBILITY += bearer
+    # Bearer management is part of Qt 4.7, so don't accidentially
+    # pull in Qt Mobility when building against >= 4.7
+    !greaterThan(QT_MINOR_VERSION, 6) {
+        CONFIG += mobility
+        MOBILITY += bearer
+    }
 }