Commit d38e8283 authored by Nikita Baryshnikov's avatar Nikita Baryshnikov
Browse files

CmakeProjectManager remove stale methods

Looks like they are zombies scince
b419403b



Change-Id: I5fe0c728dcce1931e543e15f04ae24e0c65db61a
Reviewed-by: default avatarDaniel Teske <daniel.teske@digia.com>
parent c363ce42
......@@ -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();
}
......@@ -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<QString, QString> findQtDir(const Utils::Environment &env);
CMakeSettingsPage *m_settingsPage;
QAction *m_runCMakeAction;
QAction *m_runCMakeActionContextMenu;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment