From 49f32b2650b07240e08789c302c5ae7c2ff584bf Mon Sep 17 00:00:00 2001
From: Joerg Bornemann <joerg.bornemann@qt.io>
Date: Thu, 28 Jan 2021 11:23:20 +0100
Subject: qmake: Introduce QT_HOST_LIBEXECS property

This will be used to access host tools that are installed in
${prefix}/libexec instead of ${prefix}/bin.

Change-Id: I36c4b5736330f8229d267a117c65d55cd5e12758
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
(cherry picked from commit edd122548940a0213e35d11649566efbef7f1fea)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
---
 src/corelib/global/qlibraryinfo.cpp | 9 ++++++++-
 src/corelib/global/qlibraryinfo.h   | 1 +
 2 files changed, 9 insertions(+), 1 deletion(-)

(limited to 'src/corelib')

diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp
index a86436f4c8..3c7e16738e 100644
--- a/src/corelib/global/qlibraryinfo.cpp
+++ b/src/corelib/global/qlibraryinfo.cpp
@@ -365,8 +365,14 @@ QVersionNumber QLibraryInfo::version() noexcept
  * - add to qt_config.prf, qt_module.prf, qt_module_fwdpri.prf
  */
 
+#ifdef QT_BUILD_QMAKE
+constexpr size_t qtConfEntriesKeySize = 23;
+#else
+constexpr size_t qtConfEntriesKeySize = 19;
+#endif
+
 static const struct {
-    char key[19], value[13];
+    char key[qtConfEntriesKeySize], value[13];
 } qtConfEntries[] = {
     { "Prefix", "." },
     { "Documentation", "doc" }, // should be ${Data}/doc
@@ -389,6 +395,7 @@ static const struct {
     { "Sysroot", "" },
     { "SysrootifyPrefix", "" },
     { "HostBinaries", "bin" },
+    { "HostLibraryExecutables", "libexec" },
     { "HostLibraries", "lib" },
     { "HostData", "." },
     { "TargetSpec", "" },
diff --git a/src/corelib/global/qlibraryinfo.h b/src/corelib/global/qlibraryinfo.h
index 04956052b3..741dc8b30f 100644
--- a/src/corelib/global/qlibraryinfo.h
+++ b/src/corelib/global/qlibraryinfo.h
@@ -78,6 +78,7 @@ public:
         SysrootPath,
         SysrootifyPrefixPath,
         HostBinariesPath,
+        HostLibraryExecutablesPath,
         HostLibrariesPath,
         HostDataPath,
         TargetSpecPath,
-- 
cgit v1.2.3