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

Merge remote-tracking branch 'origin/3.0'

Browse Source 
Conflicts:
	qtcreator.pri
	src/plugins/qnx/qnxutils.cpp

Change-Id: I019ad21fb4c128eb736c8ab2d09310757e3be037
This commit is contained in:
Eike Ziller
2013-10-24 08:56:29 +02:00
parent 328daa9c5a b889bb1608
commit c3119d1aa7
192 changed files with 2423 additions and 1016 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/plugins/cmakeprojectmanager/cmakevalidator.cpp
View File

@@ -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;

1
src/plugins/cmakeprojectmanager/cmakevalidator.h
View File

@@ -74,7 +74,6 @@ private:
QProcess *m_process;
bool m_hasCodeBlocksMsvcGenerator;
bool m_hasCodeBlocksNinjaGenerator;
QString m_version;
QString m_executable;
QMap<QString, QStringList> m_functionArgs;