From 0e3c5feb428d5977007d29a2b38fdfd51b95171d Mon Sep 17 00:00:00 2001 From: Arnold Dumas Date: Mon, 20 Jun 2016 09:37:14 +0200 Subject: [PATCH] QtSupport: Don't read old configuration file Don't read configuration file for pre 2.6 versions. Change-Id: Ib0cb625931625d0cec81fd2f385a9ed03e83a989 Reviewed-by: Tobias Hunger --- src/plugins/qtsupport/qtversionmanager.cpp | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/plugins/qtsupport/qtversionmanager.cpp b/src/plugins/qtsupport/qtversionmanager.cpp index 31bf54a551b..211d8fa97b1 100644 --- a/src/plugins/qtsupport/qtversionmanager.cpp +++ b/src/plugins/qtsupport/qtversionmanager.cpp @@ -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 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();