diff options
| author | Andras Becsi <abecsi@webkit.org> | 2011-06-09 14:38:57 (GMT) |
|---|---|---|
| committer | Andras Becsi <abecsi@webkit.org> | 2011-06-09 14:38:57 (GMT) |
| commit | c32c3d81365d4e50dc3ada11d6203983e6c7fdc4 (patch) | |
| tree | 7ccd5f5b78a85e01dccace44655c14628ea1ddfe | |
| parent | 22a5430be94a29804b8674b1e630d09095cd9cf9 (diff) | |
| download | Qt-c32c3d81365d4e50dc3ada11d6203983e6c7fdc4.zip Qt-c32c3d81365d4e50dc3ada11d6203983e6c7fdc4.tar.gz Qt-c32c3d81365d4e50dc3ada11d6203983e6c7fdc4.tar.bz2 | |
Fix the in-tree build by not letting qtbase.pri add explicitlib or staticlib to CONFIG.
Reviewed by Andreas Kling
| -rw-r--r-- | src/3rdparty/webkit/Source/WebKit/qt/QtWebKit.pro | 5 |
1 files changed, 5 insertions, 0 deletions
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} |