diff --git a/src/libs/utils/buildablehelperlibrary.cpp b/src/libs/utils/buildablehelperlibrary.cpp index fd1b6363558..39c3b7cfea4 100644 --- a/src/libs/utils/buildablehelperlibrary.cpp +++ b/src/libs/utils/buildablehelperlibrary.cpp @@ -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(); } diff --git a/src/libs/utils/buildablehelperlibrary.h b/src/libs/utils/buildablehelperlibrary.h index 0631797102e..83d37b2e124 100644 --- a/src/libs/utils/buildablehelperlibrary.h +++ b/src/libs/utils/buildablehelperlibrary.h @@ -46,9 +46,8 @@ public: static FileName findSystemQt(const Environment &env); static bool isQtChooser(const QFileInfo &info); static QString qtChooserToQmakePath(const QString &path); - // return true if the qmake at qmakePath is qt4 (used by QtVersion) + // return true if the qmake at qmakePath is a Qt (used by QtVersion) static QString qtVersionForQMake(const QString &qmakePath); - static QString qtVersionForQMake(const QString &qmakePath, bool *qmakeIsExecutable); // returns something like qmake4, qmake, qmake-qt4 or whatever distributions have chosen (used by QtVersion) static QStringList possibleQMakeCommands();