feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

CMake build/Qt6.2: Avoid message about missing DesignerComponents

Browse Source 
Amends 77fd87a545

Change-Id: I237a3f0b146f9fe5e2db1e1e4eb943a90fbd8db8
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
This commit is contained in:
Eike Ziller
2021-06-18 09:37:44 +02:00
parent 3188c448b6
commit c29d4e09a2
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
cmake/FindQt5.cmake
View File

@@ -42,11 +42,16 @@ if (NOT Qt6_FOUND)
endif() endif()
return() return()
else() else()
# since Qt 6.2 DesignerComponents is called private # since Qt 6.2 DesignerComponents is called DesignerComponentsPrivate
list(FIND Qt5_FIND_COMPONENTS DesignerComponents dcIndex)
if(dcIndex GREATER_EQUAL 0)
find_package(Qt6DesignerComponentsPrivate CONFIG QUIET) find_package(Qt6DesignerComponentsPrivate CONFIG QUIET)
if (TARGET Qt6::DesignerComponentsPrivate) if(TARGET Qt6::DesignerComponentsPrivate)
add_library(Qt5::DesignerComponents ALIAS Qt6::DesignerComponentsPrivate) add_library(Qt5::DesignerComponents ALIAS Qt6::DesignerComponentsPrivate)
list(REMOVE_AT Qt5_FIND_COMPONENTS ${dcIndex})
endif() endif()
endif()
find_package(Qt6 CONFIG ${__arguments} ${Qt5_FIND_COMPONENTS}) find_package(Qt6 CONFIG ${__arguments} ${Qt5_FIND_COMPONENTS})
endif() endif()