diff options
author | Tobias Hunger <tobias.hunger@nokia.com> | 2011-12-19 12:06:44 +0100 |
---|---|---|
committer | Tobias Hunger <tobias.hunger@nokia.com> | 2012-01-30 12:25:40 +0100 |
commit | 52b47364de371f2797c597c747c1bc10ad371c1d (patch) | |
tree | bc19e0fdf7282c829b0a37b18ec286806a476fde /src/plugins/projectexplorer/msvctoolchain.h | |
parent | 97496df1bf889c69f686edf707ba71a226064067 (diff) | |
download | qt-creator-52b47364de371f2797c597c747c1bc10ad371c1d.tar.gz |
Use QUuids to identify tool chains
Save/Restore has been updated to reflect this:
We now save manual as well as auto-detected tool chains into the user
toolChains.xml file.
When loading we load the SDK as well as the user toolChains.xml files.
We then do a autodetection run. All the tool chains restored that are
marked up as auto-detected are then checked again:
* the tool chain was autodetected again: Throw away the newly auto-
detected tool chain and reuse the saved one. This makes sure we
keep the QUuid that is now part of the tool chains id.
* the tool chain was not autodetected again: Throw away the saved
tool chain.
* the tool chain was newly autodetected: Add the new tool chain
We keep the old id around in the legacyId() method. It is used when
loading old .user files only. So there is no need to implement this
method for new tool chains.
Task-number: QTCREATORBUG-6702
Change-Id: Ifc0a216e5351a8a57db03615ba329e355e7d5f59
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Diffstat (limited to 'src/plugins/projectexplorer/msvctoolchain.h')
-rw-r--r-- | src/plugins/projectexplorer/msvctoolchain.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/projectexplorer/msvctoolchain.h b/src/plugins/projectexplorer/msvctoolchain.h index 5ad742fc13..bc51c189d4 100644 --- a/src/plugins/projectexplorer/msvctoolchain.h +++ b/src/plugins/projectexplorer/msvctoolchain.h @@ -56,6 +56,7 @@ public: MsvcToolChain(const QString &name, const Abi &abi, const QString &varsBat, const QString &varsBatArg, bool autodetect = false); + QString legacyId() const; static MsvcToolChain *readFromMap(const QVariantMap &data); @@ -79,7 +80,6 @@ protected: private: MsvcToolChain(); - void updateId(); QString m_varsBatArg; // Argument }; |