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

Fix build with Qt 6.2 after components were renamed

Browse Source 
Some have a "Private" suffix now.

cherry picked from commit 77fd87a545
cherry picked from commit c29d4e09a2
cherry picked from commit a803d04c17

Change-Id: Ie53d253b4fc9364b452e3eb1fe01345b6d8073d3
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
This commit is contained in:
Tim Jenssen
2021-06-17 17:49:37 +02:00
committed by Eike Ziller
parent 2bc7f6603c
commit a894d4e07b
1 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
cmake/FindQt5.cmake
View File

@@ -42,6 +42,17 @@ if (NOT Qt6_FOUND)
endif()
return()
else()
# since Qt 6.2 some components are renamed to *Private
foreach(possible_private_libs DesignerComponents QmlDebug)
list(FIND Qt5_FIND_COMPONENTS ${possible_private_libs} dcIndex)
if(dcIndex GREATER_EQUAL 0)
find_package(Qt6${possible_private_libs}Private CONFIG QUIET)
if(TARGET Qt6::${possible_private_libs}Private)
add_library(Qt5::${possible_private_libs} ALIAS Qt6::${possible_private_libs}Private)
list(REMOVE_AT Qt5_FIND_COMPONENTS ${dcIndex})
endif()
endif()
endforeach()
find_package(Qt6 CONFIG ${__arguments} ${Qt5_FIND_COMPONENTS})
endif()