Bug 40116 - [Qt] Compilation fails when compiling against Qt 4.7 and Qt Mobility is installed
Summary: [Qt] Compilation fails when compiling against Qt 4.7 and Qt Mobility is insta...
Status: CLOSED FIXED
Alias: None
Product: WebKit
Classification: Unclassified
Component: WebKit Qt (show other bugs)
Version: 528+ (Nightly build)
Hardware: All All
: P2 Major
Assignee: Simon Hausmann
URL:
Keywords: Qt, QtTriaged
Depends on:
Blocks:
 
Reported: 2010-06-03 05:51 PDT by Christian Kamm
Modified: 2011-04-19 05:15 PDT (History)
2 users (show)

See Also:


Attachments
[Qt] Compilation fails when compiling against Qt 4.7 and Qt Mobility is installed (1.38 KB, patch)
2010-06-04 05:40 PDT, Simon Hausmann
vestbo: review+
vestbo: commit-queue+
Details | Formatted Diff | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Christian Kamm 2010-06-03 05:51:36 PDT
Since bearer management is contained in Qt 4.7, there's no need to pull in the legacy Qt Mobility Bearer Management code too. 

Patch: 
in WebCore/WebCore.pro
@@ -2494,9 +2494,6 @@ contains(DEFINES, ENABLE_QT_BEARER=1) {
 
     SOURCES += \
         platform/network/qt/NetworkStateNotifierQt.cpp
-
-    CONFIG += mobility
-    MOBILITY += bearer
 }
 
 contains(DEFINES, ENABLE_SVG=1) {

The deleted code had no effect if no mobility.prf was installed; but if it was installed though, it broke the build.
Comment 1 Simon Hausmann 2010-06-04 05:40:45 PDT
Created attachment 57866 [details]
[Qt] Compilation fails when compiling against Qt 4.7 and Qt Mobility is installed
Comment 2 Simon Hausmann 2010-06-04 06:26:43 PDT
Committed r60677: <http://trac.webkit.org/changeset/60677>
Comment 3 Simon Hausmann 2010-06-04 08:05:53 PDT
Revision r60677 cherry-picked into qtwebkit-2.0 with commit 6db5de6d18c3ab8b74809303e4d79abacfc570a8