diff --git a/src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp b/src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp index e401c167f53..112726e11dd 100644 --- a/src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp +++ b/src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp @@ -203,28 +203,3 @@ QString CMakeManager::findCbpFile(const QDir &directory) } return file; } - -// This code is duplicated from qtversionmanager -QString CMakeManager::qtVersionForQMake(const QString &qmakePath) -{ - QProcess qmake; - qmake.start(qmakePath, QStringList(QLatin1String("--version"))); - if (!qmake.waitForStarted()) { - qWarning("Cannot start '%s': %s", qPrintable(qmakePath), qPrintable(qmake.errorString())); - return QString(); - } - if (!qmake.waitForFinished()) { - Utils::SynchronousProcess::stopProcess(qmake); - qWarning("Timeout running '%s'.", qPrintable(qmakePath)); - return QString(); - } - QString output = QString::fromLocal8Bit(qmake.readAllStandardOutput()); - QRegExp regexp(QLatin1String("(QMake version|Qmake version:)[\\s]*([\\d.]*)")); - regexp.indexIn(output); - if (regexp.cap(2).startsWith(QLatin1String("2."))) { - QRegExp regexp2(QLatin1String("Using Qt version[\\s]*([\\d\\.]*)")); - regexp2.indexIn(output); - return regexp2.cap(1); - } - return QString(); -} diff --git a/src/plugins/cmakeprojectmanager/cmakeprojectmanager.h b/src/plugins/cmakeprojectmanager/cmakeprojectmanager.h index ef48a931364..cd2cba0a423 100644 --- a/src/plugins/cmakeprojectmanager/cmakeprojectmanager.h +++ b/src/plugins/cmakeprojectmanager/cmakeprojectmanager.h @@ -73,15 +73,12 @@ public: bool preferNinja() const; static QString findCbpFile(const QDir &); - static QString findDumperLibrary(const Utils::Environment &env); private slots: void updateContextMenu(ProjectExplorer::Project *project, ProjectExplorer::Node *node); void runCMake(); void runCMakeContextMenu(); private: void runCMake(ProjectExplorer::Project *project); - static QString qtVersionForQMake(const QString &qmakePath); - static QPair findQtDir(const Utils::Environment &env); CMakeSettingsPage *m_settingsPage; QAction *m_runCMakeAction; QAction *m_runCMakeActionContextMenu;