aboutsummaryrefslogtreecommitdiffstats
path: root/sources
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@qt.io>2017-11-08 09:56:52 +0100
committerFriedemann Kleint <Friedemann.Kleint@qt.io>2017-11-08 10:26:57 +0000
commit187f6caf08a015f3fad67813ca5206cdb826982e (patch)
treec192d5d7cc655004ac44c164f99810329e5354fd /sources
parent772b459cbeead82fda12e7d59a33f57c0cebbc72 (diff)
Build QtConcurrent and QtScripttools with MSVC, too
Change-Id: I38e8c16c0602b5dbf71dbe3a872630104fabfdb0 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'sources')
-rw-r--r--sources/pyside2/CMakeLists.txt14
1 files changed, 2 insertions, 12 deletions
diff --git a/sources/pyside2/CMakeLists.txt b/sources/pyside2/CMakeLists.txt
index c4b97e86..d7d17f27 100644
--- a/sources/pyside2/CMakeLists.txt
+++ b/sources/pyside2/CMakeLists.txt
@@ -255,12 +255,7 @@ COLLECT_MODULE_IF_FOUND(PrintSupport essential)
COLLECT_MODULE_IF_FOUND(Sql essential)
COLLECT_MODULE_IF_FOUND(Network essential)
COLLECT_MODULE_IF_FOUND(Test essential)
-if(NOT MSVC)
- # right now this does not build on windows
- COLLECT_MODULE_IF_FOUND(Concurrent essential)
-else()
- set(DISABLE_QtConcurrent 1)
-ENDIF()
+COLLECT_MODULE_IF_FOUND(Concurrent essential)
if(UNIX AND NOT APPLE)
COLLECT_MODULE_IF_FOUND(X11Extras essential)
endif()
@@ -280,12 +275,7 @@ COLLECT_MODULE_IF_FOUND(Qml opt)
COLLECT_MODULE_IF_FOUND(Quick opt)
COLLECT_MODULE_IF_FOUND(QuickWidgets opt)
COLLECT_MODULE_IF_FOUND(Script opt)
-if(NOT MSVC)
- # right now this does not build on windows
- COLLECT_MODULE_IF_FOUND(ScriptTools opt)
-else()
- set(DISABLE_QtScriptTools 1)
-ENDIF()
+COLLECT_MODULE_IF_FOUND(ScriptTools opt)
COLLECT_MODULE_IF_FOUND(Svg opt)
find_package(Qt5UiTools)
if(Qt5UiTools_FOUND)