From c32c3d81365d4e50dc3ada11d6203983e6c7fdc4 Mon Sep 17 00:00:00 2001 From: Andras Becsi Date: Thu, 9 Jun 2011 16:38:57 +0200 Subject: Fix the in-tree build by not letting qtbase.pri add explicitlib or staticlib to CONFIG. Reviewed by Andreas Kling --- src/3rdparty/webkit/Source/WebKit/qt/QtWebKit.pro | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/3rdparty/webkit/Source/WebKit/qt/QtWebKit.pro b/src/3rdparty/webkit/Source/WebKit/qt/QtWebKit.pro index 105a124..643c32f 100644 --- a/src/3rdparty/webkit/Source/WebKit/qt/QtWebKit.pro +++ b/src/3rdparty/webkit/Source/WebKit/qt/QtWebKit.pro @@ -72,6 +72,11 @@ CONFIG(release):!CONFIG(standalone_package) { CONFIG(QTDIR_build) { include($$QT_SOURCE_TREE/src/qbase.pri) + # The following lines are to prevent qmake from adding the jscore, webcore and webkit2 libs to libQtWebKit's prl dependencies. + # The compromise we have to accept by disabling explicitlib is to drop support to link QtWebKit and QtScript + # statically in applications (which isn't used often because, among other things, of licensing obstacles). + CONFIG -= explicitlib + CONFIG -= staticlib } else { DESTDIR = $$OUTPUT_DIR/lib symbian: TARGET =$$TARGET$${QT_LIBINFIX} -- cgit v0.12