diff options
author | Eike Ziller <eike.ziller@digia.com> | 2013-05-23 07:25:34 +0200 |
---|---|---|
committer | Eike Ziller <eike.ziller@digia.com> | 2013-05-23 07:25:34 +0200 |
commit | ef5d3796d52b20aa2fa8e75263686bb1e29fc092 (patch) | |
tree | 5a291f7a5108a3531e28bb7c7baaab7362071ff9 /src/tools/sdktool/addtoolchainoperation.cpp | |
parent | 24ee641543b51d1497114070fd574b095ff68958 (diff) | |
parent | 35b96f2fc11bcc6d0b4bfb2b405c115fb0d6033e (diff) |
Merge remote-tracking branch 'origin/2.7' into 2.8
Diffstat (limited to 'src/tools/sdktool/addtoolchainoperation.cpp')
-rw-r--r-- | src/tools/sdktool/addtoolchainoperation.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/tools/sdktool/addtoolchainoperation.cpp b/src/tools/sdktool/addtoolchainoperation.cpp index 0aeca51154..afde33bcca 100644 --- a/src/tools/sdktool/addtoolchainoperation.cpp +++ b/src/tools/sdktool/addtoolchainoperation.cpp @@ -150,7 +150,7 @@ int AddToolChainOperation::execute() const map = initializeToolChains(); QVariantMap result = addToolChain(map, m_id, m_displayName, m_path, m_targetAbi, m_supportedAbis, m_extra); - if (map.isEmpty() || map == result) + if (result.isEmpty() || map == result) return -2; return save(result, QLatin1String("toolchains")) ? 0 : -3; |