diff options
| author | Eike Ziller <eike.ziller@theqtcompany.com> | 2015-06-17 12:04:21 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@theqtcompany.com> | 2015-06-17 12:04:21 +0200 |
| commit | 4dd95aa5d4fd349e4cb9dceb5c35b55cdbe5bc13 (patch) | |
| tree | 4f6d55002a3cf98a9c2d6771401dc066ed0527e9 /src/tools/sdktool | |
| parent | bea726e8e2948b1ccfe2b94e6dd0ac0c81957d9e (diff) | |
| parent | 50c6343615e12398524d1a126fb19d6b8934337a (diff) | |
| download | qt-creator-4dd95aa5d4fd349e4cb9dceb5c35b55cdbe5bc13.tar.gz | |
Merge remote-tracking branch 'origin/3.4'
Change-Id: Id13cbdf2f7047366e543c91fbe7c21a9c4759e56
Diffstat (limited to 'src/tools/sdktool')
| -rw-r--r-- | src/tools/sdktool/addtoolchainoperation.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/tools/sdktool/addtoolchainoperation.cpp b/src/tools/sdktool/addtoolchainoperation.cpp index dd5e658a77..3a4ce1513e 100644 --- a/src/tools/sdktool/addtoolchainoperation.cpp +++ b/src/tools/sdktool/addtoolchainoperation.cpp @@ -281,6 +281,8 @@ QVariantMap AddToolChainOperation::initializeToolChains() bool AddToolChainOperation::exists(const QVariantMap &map, const QString &id) { QStringList valueKeys = FindValueOperation::findValue(map, id); + // support old settings using QByteArray for id's + valueKeys.append(FindValueOperation::findValue(map, id.toUtf8())); foreach (const QString &k, valueKeys) { if (k.endsWith(QString(QLatin1Char('/')) + QLatin1String(ID))) { |