File fix-fixqt4headers.patch of Package qt6-base
From 1ccba0570b40b149e755f4aa771552a9a6418317 Mon Sep 17 00:00:00 2001
From: Christophe Giboudeaux <christophe@krop.fr>
Date: Wed, 1 Jan 2020 15:27:35 +0100
Subject: [PATCH] Fix the qmake command and the include subdir for openSUSE
---
bin/fixqt4headers.pl | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/bin/fixqt4headers.pl b/bin/fixqt4headers.pl
index b572f469dc..0f949f68ad 100755
--- a/bin/fixqt4headers.pl
+++ b/bin/fixqt4headers.pl
@@ -139,14 +139,14 @@ sub findQtHeaders
# -------- MAIN
if ($qtdir) {
- $qtIncludeDir = $qtdir . '/include';
+ $qtIncludeDir = $qtdir . '/include/qt6';
} else {
- $qtIncludeDir = `qmake -query QT_INSTALL_HEADERS`;
+ $qtIncludeDir = `qmake-qt6 -query QT_INSTALL_HEADERS`;
chop($qtIncludeDir);
}
die "The location of the Qt 5 include files could not be determined.\n"
- ."Please ensure qmake can be found in PATH or pass the command line option --qtdir.\n"
+ ."Please ensure qmake-qt6 can be found in PATH or pass the command line option --qtdir.\n"
unless -d $qtIncludeDir;
findQtHeaders('QtCore', $qtIncludeDir);
@@ -154,7 +154,7 @@ findQtHeaders('QtConcurrent', $qtIncludeDir);
findQtHeaders('QtWidgets', $qtIncludeDir);
findQtHeaders('QtPrintSupport', $qtIncludeDir);
-if (-d $qtIncludeDir . '/include/QtMultimedia') {
+if (-d $qtIncludeDir . '/include/qt6/QtMultimedia') {
findQtHeaders('QtMultimedia', $qtIncludeDir);
findQtHeaders('QtMultimediaWidgets', $qtIncludeDir);
} elsif (-d $qtIncludeDir . '/../qtmultimedia' ) {
@@ -164,7 +164,7 @@ if (-d $qtIncludeDir . '/include/QtMultimedia') {
}
# Support porting from "Qt 4.99" QtDeclarative to QtQuick (QQuickItem et al)
-if (-d $qtIncludeDir . '/include/QtQuick') {
+if (-d $qtIncludeDir . '/include/qt6/QtQuick') {
findQtHeaders('QtQuick', $qtIncludeDir);
} elsif (-d $qtIncludeDir . '/../qtdeclarative' ) {
# This is the case if QTDIR points to a source tree instead of an installed Qt
--
2.24.1