diff options
| -rw-r--r-- | src/plugins/projectexplorer/debugginghelper.cpp | 4 | ||||
| -rw-r--r-- | src/plugins/qt4projectmanager/qtversionmanager.cpp | 3 |
2 files changed, 1 insertions, 6 deletions
diff --git a/src/plugins/projectexplorer/debugginghelper.cpp b/src/plugins/projectexplorer/debugginghelper.cpp index 460f90be30..0c6c27633e 100644 --- a/src/plugins/projectexplorer/debugginghelper.cpp +++ b/src/plugins/projectexplorer/debugginghelper.cpp @@ -228,10 +228,6 @@ QString DebuggingHelperLibrary::buildDebuggingHelperLibrary(const QString &direc QString DebuggingHelperLibrary::qtVersionForQMake(const QString &qmakePath) { - QString binary = qmakePath.mid(qmakePath.lastIndexOf('/')+1); - if (!possibleQMakeCommands().contains(binary)) - return QString(); - QProcess qmake; qmake.start(qmakePath, QStringList(QLatin1String("--version"))); if (!qmake.waitForFinished()) diff --git a/src/plugins/qt4projectmanager/qtversionmanager.cpp b/src/plugins/qt4projectmanager/qtversionmanager.cpp index b1fc6a0bd3..4bfae83d45 100644 --- a/src/plugins/qt4projectmanager/qtversionmanager.cpp +++ b/src/plugins/qt4projectmanager/qtversionmanager.cpp @@ -889,8 +889,7 @@ void QtVersion::updateVersionInfo() const m_hasDocumentation = false; QFileInfo qmake(qmakeCommand()); - if (ProjectExplorer::DebuggingHelperLibrary::possibleQMakeCommands().contains(qmake.fileName()) - && qmake.exists()) { + if (qmake.exists() && qmake.isExecutable()) { static const char * const variables[] = { "QT_VERSION", "QT_INSTALL_DATA", |