diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2017-11-13 11:45:52 +0100 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2017-11-13 11:45:54 +0100 |
| commit | d2deced6471f7314ca8d4e64531054047f7515dc (patch) | |
| tree | 244a7780923e56a5ec92b1f15222eb15badcd575 /sources/pyside2 | |
| parent | f78cc32299aa34069c64ae8f48163ac4eda560d5 (diff) | |
| parent | fa1c97fc2a7f25fe178b0c180b56f78ac00bc4c9 (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.9
Change-Id: Ib0f638130d21a5619f239a9fb8beb7d92ad8d0e8
Diffstat (limited to 'sources/pyside2')
| -rw-r--r-- | sources/pyside2/CMakeLists.txt | 14 | ||||
| -rw-r--r-- | sources/pyside2/tests/QtWidgets/qstandarditemmodel_test.py | 16 |
2 files changed, 8 insertions, 22 deletions
diff --git a/sources/pyside2/CMakeLists.txt b/sources/pyside2/CMakeLists.txt index e880a3e69..859771c0e 100644 --- a/sources/pyside2/CMakeLists.txt +++ b/sources/pyside2/CMakeLists.txt @@ -253,12 +253,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() @@ -278,12 +273,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(TextToSpeech opt) COLLECT_MODULE_IF_FOUND(Charts opt) COLLECT_MODULE_IF_FOUND(Svg opt) diff --git a/sources/pyside2/tests/QtWidgets/qstandarditemmodel_test.py b/sources/pyside2/tests/QtWidgets/qstandarditemmodel_test.py index 2e9d260a3..6ab60e730 100644 --- a/sources/pyside2/tests/QtWidgets/qstandarditemmodel_test.py +++ b/sources/pyside2/tests/QtWidgets/qstandarditemmodel_test.py @@ -32,18 +32,14 @@ import sys from PySide2.QtGui import QStandardItemModel, QStandardItem from PySide2.QtWidgets import QWidget try: - # the normal call with installed PySide2 + # The normal import statement when PySide2 is installed. from PySide2 import shiboken2 as shiboken except ImportError: - try: - # When running make test on macOS, shiboken2 is not part of the PySide2 module, - # so it needs to be imported as a standalone module. - import shiboken2 as shiboken - except ImportError: - # sys.path is set a bit weird during tests, so we help a little to find shiboken2. - sys.path.append("../../..") - # the special call with testrunner.py - from shiboken2.shibokenmodule import shiboken2 as shiboken + # When running make test in shiboken build dir, or when running testrunner.py, + # shiboken2 is not part of the PySide2 module, so it needs to be imported as a standalone + # module. + import shiboken2 as shiboken + from helper import UsesQApplication |