diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-06-29 15:04:52 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-06-30 06:27:16 +0200 |
| commit | 492b58dbf7b597fec2bcb59f84ced2b3491c2494 (patch) | |
| tree | c424ae7b0393e1b8665a59ee35efa41f321096af /sources | |
| parent | 499438adf26804dc5760162bba8c89d707fc98a3 (diff) | |
CMake: Use the portable Qt feature properties
Task-number: PYSIDE-904
Change-Id: I15ebd4057c52c78d584de7c34e74ebb858cb0011
Reviewed-by: Christian Tismer <tismer@stackless.com>
Diffstat (limited to 'sources')
| -rw-r--r-- | sources/pyside2/PySide2/QtGui/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | sources/pyside2/PySide2/QtNetwork/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | sources/pyside2/PySide2/QtOpenGLFunctions/CMakeLists.txt | 2 |
3 files changed, 5 insertions, 4 deletions
diff --git a/sources/pyside2/PySide2/QtGui/CMakeLists.txt b/sources/pyside2/PySide2/QtGui/CMakeLists.txt index 0001d51d6..dcc5e29cf 100644 --- a/sources/pyside2/PySide2/QtGui/CMakeLists.txt +++ b/sources/pyside2/PySide2/QtGui/CMakeLists.txt @@ -8,7 +8,8 @@ endif() set(QtGui_DROPPED_ENTRIES) -get_property(QtGui_enabled_features TARGET Qt${QT_MAJOR_VERSION}::Gui PROPERTY INTERFACE_QT_ENABLED_FEATURES) +get_property(QtGui_enabled_features TARGET Qt${QT_MAJOR_VERSION}::Gui + PROPERTY QT_ENABLED_PUBLIC_FEATURES) set(QtGui_SRC ${QtGui_GEN_DIR}/qabstractopenglfunctions_wrapper.cpp diff --git a/sources/pyside2/PySide2/QtNetwork/CMakeLists.txt b/sources/pyside2/PySide2/QtNetwork/CMakeLists.txt index 7a9dcc23f..9557c4a26 100644 --- a/sources/pyside2/PySide2/QtNetwork/CMakeLists.txt +++ b/sources/pyside2/PySide2/QtNetwork/CMakeLists.txt @@ -48,9 +48,9 @@ ${QtNetwork_GEN_DIR}/qtnetwork_module_wrapper.cpp ) get_property(QtNetwork_enabled_features TARGET Qt${QT_MAJOR_VERSION}::Network - PROPERTY INTERFACE_QT_ENABLED_FEATURES) + PROPERTY QT_ENABLED_PUBLIC_FEATURES) get_property(QtNetwork_disabled_features TARGET Qt${QT_MAJOR_VERSION}::Network - PROPERTY INTERFACE_QT_DISABLED_FEATURES) + PROPERTY QT_DISABLED_PUBLIC_FEATURES) # ### fixme: For cmake >= 3.3, use if( needle IN_LIST list) list(FIND QtNetwork_enabled_features "ssl" _sslEnabledIndex) diff --git a/sources/pyside2/PySide2/QtOpenGLFunctions/CMakeLists.txt b/sources/pyside2/PySide2/QtOpenGLFunctions/CMakeLists.txt index eab543b6a..383afb68f 100644 --- a/sources/pyside2/PySide2/QtOpenGLFunctions/CMakeLists.txt +++ b/sources/pyside2/PySide2/QtOpenGLFunctions/CMakeLists.txt @@ -3,7 +3,7 @@ project(QtOpenGLFunctions) set(QtOpenGLFunctions_DROPPED_ENTRIES) get_property(QtOpenGLFunctions_enabled_features TARGET Qt${QT_MAJOR_VERSION}::Gui - PROPERTY INTERFACE_QT_ENABLED_FEATURES) + PROPERTY QT_ENABLED_PUBLIC_FEATURES) set(QtOpenGLFunctions_SRC ${QtOpenGLFunctions_GEN_DIR}/qtopenglfunctions_module_wrapper.cpp) |