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

CmakeProjectManager remove stale methods

Browse Source 
Looks like they are zombies scince
b419403b0f

Change-Id: I5fe0c728dcce1931e543e15f04ae24e0c65db61a
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
This commit is contained in:
Nikita Baryshnikov
2014-09-12 13:07:04 +04:00
parent c363ce4263
commit d38e8283df
2 changed files with 0 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp
View File

@@ -203,28 +203,3 @@ QString CMakeManager::findCbpFile(const QDir &directory)
} }
return file; 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();
}

3
src/plugins/cmakeprojectmanager/cmakeprojectmanager.h
View File

@@ -73,15 +73,12 @@ public:
bool preferNinja() const; bool preferNinja() const;
static QString findCbpFile(const QDir &); static QString findCbpFile(const QDir &);
static QString findDumperLibrary(const Utils::Environment &env);
private slots: private slots:
void updateContextMenu(ProjectExplorer::Project *project, ProjectExplorer::Node *node); void updateContextMenu(ProjectExplorer::Project *project, ProjectExplorer::Node *node);
void runCMake(); void runCMake();
void runCMakeContextMenu(); void runCMakeContextMenu();
private: private:
void runCMake(ProjectExplorer::Project *project); void runCMake(ProjectExplorer::Project *project);
static QString qtVersionForQMake(const QString &qmakePath);
static QPair<QString, QString> findQtDir(const Utils::Environment &env);
CMakeSettingsPage *m_settingsPage; CMakeSettingsPage *m_settingsPage;
QAction *m_runCMakeAction; QAction *m_runCMakeAction;
QAction *m_runCMakeActionContextMenu; QAction *m_runCMakeActionContextMenu;