diff options
| author | Kai Koehne <kai.koehne@theqtcompany.com> | 2015-06-03 10:59:38 +0200 |
|---|---|---|
| committer | Kai Koehne <kai.koehne@theqtcompany.com> | 2015-06-03 11:04:50 +0000 |
| commit | d1dd20aa31b99d6e708799fc07d9b14d2fdb68e2 (patch) | |
| tree | 1245031460efb48a3e1e2994fa95d0bf81b6ddf7 | |
| parent | e869d794c8f3f6c8e4d36199e8b9bfb5fdab0d47 (diff) | |
| download | qt-creator-d1dd20aa31b99d6e708799fc07d9b14d2fdb68e2.tar.gz | |
Fix parsing of old settings with sdktool
With commit 5aba7fb09504e1a the sdktool started to save id's in a QString
(instead of a QByteArray). Commit b2e3f0262bbf5de4 then adapted also the
parsing. However, this broke the parsing of existing settings still
using a QByteArray.
Task-number: QTCREATORBUG-14545
Change-Id: I6c991d9d130602c7e9b3146b4d7b17555056a8ef
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
| -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))) { |