From d1dd20aa31b99d6e708799fc07d9b14d2fdb68e2 Mon Sep 17 00:00:00 2001 From: Kai Koehne Date: Wed, 3 Jun 2015 10:59:38 +0200 Subject: 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 Reviewed-by: Tobias Hunger --- src/tools/sdktool/addtoolchainoperation.cpp | 2 ++ 1 file changed, 2 insertions(+) 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))) { -- cgit v1.2.1