From a8302ac65c8c8e4b55a3f9addbf8db7186774118 Mon Sep 17 00:00:00 2001 From: "hausmann@webkit.org" Date: Fri, 4 Jun 2010 13:26:15 +0000 Subject: [PATCH] [Qt] Compilation fails when compiling against Qt 4.7 and Qt Mobility is installed https://bugs.webkit.org/show_bug.cgi?id=40116 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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: git-svn-id: http://svn.webkit.org/repository/webkit/trunk@60677 268f45cc-cd09-0410-ab3c-d52691b4dbfc --- WebCore/ChangeLog | 12 ++++++++++++ WebCore/WebCore.pro | 8 ++++++-- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog index 7c81597446f..60970b363d5 100644 --- a/WebCore/ChangeLog +++ b/WebCore/ChangeLog @@ -1,3 +1,15 @@ +2010-06-04 Simon Hausmann + + 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 Reviewed by Dimitri Glazkov. diff --git a/WebCore/WebCore.pro b/WebCore/WebCore.pro index 22cfa3ac55d..c6f79c37c1e 100644 --- a/WebCore/WebCore.pro +++ b/WebCore/WebCore.pro @@ -2621,8 +2621,12 @@ contains(DEFINES, ENABLE_QT_BEARER=1) { SOURCES += \ 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 + } } contains(DEFINES, ENABLE_SVG=1) { -- GitLab