diff options
| author | Allan Sandfeld Jensen <allan.jensen@digia.com> | 2014-03-18 13:20:12 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-03-19 11:36:08 +0100 |
| commit | fef642ef67e2dd8d44dcf4ec175d9613910aa78f (patch) | |
| tree | 6b8d75db7deca70f653f50b8c92db17b870a090b | |
| parent | ae824cf4ffb6e6f6863f3efbbe460e7743e00a76 (diff) | |
| download | qtwebkit-fef642ef67e2dd8d44dcf4ec175d9613910aa78f.tar.gz | |
Fix static builds
Disable WebKit2 since WTF from qtdeclarative conflicts with ours,
and renable use of thin archives for static builds, except only use
it for the intermediate staticlibs.
Change-Id: Iee625c5d25f01d1700d4c89028578e4d1288e2ba
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
| -rw-r--r-- | Source/WebKit/qt/WebCoreSupport/QWebFrameAdapter.h | 2 | ||||
| -rw-r--r-- | Tools/qmake/mkspecs/features/configure.prf | 5 | ||||
| -rw-r--r-- | Tools/qmake/mkspecs/features/default_post.prf | 2 | ||||
| -rw-r--r-- | Tools/qmake/mkspecs/features/default_pre.prf | 2 |
4 files changed, 9 insertions, 2 deletions
diff --git a/Source/WebKit/qt/WebCoreSupport/QWebFrameAdapter.h b/Source/WebKit/qt/WebCoreSupport/QWebFrameAdapter.h index 4cca4d7a5..e5cd4a6bb 100644 --- a/Source/WebKit/qt/WebCoreSupport/QWebFrameAdapter.h +++ b/Source/WebKit/qt/WebCoreSupport/QWebFrameAdapter.h @@ -22,6 +22,8 @@ #include "FrameLoaderClientQt.h" #include "PlatformEvent.h" +#include "PlatformExportMacros.h" + #if ENABLE(ORIENTATION_EVENTS) && HAVE(QTSENSORS) #include "qorientationsensor.h" #endif // ENABLE(ORIENTATION_EVENTS). diff --git a/Tools/qmake/mkspecs/features/configure.prf b/Tools/qmake/mkspecs/features/configure.prf index f0ceba512..e0e6e17ee 100644 --- a/Tools/qmake/mkspecs/features/configure.prf +++ b/Tools/qmake/mkspecs/features/configure.prf @@ -104,6 +104,11 @@ defineTest(finalizeConfigure) { WEBKIT_CONFIG -= $$WEBKIT_TOOLS_CONFIG build_tests } + static { + CONFIGURE_WARNINGS += "QtWebKitQml will not be build. It is not supported with static linking" + WEBKIT_CONFIG -= build_webkit2 build_minibrowser build_wtr + } + print_defaults { log(DEFINES: $$configDefines()$${EOL}) error(Done computing defaults) diff --git a/Tools/qmake/mkspecs/features/default_post.prf b/Tools/qmake/mkspecs/features/default_post.prf index dfcf73187..2dbb50cfa 100644 --- a/Tools/qmake/mkspecs/features/default_post.prf +++ b/Tools/qmake/mkspecs/features/default_post.prf @@ -271,7 +271,7 @@ contains(TEMPLATE, lib) { # system already takes care of this for the top level QtWebKit library. !qt_install_module:debug_and_release: TARGET = $$qtLibraryTarget($$TARGET) - gnu_thin_archives { + staticlib:gnu_thin_archives { # Replace the hardcoded archiver command line # options to use GNU ar's thin archive format. AR_COMMAND = $$split(QMAKE_AR, " ") diff --git a/Tools/qmake/mkspecs/features/default_pre.prf b/Tools/qmake/mkspecs/features/default_pre.prf index 829a0e814..38443a4f3 100644 --- a/Tools/qmake/mkspecs/features/default_pre.prf +++ b/Tools/qmake/mkspecs/features/default_pre.prf @@ -95,7 +95,7 @@ CONFIG += include_webinspector contains(QT_CONFIG, c++11): CONFIG += c++11 # Limit the creation of thin archives to Linux, since only GNU's ar supports it. -!debug_and_release:linux-g++*:!contains(QT_CONFIG, static) CONFIG += gnu_thin_archives +!debug_and_release:linux-g++*: CONFIG += gnu_thin_archives # Pick up Qt's defaults for debug/release/debug_and_release if(win32|mac):!macx-xcode { |