diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2024-03-25 10:20:03 +0100 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2024-04-09 09:05:11 +0200 |
| commit | f619b4c45b042c3a656a80b57cb4f154ef15bd1a (patch) | |
| tree | b17adfd7c0f0bd9984a464380c49a1215f4db2c2 /sources/pyside6/PySide6/QtQuickControls2 | |
| parent | 7cea5aad257b12b34c8fec89cc4750fe0f3c4bbb (diff) | |
Fix building without QtOpenGL
Introduce a CMake macro to either add the dependency
or an entry to the dropped items for typesystem parsing.
Pick-to: 6.7
Fixes: PYSIDE-2649
Change-Id: Idb4e6d530075ab8c08c92e2e26d4de1bfd0459cf
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
Diffstat (limited to 'sources/pyside6/PySide6/QtQuickControls2')
| -rw-r--r-- | sources/pyside6/PySide6/QtQuickControls2/CMakeLists.txt | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/sources/pyside6/PySide6/QtQuickControls2/CMakeLists.txt b/sources/pyside6/PySide6/QtQuickControls2/CMakeLists.txt index 2cb95de98..72c046a57 100644 --- a/sources/pyside6/PySide6/QtQuickControls2/CMakeLists.txt +++ b/sources/pyside6/PySide6/QtQuickControls2/CMakeLists.txt @@ -3,6 +3,8 @@ project(QtQuickControls2) +set (QtQuickControls2_DROPPED_ENTRIES) + set(QtQuickControls2_SRC ${QtQuickControls2_GEN_DIR}/qquickstyle_wrapper.cpp # module is always needed @@ -14,14 +16,12 @@ set(QtQuickControls2_include_dirs ${QtQuickControls2_SOURCE_DIR} ${QtQml_SOURCE_DIR} ${Qt${QT_MAJOR_VERSION}Core_INCLUDE_DIRS} ${Qt${QT_MAJOR_VERSION}Gui_INCLUDE_DIRS} - ${Qt${QT_MAJOR_VERSION}OpenGL_INCLUDE_DIRS} ${Qt${QT_MAJOR_VERSION}Network_INCLUDE_DIRS} ${Qt${QT_MAJOR_VERSION}Qml_INCLUDE_DIRS} ${Qt${QT_MAJOR_VERSION}Quick_INCLUDE_DIRS} ${Qt${QT_MAJOR_VERSION}QuickControls2_INCLUDE_DIRS} ${libpyside_SOURCE_DIR} ${QtGui_GEN_DIR} - ${QtOpenGL_GEN_DIR} ${QtCore_GEN_DIR} ${QtNetwork_GEN_DIR} ${QtQml_GEN_DIR} @@ -31,11 +31,15 @@ set(QtQuickControls2_include_dirs ${QtQuickControls2_SOURCE_DIR} set(QtQuickControls2_libraries pyside6 ${Qt${QT_MAJOR_VERSION}QuickControls2_LIBRARIES}) -set(QtQuickControls2_deps QtGui QtOpenGL QtNetwork QtQml QtQuick) +set(QtQuickControls2_deps QtGui QtNetwork QtQml QtQuick) + +check_qt_opengl("QuickControls2" QtQuickControls2_include_dirs QtQuickControls2_deps + QtQuickControls2_DROPPED_ENTRIES) create_pyside_module(NAME QtQuickControls2 INCLUDE_DIRS QtQuickControls2_include_dirs LIBRARIES QtQuickControls2_libraries DEPS QtQuickControls2_deps TYPESYSTEM_PATH QtQuickControls2_SOURCE_DIR - SOURCES QtQuickControls2_SRC) + SOURCES QtQuickControls2_SRC + DROPPED_ENTRIES QtQuickControls2_DROPPED_ENTRIES) |