diff options
| author | Christian Kandeler <christian.kandeler@qt.io> | 2018-12-11 16:32:53 +0100 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@qt.io> | 2018-12-18 12:30:31 +0000 |
| commit | 34036e9197d86d36338b6b4bec743b65a0bf316a (patch) | |
| tree | 033e70e63b601bcdec75c4abdde0aae93347f231 | |
| parent | 7b5349d182bcb4c9d7a3d1501768b91c9fa93fe9 (diff) | |
Make setup-toolchains and setup-android behave like setup-qt
... with regards to handling dots in the profile name.
We don't allow dots to appear in profile names. setup-qt auto-replaces
them with hyphens, while setup-toolchains and setup-android did not. Now
they all do.
Fixes: QBS-1413
Change-Id: I567e07e64a5e18fe50ead700d3584d60da276dae
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
| -rw-r--r-- | src/app/qbs-setup-android/commandlineparser.cpp | 1 | ||||
| -rw-r--r-- | src/app/qbs-setup-toolchains/commandlineparser.cpp | 1 |
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 1bdf2188b..a9276941b 100644 --- a/src/app/qbs-setup-android/commandlineparser.cpp +++ b/src/app/qbs-setup-android/commandlineparser.cpp @@ -99,6 +99,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(); |