aboutsummaryrefslogtreecommitdiffstats
path: root/src/app
diff options
context:
space:
mode:
authorChristian Kandeler <christian.kandeler@qt.io>2019-01-11 15:13:53 +0100
committerChristian Kandeler <christian.kandeler@qt.io>2019-01-11 15:13:53 +0100
commit34ef874fee31f05e2bd3d789f94b29771907322c (patch)
treecbbca795b10ccabce02a05e9525905c57b7ed41d /src/app
parent18e7c621c3ffeebbba8f2ec0c7dcc8db0499678c (diff)
parent7a047f825ba82e3f05b87c68ac421f8e95815920 (diff)
Merge 1.12 into master
Diffstat (limited to 'src/app')
-rw-r--r--src/app/qbs-setup-android/commandlineparser.cpp1
-rw-r--r--src/app/qbs-setup-toolchains/commandlineparser.cpp1
2 files changed, 2 insertions, 0 deletions
diff --git a/src/app/qbs-setup-android/commandlineparser.cpp b/src/app/qbs-setup-android/commandlineparser.cpp
index 616c829de..df84f5332 100644
--- a/src/app/qbs-setup-android/commandlineparser.cpp
+++ b/src/app/qbs-setup-android/commandlineparser.cpp
@@ -101,6 +101,7 @@ void CommandLineParser::parse(const QStringList &commandLine)
throwError(Tr::tr("No profile name supplied."));
case 1:
m_profileName = m_commandLine.takeFirst();
+ m_profileName.replace(QLatin1Char('.'), QLatin1Char('-'));
break;
default:
complainAboutExtraArguments();
diff --git a/src/app/qbs-setup-toolchains/commandlineparser.cpp b/src/app/qbs-setup-toolchains/commandlineparser.cpp
index fd2e0214f..d96e18b7d 100644
--- a/src/app/qbs-setup-toolchains/commandlineparser.cpp
+++ b/src/app/qbs-setup-toolchains/commandlineparser.cpp
@@ -97,6 +97,7 @@ void CommandLineParser::parse(const QStringList &commandLine)
case 2:
m_compilerPath = m_commandLine.at(0);
m_profileName = m_commandLine.at(1);
+ m_profileName.replace(QLatin1Char('.'), QLatin1Char('-'));
break;
default:
complainAboutExtraArguments();