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

QtSupport: Don't read old configuration file

Browse Source 
Don't read configuration file for pre 2.6 versions.

Change-Id: Ib0cb625931625d0cec81fd2f385a9ed03e83a989
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
This commit is contained in:
Arnold Dumas
2016-06-20 09:37:14 +02:00
parent abb63602de
commit 0e3c5feb42
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/qtsupport/qtversionmanager.cpp
View File

@@ -64,7 +64,6 @@ const char QTVERSION_DATA_KEY[] = "QtVersion.";
const char QTVERSION_TYPE_KEY[] = "QtVersion.Type";
const char QTVERSION_FILE_VERSION_KEY[] = "Version";
const char QTVERSION_FILENAME[] = "/qtcreator/qtversion.xml";
const char QTVERSION_LEGACY_FILENAME[] = "/qtversion.xml"; // TODO: pre 2.6, remove later
static QMap<int, BaseQtVersion *> m_versions;
static int m_idcount = 0;
@@ -185,9 +184,6 @@ static bool restoreQtVersions()
PersistentSettingsReader reader;
FileName filename = settingsFileName(QLatin1String(QTVERSION_FILENAME));
// Read Qt Creator 2.5 qtversions.xml once:
if (!filename.exists())
filename = settingsFileName(QLatin1String(QTVERSION_LEGACY_FILENAME));
if (!reader.load(filename))
return false;
QVariantMap data = reader.restoreValues();