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

Move settings over from the runconfigurations into the environmentaspect

Browse Source 
Change-Id: I97ecc00b53d4c6f8f36c1f5f3178712f689747d9
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
This commit is contained in:
Tobias Hunger
2013-01-29 18:01:16 +01:00
parent 47abeac15b
commit 87347bb064
1 changed files with 43 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
src/plugins/projectexplorer/settingsaccessor.cpp
View File

@@ -341,7 +341,7 @@ public:
QVariantMap update(Project *project, const QVariantMap &map); QVariantMap update(Project *project, const QVariantMap &map);
}; };
// Version 10 introduces disabling buildsteps, and handles upgrading custom process steps // Version 11 introduces kits
class Version11Handler : public UserFileVersionHandler class Version11Handler : public UserFileVersionHandler
{ {
public: public:
@@ -386,6 +386,24 @@ private:
QHash<Kit *, QVariantMap> m_targets; QHash<Kit *, QVariantMap> m_targets;
}; };
// Version 12 reflects the move of environment settings from CMake/Qt4/Custom into
// LocalApplicationRunConfiguration
class Version12Handler : public UserFileVersionHandler
{
public:
int userFileVersion() const
{
return 12;
}
QString displayUserFileVersion() const
{
return QLatin1String("2.7pre1");
}
QVariantMap update(Project *project, const QVariantMap &map);
};
} // namespace } // namespace
// //
@@ -2687,3 +2705,27 @@ void Version11Handler::parseToolChainFile()
m_toolChainExtras.insert(id, ToolChainExtraData(mkspec, debugger)); m_toolChainExtras.insert(id, ToolChainExtraData(mkspec, debugger));
} }
} }
QVariantMap Version12Handler::update(Project *project, const QVariantMap &map)
{
QVariantMap result;
QMapIterator<QString, QVariant> it(map);
while (it.hasNext()) {
it.next();
if (it.value().type() == QVariant::Map)
result.insert(it.key(), update(project, it.value().toMap()));
else if (it.key() == QLatin1String("CMakeProjectManager.CMakeRunConfiguration.UserEnvironmentChanges")
|| it.key() == QLatin1String("ProjectExplorer.CustomExecutableRunConfiguration.UserEnvironmentChanges")
|| it.key() == QLatin1String("Qt4ProjectManager.Qt4RunConfiguration.UserEnvironmentChanges")
|| it.key() == QLatin1String("Qt4ProjectManager.MaemoRunConfiguration.UserEnvironmentChanges"))
result.insert(QLatin1String("PE.UserEnvironmentChanges"), it.value());
else if (it.key() == QLatin1String("CMakeProjectManager.BaseEnvironmentBase")
|| it.key() == QLatin1String("ProjectExplorer.CustomExecutableRunConfiguration.BaseEnvironmentBase")
|| it.key() == QLatin1String("ProjectExplorer.CustomExecutableRunConfiguration.BaseEnvironmentBase")
|| it.key() == QLatin1String("Qt4ProjectManager.MaemoRunConfiguration.BaseEnvironmentBase"))
result.insert(QLatin1String("PE.BaseEnvironmentBase"), it.value());
else
result.insert(it.key(), it.value());
}
return result;
}