From 30a8b337e16a52ffa996eba6084d313cbb439cee Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Sun, 3 Sep 2023 22:39:30 +0200
Subject: [PATCH] finished: enable Qt6 build

---
 src/modules/CMakeLists.txt           | 2 +-
 src/modules/finished/CMakeLists.txt  | 4 ++--
 src/modules/finishedq/CMakeLists.txt | 6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/modules/CMakeLists.txt b/src/modules/CMakeLists.txt
index 1d6dbe255..da9b66451 100644
--- a/src/modules/CMakeLists.txt
+++ b/src/modules/CMakeLists.txt
@@ -22,7 +22,7 @@ file(GLOB SUBDIRECTORIES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*")
 list(SORT SUBDIRECTORIES)
 
 if(WITH_QT6) # TODO: Qt6
-set(SUBDIRECTORIES welcome welcomeq)
+set(SUBDIRECTORIES finished finishedq welcome welcomeq)
 endif()
 
 foreach(SUBDIRECTORY ${SUBDIRECTORIES})
diff --git a/src/modules/finished/CMakeLists.txt b/src/modules/finished/CMakeLists.txt
index ab435a9eb..d7a4ee355 100644
--- a/src/modules/finished/CMakeLists.txt
+++ b/src/modules/finished/CMakeLists.txt
@@ -3,7 +3,7 @@
 #   SPDX-FileCopyrightText: 2020 Adriaan de Groot <groot@kde.org>
 #   SPDX-License-Identifier: BSD-2-Clause
 #
-find_package(Qt5 ${QT_VERSION} CONFIG REQUIRED DBus Network)
+find_package(${qtname} ${QT_VERSION} CONFIG REQUIRED DBus Network)
 
 include_directories(${PROJECT_BINARY_DIR}/src/libcalamaresui)
 
@@ -17,6 +17,6 @@ calamares_add_plugin(finished
     UI
         FinishedPage.ui
     LINK_PRIVATE_LIBRARIES
-        Qt5::DBus
+        ${qtname}::DBus
     SHARED_LIB
 )
diff --git a/src/modules/finishedq/CMakeLists.txt b/src/modules/finishedq/CMakeLists.txt
index 2e688c45d..fd9edd9f2 100644
--- a/src/modules/finishedq/CMakeLists.txt
+++ b/src/modules/finishedq/CMakeLists.txt
@@ -8,8 +8,8 @@ if(NOT WITH_QML)
     return()
 endif()
 
-find_package(Qt5 ${QT_VERSION} CONFIG COMPONENTS DBus Network)
-if(NOT TARGET Qt5::DBus OR NOT TARGET Qt5::Network)
+find_package(${qtname} ${QT_VERSION} CONFIG COMPONENTS DBus Network)
+if(NOT TARGET ${qtname}::DBus OR NOT TARGET ${qtname}::Network)
     calamares_skip_module( "finishedq (missing DBus or Network)" )
     return()
 endif()
@@ -26,6 +26,6 @@ calamares_add_plugin(finishedq
     RESOURCES
         finishedq.qrc
     LINK_PRIVATE_LIBRARIES
-        Qt5::DBus
+        ${qtname}::DBus
     SHARED_LIB
 )