diff options
| author | Jake Petroules <jake.petroules@petroules.com> | 2015-07-30 03:37:58 -0700 |
|---|---|---|
| committer | Jake Petroules <jake.petroules@petroules.com> | 2015-07-30 18:29:53 +0000 |
| commit | 2867e2712e4c03308e4be76821d788c06bac565e (patch) | |
| tree | b92fc6be8e45fdc81ecef1da32c2854a912dc0e7 | |
| parent | 1eaaa3a1d1782304f0976ad083062a0ed2c82a4c (diff) | |
| download | qbs-2867e2712e4c03308e4be76821d788c06bac565e.tar.gz | |
Separate Android profile name components with '-' instead of '_'.
This is more consistent with the rest of qbs and as a helpful side
effect, encourages Android profiles to be re-created since their
generation was recently completely overhauled.
Change-Id: I1041584eb197b39d9ca3634687ea86d2fb95a2d5
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
| -rw-r--r-- | share/qbs/imports/qbs/base/Application.qbs | 2 | ||||
| -rw-r--r-- | share/qbs/imports/qbs/base/Library.qbs | 2 | ||||
| -rw-r--r-- | src/app/qbs-setup-android/android-setup.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/share/qbs/imports/qbs/base/Application.qbs b/share/qbs/imports/qbs/base/Application.qbs index 8b8c505df..30e6278eb 100644 --- a/share/qbs/imports/qbs/base/Application.qbs +++ b/share/qbs/imports/qbs/base/Application.qbs @@ -43,6 +43,6 @@ Product { Depends { name: "cpp"; condition: isForAndroid } profiles: isForAndroid - ? architectures.map(function(arch) { return project.profile + '_' + arch; }) + ? architectures.map(function(arch) { return project.profile + '-' + arch; }) : [project.profile] } diff --git a/share/qbs/imports/qbs/base/Library.qbs b/share/qbs/imports/qbs/base/Library.qbs index fb392a4e1..60927b18e 100644 --- a/share/qbs/imports/qbs/base/Library.qbs +++ b/share/qbs/imports/qbs/base/Library.qbs @@ -43,6 +43,6 @@ Product { Depends { name: "cpp"; condition: isForAndroid } profiles: isForAndroid - ? architectures.map(function(arch) { return project.profile + '_' + arch; }) + ? architectures.map(function(arch) { return project.profile + '-' + arch; }) : [project.profile] } diff --git a/src/app/qbs-setup-android/android-setup.cpp b/src/app/qbs-setup-android/android-setup.cpp index 780fca494..ca58b5a7f 100644 --- a/src/app/qbs-setup-android/android-setup.cpp +++ b/src/app/qbs-setup-android/android-setup.cpp @@ -126,7 +126,7 @@ static QStringList expectedArchs() static QString subProfileName(const QString &mainProfileName, const QString &arch) { - return mainProfileName + QLatin1Char('_') + arch; + return mainProfileName + QLatin1Char('-') + arch; } void setupSdk(qbs::Settings *settings, const QString &profileName, const QString &sdkDirPath) |