diff options
author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2018-03-02 16:46:00 +0100 |
---|---|---|
committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2018-03-02 16:05:05 +0000 |
commit | 2e4508871fc03ca28240a05451bec2cb09d406ce (patch) | |
tree | 9763475264f45efdbe01dbf109701d7874d214bf /sources | |
parent | 095fd339a238fe2ad5ec6080119882436d95fde3 (diff) |
Revert "Temporarily disable building of Qt3D for Qt >= 5.10"
Change qt3d/352dacc0040f77345ab2f6e9019ff68ba2ed354e has made
it up to the dev branch and the qt5.git integration succeeded,
so, Qt 3D can be re-enabled.
This reverts commit 52ac602d7b25dc31e681dcddc0b6dc9452fa4f59.
Task-number: PYSIDE-487
Change-Id: I4b95a7050f03786a08e4fb14c1bb332ca0281db4
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'sources')
-rw-r--r-- | sources/pyside2/CMakeLists.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sources/pyside2/CMakeLists.txt b/sources/pyside2/CMakeLists.txt index b16bcb55e..aadefb818 100644 --- a/sources/pyside2/CMakeLists.txt +++ b/sources/pyside2/CMakeLists.txt @@ -316,7 +316,7 @@ if(WIN32) list(APPEND ALL_OPTIONAL_MODULES AxContainer) endif() list(APPEND ALL_OPTIONAL_MODULES WebChannel WebEngineWidgets WebKit WebKitWidgets WebSockets) -if (Qt5Core_VERSION VERSION_GREATER 5.9.3 AND Qt5Core_VERSION VERSION_LESS 5.10.0) # Depending on fixes in Qt3D +if (Qt5Core_VERSION VERSION_GREATER 5.9.3) # Depending on fixes in Qt3D list(APPEND ALL_OPTIONAL_MODULES 3DCore 3DRender 3DInput 3DLogic 3DAnimation 3DExtras) endif() |