diff options
| author | Joerg Bornemann <joerg.bornemann@digia.com> | 2013-07-25 11:28:59 +0200 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@digia.com> | 2013-07-25 15:41:49 +0200 |
| commit | 32a8506507d30b7103dbd3ddbe92243823fb3e4c (patch) | |
| tree | 46fc522a8f715fdea3195450ba10437b543bc311 | |
| parent | 648ec3a4ac134aa4334630af1e76d50ad1065838 (diff) | |
| download | qbs-baserock/morph.tar.gz | |
save QT_CONFIG in Qt.core.qtConfigbaserock/morph
We want to access the QT_CONFIG from Qt modules.
The property will be used e.g. for determining whether
we're dealing with an ANGLE build.
Change-Id: Ic5cafc23c438c06e3b25ee73eca68c25aefc97ea
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
| -rw-r--r-- | share/qbs/modules/Qt/core/core.qbs | 1 | ||||
| -rw-r--r-- | src/app/qbs-setup-qt/setupqt.cpp | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/share/qbs/modules/Qt/core/core.qbs b/share/qbs/modules/Qt/core/core.qbs index 7c7cc96fe..2376dc827 100644 --- a/share/qbs/modules/Qt/core/core.qbs +++ b/share/qbs/modules/Qt/core/core.qbs @@ -12,6 +12,7 @@ Module { property string namespace property string libInfix: "" property string repository: versionMajor === 5 ? "qtbase" : undefined + property stringList qtConfig: [] property string binPath property string incPath property string libPath diff --git a/src/app/qbs-setup-qt/setupqt.cpp b/src/app/qbs-setup-qt/setupqt.cpp index 5e45af5b4..885b1e34c 100644 --- a/src/app/qbs-setup-qt/setupqt.cpp +++ b/src/app/qbs-setup-qt/setupqt.cpp @@ -269,6 +269,7 @@ void SetupQt::saveToQbsSettings(const QString &qtVersionName, const QtEnvironmen Profile profile(cleanQtVersionName, settings); const QString settingsTemplate(QLatin1String("Qt.core.%1")); + profile.setValue(settingsTemplate.arg("qtConfig"), qtEnvironment.qtConfigItems); profile.setValue(settingsTemplate.arg("binPath"), qtEnvironment.binaryPath); profile.setValue(settingsTemplate.arg("libPath"), qtEnvironment.libraryPath); profile.setValue(settingsTemplate.arg("pluginPath"), qtEnvironment.pluginPath); |