feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Merge remote-tracking branch 'origin/2.7' into 2.8

Browse Source
This commit is contained in:
Eike Ziller
2013-05-23 07:25:34 +02:00
parent 24ee641543 35b96f2fc1
commit ef5d3796d5
84 changed files with 2283 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/tools/sdktool/addtoolchainoperation.cpp
View File

@@ -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;