From 287311ed774a86ef9ce053dd42e947cd28b48495 Mon Sep 17 00:00:00 2001
From: Ivan Komissarov <abbapoh@gmail.com>
Date: Wed, 12 May 2021 16:35:16 +0200
Subject: cmake: Add Qt6 build

Also, switch Linux CMake job to build Qbs with Qt6

Change-Id: I188845a7cc086a8c87dbb7445ea95f99b26d94ef
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
---
 src/app/config-ui/CMakeLists.txt               |  2 +-
 src/lib/corelib/CMakeLists.txt                 |  9 +++++++--
 src/lib/scriptengine/CMakeLists.txt            | 10 +++++-----
 src/libexec/qbs_processlauncher/CMakeLists.txt |  2 +-
 4 files changed, 14 insertions(+), 9 deletions(-)

(limited to 'src')

diff --git a/src/app/config-ui/CMakeLists.txt b/src/app/config-ui/CMakeLists.txt
index 47b9c1905..f3375d5ea 100644
--- a/src/app/config-ui/CMakeLists.txt
+++ b/src/app/config-ui/CMakeLists.txt
@@ -14,6 +14,6 @@ if(APPLE)
 endif()
 
 add_qbs_app(qbs-config-ui
-    DEPENDS qbscore qbsconsolelogger Qt5::Widgets ${MACOS_FRAMEWORKS}
+    DEPENDS qbscore qbsconsolelogger Qt${QT_VERSION_MAJOR}::Widgets ${MACOS_FRAMEWORKS}
     SOURCES ${SOURCES} ${MACOS_SOURCES}
     )
diff --git a/src/lib/corelib/CMakeLists.txt b/src/lib/corelib/CMakeLists.txt
index 3a070b55c..423f04ce7 100644
--- a/src/lib/corelib/CMakeLists.txt
+++ b/src/lib/corelib/CMakeLists.txt
@@ -422,9 +422,14 @@ add_qbs_library(qbscore
     PUBLIC_DEFINES
         ${QBS_PROJECT_FILE_UPDATES_DEFINES}
     DEPENDS
-        Qt5::CorePrivate Qt5::Network qbsscriptengine Qt5::Xml ${EXTERNAL_DEPENDS}
+        Qt${QT_VERSION_MAJOR}::CorePrivate
+        Qt${QT_VERSION_MAJOR}::Network
+        Qt${QT_VERSION_MAJOR}::Xml
+        Qt6Core5Compat
+        qbsscriptengine
+        ${EXTERNAL_DEPENDS}
     PUBLIC_DEPENDS
-        Qt5::Core
+        Qt${QT_VERSION_MAJOR}::Core
     INCLUDES
         "${CMAKE_CURRENT_SOURCE_DIR}/../.."
     SOURCES
diff --git a/src/lib/scriptengine/CMakeLists.txt b/src/lib/scriptengine/CMakeLists.txt
index 452605888..01c6cd09b 100644
--- a/src/lib/scriptengine/CMakeLists.txt
+++ b/src/lib/scriptengine/CMakeLists.txt
@@ -38,7 +38,7 @@ set(QT_SCRIPT_INCLUDES
     "${QT_SCRIPT_PATH}/script"
     "${QT_SCRIPT_PATH}/script/api"
     "${QT_SCRIPT_PATH}/script/parser"
-    "${CMAKE_CURRENT_BINARY_DIR}/include/QtScript/${Qt5_VERSION}/QtScript"
+    "${CMAKE_CURRENT_BINARY_DIR}/include/QtScript/${QT_VERSION}/QtScript"
 )
 
 set(QT_SCRIPT_DEFINES
@@ -83,7 +83,7 @@ else()
         "-Wno-nonnull-compare" "-pthread")
 endif()
 
-set(QT_SCRIPT_PUBLIC_DEPENDS Qt5::Core)
+set(QT_SCRIPT_PUBLIC_DEPENDS Qt${QT_VERSION_MAJOR}::Core)
 if (UNIX)
     list(APPEND QT_SCRIPT_PUBLIC_DEPENDS "pthread")
 elseif(WIN32)
@@ -323,7 +323,7 @@ list_transform_prepend(PARSER_SOURCES "${QT_SCRIPT_PATH}/script/parser/")
 
 find_package(Perl)
 
-get_target_property(_QT_QMAKE_EXECUTABLE Qt5::qmake IMPORTED_LOCATION)
+get_target_property(_QT_QMAKE_EXECUTABLE Qt${QT_VERSION_MAJOR}::qmake IMPORTED_LOCATION)
 get_filename_component(_QT_BIN_DIRECTORY ${_QT_QMAKE_EXECUTABLE} DIRECTORY)
 
 file(GLOB API_HEADERS "${QT_SCRIPT_PATH}/script/api/*.h")
@@ -334,7 +334,7 @@ add_custom_command(
     OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/include/QtScript/qscriptengine.h"
     COMMAND ${PERL_EXECUTABLE} "${_QT_BIN_DIRECTORY}/syncqt.pl"
         -minimal
-        -version "${Qt5_VERSION}"
+        -version "${QT_VERSION}"
         -outdir ${CMAKE_CURRENT_BINARY_DIR}
         "${QT_SCRIPT_PATH}/.."
     BYPRODUCTS
@@ -344,7 +344,7 @@ add_custom_command(
 add_qbs_library(qbsscriptengine
     STATIC
     DEFINES ${QT_SCRIPT_DEFINES}
-    DEPENDS Qt5::CorePrivate
+    DEPENDS Qt${QT_VERSION_MAJOR}::CorePrivate Qt6Core5Compat
     PUBLIC_DEPENDS ${QT_SCRIPT_PUBLIC_DEPENDS}
     INCLUDES ${QT_SCRIPT_PUBLIC_INCLUDES} ${QT_SCRIPT_INCLUDES} ${JAVASCRIPT_CORE_INCLUDES}
     PUBLIC_INCLUDES ${QT_SCRIPT_PUBLIC_INCLUDES}
diff --git a/src/libexec/qbs_processlauncher/CMakeLists.txt b/src/libexec/qbs_processlauncher/CMakeLists.txt
index 73aca9f07..03ab07cbe 100644
--- a/src/libexec/qbs_processlauncher/CMakeLists.txt
+++ b/src/libexec/qbs_processlauncher/CMakeLists.txt
@@ -15,7 +15,7 @@ list_transform_prepend(PROTOCOL_SOURCES ${PATH_TO_PROTOCOL_SOURCES}/)
 
 add_qbs_app(qbs_processlauncher
     DESTINATION ${QBS_LIBEXEC_INSTALL_DIR}
-    DEPENDS Qt5::Core Qt5::Network
+    DEPENDS Qt${QT_VERSION_MAJOR}::Core Qt${QT_VERSION_MAJOR}::Network
     INCLUDES ${PATH_TO_PROTOCOL_SOURCES}
     SOURCES ${SOURCES} ${PROTOCOL_SOURCES}
     )
-- 
cgit v1.2.3