diff options
author | Eike Ziller <eike.ziller@qt.io> | 2019-05-03 12:47:18 +0200 |
---|---|---|
committer | Eike Ziller <eike.ziller@qt.io> | 2019-05-07 08:09:56 +0000 |
commit | e9e4c27e3a3f157291a231b8a746bb76dea525b7 (patch) | |
tree | e7a207a92ec33a7abd9ed9e5f9a25f6588b966d2 /src/tools/sdktool/operation.cpp | |
parent | 48f8eca5746e945ba177d827ff925d80ad3982fd (diff) | |
download | qt-creator-e9e4c27e3a3f157291a231b8a746bb76dea525b7.tar.gz |
sdktool: Do not fiddle with display names
sdktool made the "display names" unique by potentially adding a number.
This has multiple drawbacks:
- The display name can contain variables that lead to
unique _expanded_ names
- Adding a number doesn't really help for distinguishing things
- That number is then hard-baked into the install settings
Installers should take care that they register identifiable names.
And if we really want to ensure unique names, then Qt Creator can do that
itself, or even better leave the user to do it, because a number doesn't
really help anyhow.
Fixes: QTCREATORBUG-17909
Change-Id: Id0f44c0cbe457047a0713bda4980fb5d4bc5bcaa
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'src/tools/sdktool/operation.cpp')
-rw-r--r-- | src/tools/sdktool/operation.cpp | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/src/tools/sdktool/operation.cpp b/src/tools/sdktool/operation.cpp index c4f823281a..68bad3272d 100644 --- a/src/tools/sdktool/operation.cpp +++ b/src/tools/sdktool/operation.cpp @@ -62,15 +62,6 @@ QVariant Operation::valueFromString(const QString &v) return QVariant(); } -QString Operation::makeUnique(const QString &name, const QStringList &inUse) -{ - QString unique = name; - int i = 1; - while (inUse.contains(unique)) - unique = name + QString::number(++i); - return unique; -} - Operation::KeyValuePair::KeyValuePair(const QString &k, const QString &v) : value(valueFromString(v)) { |