diff options
| author | Tim Jenssen <tim.jenssen@qt.io> | 2021-06-17 17:49:37 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2021-07-01 10:56:12 +0000 |
| commit | a894d4e07b22de1a695f635962c6365fdaff03ee (patch) | |
| tree | 96bd1942ce7c716e62367678f9d543960840863a | |
| parent | 2bc7f6603c93f9754b5dfe7a86ea0b42ae17f35f (diff) | |
| download | qt-creator-a894d4e07b22de1a695f635962c6365fdaff03ee.tar.gz | |
Fix build with Qt 6.2 after components were renamed
Some have a "Private" suffix now.
cherry picked from commit 77fd87a545e2c3374b252603ad9da6e029f42f99
cherry picked from commit c29d4e09a2ddd8a9c0fac9402fb3b7875af83ad9
cherry picked from commit a803d04c171b31ec90c1ea2bb82930a967027ec8
Change-Id: Ie53d253b4fc9364b452e3eb1fe01345b6d8073d3
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
| -rw-r--r-- | cmake/FindQt5.cmake | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/cmake/FindQt5.cmake b/cmake/FindQt5.cmake index 589fd4eed5..ae58487eea 100644 --- a/cmake/FindQt5.cmake +++ b/cmake/FindQt5.cmake @@ -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() |