diff options
| author | con <qtc-committer@nokia.com> | 2009-12-11 16:30:49 +0100 |
|---|---|---|
| committer | con <qtc-committer@nokia.com> | 2009-12-11 17:03:19 +0100 |
| commit | 8f586cedcd3a1bbca31807f502f59297ecf50386 (patch) | |
| tree | c7bf4d546b4e0e5dc49f9330ed3ce99a0b46e3bc | |
| parent | bdde62837441ed1334e8374654baeed5718b8ced (diff) | |
| download | qt-creator-8f586cedcd3a1bbca31807f502f59297ecf50386.tar.gz | |
Couldn't set "/usr/bin/qmake-4.6" or "/Developer/Tools/Qt/qmake" for Qt.
Task-number: QTCREATORBUG-463
Reviewed-by: dt
| -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", |