gentoo auto-resync : 11:06:2023 - 20:18:01

1 files changed, 41 insertions, 2 deletions

diff --git a/eclass/qmake-utils.eclass b/eclass/qmake-utils.eclass
index a86ce1fbabb8..88755ab7aa8a 100644
--- a/eclass/qmake-utils.eclass
+++ b/eclass/qmake-utils.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: qmake-utils.eclass
@@ -9,7 +9,7 @@
 # @SUPPORTED_EAPIS: 7 8
 # @BLURB: Common functions for qmake-based packages.
 # @DESCRIPTION:
-# Utility eclass providing wrapper functions for Qt5 qmake.
+# Utility eclass providing wrapper functions for Qt qmake.
 #
 # This eclass does not set any metadata variables nor export any phase
 # functions. It can be inherited safely.
@@ -78,12 +78,15 @@ qt5_get_qmake_args() {
 		QMAKE_CFLAGS="${CFLAGS}"
 		QMAKE_CFLAGS_RELEASE=
 		QMAKE_CFLAGS_DEBUG=
+		QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO=
 		QMAKE_CXXFLAGS="${CXXFLAGS}"
 		QMAKE_CXXFLAGS_RELEASE=
 		QMAKE_CXXFLAGS_DEBUG=
+		QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO=
 		QMAKE_LFLAGS="${LDFLAGS}"
 		QMAKE_LFLAGS_RELEASE=
 		QMAKE_LFLAGS_DEBUG=
+		QMAKE_LFLAGS_RELEASE_WITH_DEBUGINFO=
 	EOF
 }
 
@@ -116,4 +119,40 @@ eqmake5() {
 	fi
 }
 
+# @FUNCTION: qt6_get_bindir
+# @DESCRIPTION:
+# Echoes the directory where Qt6 binaries are installed.
+# EPREFIX is already prepended to the returned path.
+qt6_get_bindir() {
+	echo ${EPREFIX}$(qt6_get_libdir)/qt6/bin
+}
+
+# @FUNCTION: qt6_get_headerdir
+# @DESCRIPTION:
+# Echoes the directory where Qt6 headers are installed.
+qt6_get_headerdir() {
+	echo /usr/include/qt6
+}
+
+# @FUNCTION: qt6_get_libdir
+# @DESCRIPTION:
+# Echoes the directory where Qt6 libraries are installed.
+qt6_get_libdir() {
+	echo /usr/$(get_libdir)
+}
+
+# @FUNCTION: qt6_get_mkspecsdir
+# @DESCRIPTION:
+# Echoes the directory where Qt6 mkspecs are installed.
+qt6_get_mkspecsdir() {
+	echo $(qt6_get_libdir)/qt6/mkspecs
+}
+
+# @FUNCTION: qt6_get_plugindir
+# @DESCRIPTION:
+# Echoes the directory where Qt6 plugins are installed.
+qt6_get_plugindir() {
+	echo $(qt6_get_libdir)/qt6/plugins
+}
+
 fi