Commit 2a6f1df1 authored by Friedemann Kleint's avatar Friedemann Kleint
Browse files

Fix MSVC10 compiler warnings.

Reviewed-by: dt
parent a793217c
......@@ -206,7 +206,7 @@ CMakeBuildConfiguration *CMakeBuildConfigurationFactory::create(ProjectExplorer:
QString(),
&ok);
if (!ok || buildConfigurationName.isEmpty())
return false;
return 0;
CMakeBuildConfiguration *bc = new CMakeBuildConfiguration(cmtarget);
bc->setDisplayName(buildConfigurationName);
......@@ -224,7 +224,7 @@ CMakeBuildConfiguration *CMakeBuildConfigurationFactory::create(ProjectExplorer:
bc->environment());
if (copw.exec() != QDialog::Accepted) {
delete bc;
return false;
return 0;
}
cmtarget->addBuildConfiguration(bc); // this also makes the name unique
......
......@@ -141,7 +141,7 @@ QString CMakeManager::qtVersionForQMake(const QString &qmakePath)
QProcess qmake;
qmake.start(qmakePath, QStringList(QLatin1String("--version")));
if (!qmake.waitForFinished())
return false;
return QString();
QString output = qmake.readAllStandardOutput();
QRegExp regexp(QLatin1String("(QMake version|Qmake version:)[\\s]*([\\d.]*)"));
regexp.indexIn(output);
......
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