Bug 40116

Summary: [Qt] Compilation fails when compiling against Qt 4.7 and Qt Mobility is installed
Product: WebKit Reporter: Christian Kamm <christian.d.kamm>
Component: WebKit QtAssignee: Simon Hausmann <hausmann>
Status: CLOSED FIXED    
Severity: Major CC: hausmann, ossy
Priority: P2 Keywords: Qt, QtTriaged
Version: 528+ (Nightly build)   
Hardware: All   
OS: All   
Attachments:
Description Flags
[Qt] Compilation fails when compiling against Qt 4.7 and Qt Mobility is installed vestbo: review+, vestbo: commit-queue+

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