From f9cfc0bde9c9b8f370b492937ae1ff92bfa27427 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kai=20K=C3=B6hne?= <kai.koehne@qt.io>
Date: Tue, 9 Mar 2021 11:25:19 +0100
Subject: [PATCH] Expose Qt's libExecPath setting

Task-number: QTBUG-88791
Change-Id: I3c84fc060fbf818a013bd42b6a2f4929d580156f
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
---
 src/plugins/qtsupport/baseqtversion.cpp | 15 +++++++++++++++
 src/plugins/qtsupport/baseqtversion.h   |  2 ++
 2 files changed, 17 insertions(+)

diff --git a/src/plugins/qtsupport/baseqtversion.cpp b/src/plugins/qtsupport/baseqtversion.cpp
index 25c1598ef0e..92802e2e42e 100644
--- a/src/plugins/qtsupport/baseqtversion.cpp
+++ b/src/plugins/qtsupport/baseqtversion.cpp
@@ -110,6 +110,7 @@ public:
     Utils::FilePath prefix;
 
     Utils::FilePath binPath;
+    Utils::FilePath libExecPath;
     Utils::FilePath configurationPath;
     Utils::FilePath dataPath;
     Utils::FilePath demosPath;
@@ -124,6 +125,7 @@ public:
     Utils::FilePath translationsPath;
 
     Utils::FilePath hostBinPath;
+    Utils::FilePath hostLibexecPath;
     Utils::FilePath hostDataPath;
     Utils::FilePath hostPrefixPath;
 
@@ -558,6 +560,11 @@ FilePath BaseQtVersion::binPath() const // QT_INSTALL_BINS
     return d->m_data.binPath;
 }
 
+FilePath BaseQtVersion::libExecPath() const // QT_INSTALL_LIBEXECS
+{
+    d->updateVersionInfo();
+    return d->m_data.libExecPath;
+}
 FilePath BaseQtVersion::configurationPath() const // QT_INSTALL_CONFIGURATION
 {
     d->updateVersionInfo();
@@ -618,6 +625,12 @@ FilePath BaseQtVersion::hostBinPath() const // QT_HOST_BINS
     return d->m_data.hostBinPath;
 }
 
+FilePath BaseQtVersion::hostLibexecPath() const // QT_HOST_LIBEXECS
+{
+    d->updateVersionInfo();
+    return d->m_data.hostLibexecPath;
+}
+
 FilePath BaseQtVersion::hostDataPath() const // QT_HOST_DATA
 {
     d->updateVersionInfo();
@@ -1277,6 +1290,7 @@ void BaseQtVersionPrivate::updateVersionInfo()
     m_data.prefix = FilePath::fromUserInput(qmakeProperty("QT_INSTALL_PREFIX"));
 
     m_data.binPath = FilePath::fromUserInput(qmakeProperty("QT_INSTALL_BINS"));
+    m_data.libExecPath = FilePath::fromUserInput(qmakeProperty("QT_INSTALL_LIBEXECS"));
     m_data.configurationPath = FilePath::fromUserInput(qmakeProperty("QT_INSTALL_CONFIGURATION"));
     m_data.dataPath = FilePath::fromUserInput(qmakeProperty("QT_INSTALL_DATA"));
     m_data.demosPath = FilePath::fromString(
@@ -1292,6 +1306,7 @@ void BaseQtVersionPrivate::updateVersionInfo()
     m_data.translationsPath = FilePath::fromUserInput(qmakeProperty("QT_INSTALL_TRANSLATIONS"));
 
     m_data.hostBinPath = FilePath::fromUserInput(qmakeProperty("QT_HOST_BINS"));
+    m_data.hostLibexecPath = FilePath::fromUserInput(qmakeProperty("QT_HOST_LIBEXECS"));
     m_data.hostDataPath = FilePath::fromUserInput(qmakeProperty("QT_HOST_DATA"));
     m_data.hostPrefixPath = FilePath::fromUserInput(qmakeProperty("QT_HOST_PREFIX"));
 
diff --git a/src/plugins/qtsupport/baseqtversion.h b/src/plugins/qtsupport/baseqtversion.h
index 2d140698954..fde110da62b 100644
--- a/src/plugins/qtsupport/baseqtversion.h
+++ b/src/plugins/qtsupport/baseqtversion.h
@@ -195,6 +195,7 @@ public:
     Utils::FilePath prefix() const;
 
     Utils::FilePath binPath() const;
+    Utils::FilePath libExecPath() const;
     Utils::FilePath configurationPath() const;
     Utils::FilePath dataPath() const;
     Utils::FilePath demosPath() const;
@@ -209,6 +210,7 @@ public:
     Utils::FilePath translationsPath() const;
 
     Utils::FilePath hostBinPath() const;
+    Utils::FilePath hostLibexecPath() const;
     Utils::FilePath hostDataPath() const;
     Utils::FilePath hostPrefixPath() const;