Details
Description
This causes QtUiTools not to be available, and subsequently a build of FreeCAD to fail.
diff --git a/sources/pyside2/CMakeLists.txt b/sources/pyside2/CMakeLists.txt index 929a06db..d74b64f1 100644 --- a/sources/pyside2/CMakeLists.txt +++ b/sources/pyside2/CMakeLists.txt @@ -240,9 +240,11 @@ ENDIF() COLLECT_MODULE_IF_FOUND(TextToSpeech opt) COLLECT_MODULE_IF_FOUND(Charts opt) COLLECT_MODULE_IF_FOUND(Svg opt) +find_package(Qt5Designer) if(Qt5Designer_FOUND) COLLECT_MODULE_IF_FOUND(UiTools opt) else() set(DISABLE_QtUiTools 1) endif() COLLECT_MODULE_IF_FOUND(WebChannel opt) @@ -356,7 +358,6 @@ endif() add_subdirectory(libpyside) find_package(Qt5UiTools) -find_package(Qt5Designer) if(Qt5UiTools_FOUND AND Qt5Designer_FOUND) add_subdirectory(plugins) endif()
Commit cbff5054c0ae3cc645164c05b450190c024d0839
Attachments
For Gerrit Dashboard: PYSIDE-552 | ||||||
---|---|---|---|---|---|---|
# | Subject | Branch | Project | Status | CR | V |
203383,5 | Fix QtUiTools not to depend on Qt5Designer being present | 5.6 | pyside/pyside-setup | Status: MERGED | +2 | 0 |