mirror of
https://anongit.gentoo.org/git/repo/gentoo.git
synced 2025-12-19 00:18:26 +00:00
7cef9a585fSee also: https://invent.kde.org/system/qtcurve/-/merge_requests/3#note_1353344 Closes: https://bugs.gentoo.org/966408 Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
39 lines
1.3 KiB
Diff
39 lines
1.3 KiB
Diff
From 5a5566ffdb7c672f73788426aab8a8604ff7dc87 Mon Sep 17 00:00:00 2001
|
|
From: Lars Wendler <polynomial-c@gmx.de>
|
|
Date: Fri, 21 Nov 2025 01:29:26 +0100
|
|
Subject: [PATCH] Fix build with qt-6.10
|
|
|
|
Successfully tested with qt-6.9.3 as well
|
|
---
|
|
qt6/CMakeLists.txt | 7 ++-----
|
|
1 file changed, 2 insertions(+), 5 deletions(-)
|
|
|
|
diff --git a/qt6/CMakeLists.txt b/qt6/CMakeLists.txt
|
|
index 27b6bf7e..31f31ba6 100644
|
|
--- a/qt6/CMakeLists.txt
|
|
+++ b/qt6/CMakeLists.txt
|
|
@@ -4,9 +4,9 @@ set(CMAKE_AUTOUIC True)
|
|
include(CMakePrintHelpers)
|
|
|
|
if(QTC_QT6_ENABLE_QTQUICK2)
|
|
- set(QTC_QT6_MODULES Core Gui Widgets Svg Quick DBus)
|
|
+ set(QTC_QT6_MODULES Core Gui GuiPrivate Widgets WidgetsPrivate Svg Quick DBus)
|
|
else()
|
|
- set(QTC_QT6_MODULES Core Gui Widgets Svg DBus)
|
|
+ set(QTC_QT6_MODULES Core Gui GuiPrivate Widgets WidgetsPrivate Svg DBus)
|
|
endif()
|
|
if(QTC_QT6_ENABLE_KDE)
|
|
list(APPEND QTC_QT6_MODULES PrintSupport)
|
|
@@ -18,9 +18,6 @@ set(QTC_QT6_ENABLE_KWIN Off)
|
|
|
|
find_package(Qt6 REQUIRED COMPONENTS ${QTC_QT6_MODULES})
|
|
list(TRANSFORM QTC_QT6_MODULES PREPEND "Qt6::" OUTPUT_VARIABLE QTC_QT6_LINK_LIBS)
|
|
-if(QTC_ENABLE_X11)
|
|
- list(APPEND QTC_QT6_LINK_LIBS Qt6::CorePrivate)
|
|
-endif()
|
|
foreach(QtModule ${QTC_QT6_OPT_MODULES})
|
|
find_package(Qt6${QtModule})
|
|
if(Qt6${QtModule}_FOUND)
|
|
--
|
|
GitLab
|
|
|