From ac627bb77001fa6d182a8a247646a810a94a06ee Mon Sep 17 00:00:00 2001 From: Daniel Teske Date: Tue, 22 Oct 2013 15:51:21 +0200 Subject: [PATCH] CMake: Don't expect the version in --help output Since we don't actually need it anymore, just remove the code. Task-number: QTCREATORBUG-10452 Change-Id: I59f55f3a319240826569de308491cac697c4f045 Reviewed-by: Tobias Hunger --- src/plugins/cmakeprojectmanager/cmakevalidator.cpp | 7 +------ src/plugins/cmakeprojectmanager/cmakevalidator.h | 1 - 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/src/plugins/cmakeprojectmanager/cmakevalidator.cpp b/src/plugins/cmakeprojectmanager/cmakevalidator.cpp index 8a85a756fa7..203dfe8706d 100644 --- a/src/plugins/cmakeprojectmanager/cmakevalidator.cpp +++ b/src/plugins/cmakeprojectmanager/cmakevalidator.cpp @@ -86,16 +86,11 @@ void CMakeValidator::finished(int exitCode) } if (m_state == CMakeValidator::RunningBasic) { QByteArray response = m_process->readAll(); - QRegExp versionRegexp(QLatin1String("^cmake version ([\\d\\.]*)")); - versionRegexp.indexIn(QString::fromLocal8Bit(response)); m_hasCodeBlocksMsvcGenerator = response.contains("CodeBlocks - NMake Makefiles"); m_hasCodeBlocksNinjaGenerator = response.contains("CodeBlocks - Ninja"); - m_version = versionRegexp.cap(1); - if (versionRegexp.capturedTexts().size() > 3) - m_version += QLatin1Char('.') + versionRegexp.cap(3); - if (m_version.isEmpty()) { + if (response.isEmpty()) { m_state = CMakeValidator::Invalid; } else { m_state = CMakeValidator::RunningFunctionList; diff --git a/src/plugins/cmakeprojectmanager/cmakevalidator.h b/src/plugins/cmakeprojectmanager/cmakevalidator.h index 945a2271ff7..c4c39283a59 100644 --- a/src/plugins/cmakeprojectmanager/cmakevalidator.h +++ b/src/plugins/cmakeprojectmanager/cmakevalidator.h @@ -74,7 +74,6 @@ private: QProcess *m_process; bool m_hasCodeBlocksMsvcGenerator; bool m_hasCodeBlocksNinjaGenerator; - QString m_version; QString m_executable; QMap m_functionArgs;