diff --git a/src/plugins/projectexplorer/qtversionmanager.cpp b/src/plugins/projectexplorer/qtversionmanager.cpp index 87577b2c27fb534e6c41d87b0e173363608484d7..e46d6472c2c7f78d0cba645e02ba1646e5025f9d 100644 --- a/src/plugins/projectexplorer/qtversionmanager.cpp +++ b/src/plugins/projectexplorer/qtversionmanager.cpp @@ -78,7 +78,6 @@ QtVersionManager::QtVersionManager() id, s->value("IsSystemVersion", false).toBool()); version->setMingwDirectory(s->value("MingwDirectory").toString()); - version->setPrependPath(s->value("PrependPath").toString()); version->setMsvcVersion(s->value("msvcVersion").toString()); m_versions.append(version); } @@ -151,7 +150,6 @@ void QtVersionManager::writeVersionsIntoSettings() s->setValue("Path", m_versions.at(i)->path()); s->setValue("Id", m_versions.at(i)->uniqueId()); s->setValue("MingwDirectory", m_versions.at(i)->mingwDirectory()); - s->setValue("PrependPath", m_versions.at(i)->prependPath()); s->setValue("msvcVersion", m_versions.at(i)->msvcVersion()); s->setValue("IsSystemVersion", m_versions.at(i)->isSystemVersion()); } @@ -202,8 +200,6 @@ void QtVersionManager::addNewVersionsFromInstaller() QtVersion *version = new QtVersion(newVersionData[0], newVersionData[1], m_idcount++ ); if (newVersionData.count() >= 3) version->setMingwDirectory(newVersionData[2]); - if (newVersionData.count() >= 4) - version->setPrependPath(newVersionData[3]); bool versionWasAlreadyInList = false; foreach(const QtVersion * const it, m_versions) { @@ -871,16 +867,6 @@ void QtVersion::setMingwDirectory(const QString &directory) m_mingwDirectory = directory; } -QString QtVersion::prependPath() const -{ - return m_prependPath; -} - -void QtVersion::setPrependPath(const QString &directory) -{ - m_prependPath = directory; -} - QString QtVersion::msvcVersion() const { return m_msvcVersion; diff --git a/src/plugins/projectexplorer/qtversionmanager.h b/src/plugins/projectexplorer/qtversionmanager.h index 31cbe85cdbcb486415034888e854a1aab2aaa6f4..cece3e33a877944a3c3f42dff8825e92310ced7d 100644 --- a/src/plugins/projectexplorer/qtversionmanager.h +++ b/src/plugins/projectexplorer/qtversionmanager.h @@ -71,12 +71,11 @@ public: QString mingwDirectory() const; void setMingwDirectory(const QString &directory); - QString prependPath() const; - void setPrependPath(const QString &string); QString msvcVersion() const; QString wincePlatform() const; void setMsvcVersion(const QString &version); void addToEnvironment(ProjectExplorer::Environment &env); + bool hasDebuggingHelper() const; // Builds a debugging library // returns the output of the commands @@ -95,6 +94,7 @@ public: QString dumperLibrary() const; private: static int getUniqueId(); + // Also used by QtOptionsPageWidget void setName(const QString &name); void setPath(const QString &path); void updateSourcePath();