feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Expose Qt's libExecPath setting

Browse Source 
Task-number: QTBUG-88791
Change-Id: I3c84fc060fbf818a013bd42b6a2f4929d580156f
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
This commit is contained in:
Kai Köhne
2021-03-09 11:25:19 +01:00
committed by Kai Koehne
parent 6c37cd53be
commit f9cfc0bde9
2 changed files with 17 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/plugins/qtsupport/baseqtversion.cpp
View File

@@ -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"));

2
src/plugins/qtsupport/baseqtversion.h
View File

@@ -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;