aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@qt.io>2022-10-17 16:13:31 +0200
committerFriedemann Kleint <Friedemann.Kleint@qt.io>2022-10-18 05:36:39 +0000
commitfc0ffccded01bdad293b4520c07811fde940dab0 (patch)
tree0af8d3feb41004793e6dfaed06dd80992b6ca1a2
parent4ba104eeb242111eb0d9dac0bf6b255fa9d070a3 (diff)
Fix building QtUiTools without Qt Designer
Pick-to: 6.4 Fixes: PYSIDE-2087 Change-Id: Ib2531d2db0116b8d1b52c1732ac5e730b33f4a12 Reviewed-by: Adrian Herrmann <adrian.herrmann@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
-rw-r--r--sources/pyside6/CMakeLists.txt6
1 files changed, 3 insertions, 3 deletions
diff --git a/sources/pyside6/CMakeLists.txt b/sources/pyside6/CMakeLists.txt
index c24777f36..926f5aff8 100644
--- a/sources/pyside6/CMakeLists.txt
+++ b/sources/pyside6/CMakeLists.txt
@@ -14,11 +14,11 @@ if(Qt${QT_MAJOR_VERSION}Qml_FOUND)
add_subdirectory(libpysideqml)
endif()
-find_package(Qt${QT_MAJOR_VERSION}Designer)
-if(Qt${QT_MAJOR_VERSION}UiTools_FOUND AND Qt${QT_MAJOR_VERSION}Designer_FOUND)
+if(Qt${QT_MAJOR_VERSION}UiTools_FOUND)
add_subdirectory(plugins/uitools)
+ find_package(Qt${QT_MAJOR_VERSION}Designer)
# PYSIDE-535: Enable when PyPy supports embedding
- if (NOT PYPY_VERSION)
+ if (Qt${QT_MAJOR_VERSION}Designer_FOUND AND NOT PYPY_VERSION)
add_subdirectory(plugins/designer)
endif()
endif()