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

Fix MSVC10 compiler warnings.

Browse Source 
Reviewed-by: dt
This commit is contained in:
Friedemann Kleint
2010-06-21 12:05:18 +02:00
parent a793217c07
commit 2a6f1df168
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp
View File

@@ -206,7 +206,7 @@ CMakeBuildConfiguration *CMakeBuildConfigurationFactory::create(ProjectExplorer:
QString(), QString(),
&ok); &ok);
if (!ok || buildConfigurationName.isEmpty()) if (!ok || buildConfigurationName.isEmpty())
return false; return 0;
CMakeBuildConfiguration *bc = new CMakeBuildConfiguration(cmtarget); CMakeBuildConfiguration *bc = new CMakeBuildConfiguration(cmtarget);
bc->setDisplayName(buildConfigurationName); bc->setDisplayName(buildConfigurationName);
@@ -224,7 +224,7 @@ CMakeBuildConfiguration *CMakeBuildConfigurationFactory::create(ProjectExplorer:
bc->environment()); bc->environment());
if (copw.exec() != QDialog::Accepted) { if (copw.exec() != QDialog::Accepted) {
delete bc; delete bc;
return false; return 0;
} }
cmtarget->addBuildConfiguration(bc); // this also makes the name unique cmtarget->addBuildConfiguration(bc); // this also makes the name unique

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

@@ -141,7 +141,7 @@ QString CMakeManager::qtVersionForQMake(const QString &qmakePath)
QProcess qmake; QProcess qmake;
qmake.start(qmakePath, QStringList(QLatin1String("--version"))); qmake.start(qmakePath, QStringList(QLatin1String("--version")));
if (!qmake.waitForFinished()) if (!qmake.waitForFinished())
return false; return QString();
QString output = qmake.readAllStandardOutput(); QString output = qmake.readAllStandardOutput();
QRegExp regexp(QLatin1String("(QMake version|Qmake version:)[\\s]*([\\d.]*)")); QRegExp regexp(QLatin1String("(QMake version|Qmake version:)[\\s]*([\\d.]*)"));
regexp.indexIn(output); regexp.indexIn(output);