summaryrefslogtreecommitdiff
path: root/Tools
diff options
context:
space:
mode:
authorAshish Kulkarni <kulkarni.ashish@gmail.com>2014-12-17 16:12:52 +0530
committerAshish Kulkarni <kulkarni.ashish@gmail.com>2015-01-08 17:52:08 +0100
commita4449b1209fbcdbe936bfd692804a0be831c7b4f (patch)
tree9063f178f9f6b2771c7c136862d7ae5ad51481c4 /Tools
parent6f6582e0310058efddf0bbda842e5ef67754b124 (diff)
downloadqtwebkit-a4449b1209fbcdbe936bfd692804a0be831c7b4f.tar.gz
enable static compilation for Windows
This is enabled only for MinGW and MSVC 2013, which have been tested for both 32 and 64-bit builds. Change-Id: Idced2887b4608bed4c086a4f8912251384eef5be Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
Diffstat (limited to 'Tools')
-rw-r--r--Tools/qmake/mkspecs/features/configure.prf2
1 files changed, 1 insertions, 1 deletions
diff --git a/Tools/qmake/mkspecs/features/configure.prf b/Tools/qmake/mkspecs/features/configure.prf
index 1434dc132..40362e932 100644
--- a/Tools/qmake/mkspecs/features/configure.prf
+++ b/Tools/qmake/mkspecs/features/configure.prf
@@ -121,7 +121,7 @@ defineTest(finalizeConfigure) {
production_build:blackberry|qnx {
addReasonForSkippingBuild("Build not supported on BB10/QNX yet.")
}
- !gnu_thin_archives:contains(QT_CONFIG, static) {
+ !gnu_thin_archives:!win32-msvc2013:!mingw:contains(QT_CONFIG, static) {
addReasonForSkippingBuild("QtWebKit cannot be built as a static library on this platform. Check your configuration in qtbase/config.summary.")
}
winrt: addReasonForSkippingBuild("QtWebKit is not supported on Windows Phone/Windows RT")