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

BuildableHelperLibrary: Remove a unused method

Browse Source 
Change-Id: I7a6355e8491fc8d3548419106f8a0d9981015653
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
This commit is contained in:
Tobias Hunger
2014-10-30 15:56:01 +01:00
parent 298d07d8c8
commit 9477250b9b
2 changed files with 2 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/libs/utils/buildablehelperlibrary.cpp
View File

@@ -106,20 +106,12 @@ FileName BuildableHelperLibrary::findSystemQt(const Environment &env)
QString BuildableHelperLibrary::qtVersionForQMake(const QString &qmakePath)
{
bool qmakeIsExecutable;
return BuildableHelperLibrary::qtVersionForQMake(qmakePath, &qmakeIsExecutable);
}
QString BuildableHelperLibrary::qtVersionForQMake(const QString &qmakePath, bool *qmakeIsExecutable)
{
*qmakeIsExecutable = !qmakePath.isEmpty();
if (!*qmakeIsExecutable)
if (qmakePath.isEmpty())
return QString();
QProcess qmake;
qmake.start(qmakePath, QStringList(QLatin1String("--version")));
if (!qmake.waitForStarted()) {
*qmakeIsExecutable = false;
qWarning("Cannot start '%s': %s", qPrintable(qmakePath), qPrintable(qmake.errorString()));
return QString();
}
@@ -129,7 +121,6 @@ QString BuildableHelperLibrary::qtVersionForQMake(const QString &qmakePath, bool
return QString();
}
if (qmake.exitStatus() != QProcess::NormalExit) {
*qmakeIsExecutable = false;
qWarning("'%s' crashed.", qPrintable(qmakePath));
return QString();
}