From 8f586cedcd3a1bbca31807f502f59297ecf50386 Mon Sep 17 00:00:00 2001
From: con <qtc-committer@nokia.com>
Date: Fri, 11 Dec 2009 16:30:49 +0100
Subject: [PATCH] Couldn't set "/usr/bin/qmake-4.6" or
"/Developer/Tools/Qt/qmake" for Qt.
Task-number: QTCREATORBUG-463
Reviewed-by: dt
---
src/plugins/projectexplorer/debugginghelper.cpp | 4 ----
src/plugins/qt4projectmanager/qtversionmanager.cpp | 3 +--
2 files changed, 1 insertion(+), 6 deletions(-)
diff --git a/src/plugins/projectexplorer/debugginghelper.cpp b/src/plugins/projectexplorer/debugginghelper.cpp
index 460f90be30e..0c6c27633ec 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 b1fc6a0bd3f..4bfae83d45d 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",
--
GitLab