diff options
author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-07-10 15:43:24 +0200 |
---|---|---|
committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-07-14 11:31:57 +0000 |
commit | 495eeac56d822072fecc1c59fabbeb3b1077fd3b (patch) | |
tree | cc8bf846b7c98c6398fc9382198b9e032d8949ac /sources/cmake_helpers/helpers.cmake | |
parent | d65f3ab8ce9abc8ed99b699efca9bda4f0a18006 (diff) |
Fix OpenGLFunctions for Qt 6
Task-number: PYSIDE-1339
Task-number: PYSIDE-904
Change-Id: I5b8e95b232812fa90ec5974b2b578eb581c06ace
Reviewed-by: Christian Tismer <tismer@stackless.com>
Diffstat (limited to 'sources/cmake_helpers/helpers.cmake')
-rw-r--r-- | sources/cmake_helpers/helpers.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sources/cmake_helpers/helpers.cmake b/sources/cmake_helpers/helpers.cmake index bd67ca933..7ab2a4b71 100644 --- a/sources/cmake_helpers/helpers.cmake +++ b/sources/cmake_helpers/helpers.cmake @@ -168,7 +168,7 @@ macro(COLLECT_MODULE_IF_FOUND shortname) # record the shortnames for the tests list(APPEND all_module_shortnames ${shortname}) # Build Qt 5 compatibility variables - if(${QT_MAJOR_VERSION} GREATER_EQUAL 6) + if(${QT_MAJOR_VERSION} GREATER_EQUAL 6 AND NOT "${shortname}" STREQUAL "OpenGLFunctions") get_target_property(Qt6${shortname}_INCLUDE_DIRS Qt6::${shortname} INTERFACE_INCLUDE_DIRECTORIES) get_target_property(Qt6${shortname}_PRIVATE_INCLUDE_DIRS |