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

ToolChains: Write compatibility information for QtC 4.2

Browse Source 
This avoids turning all toolchains into C++ when going from Qt Creator 4.3
to Qt Creator 4.2 and back.

Change-Id: I607606f76d958c634ab27cb6db3bf35a1236b2b6
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
Tobias Hunger
2017-03-14 12:27:57 +01:00
parent 7136162047
commit 6f0a31166d
1 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/plugins/projectexplorer/toolchain.cpp
View File

@@ -225,6 +225,15 @@ QVariantMap ToolChain::toMap() const
result.insert(QLatin1String(ID_KEY), idToSave); result.insert(QLatin1String(ID_KEY), idToSave);
result.insert(QLatin1String(DISPLAY_NAME_KEY), displayName()); result.insert(QLatin1String(DISPLAY_NAME_KEY), displayName());
result.insert(QLatin1String(AUTODETECT_KEY), isAutoDetected()); result.insert(QLatin1String(AUTODETECT_KEY), isAutoDetected());
// <Compatibility with QtC 4.2>
int oldLanguageId = -1;
if (language() == ProjectExplorer::Constants::C_LANGUAGE_ID)
oldLanguageId = 1;
else if (language() == ProjectExplorer::Constants::CXX_LANGUAGE_ID)
oldLanguageId = 2;
if (oldLanguageId >= 0)
result.insert(LANGUAGE_KEY_V1, oldLanguageId);
// </Compatibility>
result.insert(QLatin1String(LANGUAGE_KEY_V2), language().toSetting()); result.insert(QLatin1String(LANGUAGE_KEY_V2), language().toSetting());
return result; return result;
} }