aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorChristian Kandeler <christian.kandeler@qt.io>2016-11-08 14:19:22 +0100
committerChristian Kandeler <christian.kandeler@qt.io>2016-11-08 15:28:45 +0000
commit9596e734b3f251a8ab3b74910ba0614fffe72f8f (patch)
tree3b179039d379f2c950d5323435ad976623b5dbe7 /src
parent80a69c09062f462f65dfd07c32bd72920f250daa (diff)
Allow JavaScript expressions when overriding properties
I mistakenly believed that already worked, but we had only implemented it for qbs-config. Change-Id: Ifb8bfabf2e4f5d6bfa2accb8a120a35c3c863936 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'src')
-rw-r--r--src/app/qbs/parser/commandlineparser.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/app/qbs/parser/commandlineparser.cpp b/src/app/qbs/parser/commandlineparser.cpp
index 3505d5fad..6448d04a3 100644
--- a/src/app/qbs/parser/commandlineparser.cpp
+++ b/src/app/qbs/parser/commandlineparser.cpp
@@ -55,6 +55,7 @@
#include <tools/installoptions.h>
#include <tools/preferences.h>
#include <tools/settings.h>
+#include <tools/settingsmodel.h>
#include <QCoreApplication>
#include <QDir>
@@ -312,7 +313,8 @@ QList<QVariantMap> CommandLineParser::buildConfigurations() const
qbsWarning() << Tr::tr("Refusing to overwrite special property '%1'.")
.arg(configurationNameKey);
} else {
- currentProperties.insert(property, arg.mid(sepPos + 1));
+ const QString rawString = arg.mid(sepPos + 1);
+ currentProperties.insert(property, representationToSettingsValue(rawString));
}
}
propertiesPerConfiguration << qMakePair(currentConfigurationName, currentProperties);