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

Couldn't set "/usr/bin/qmake-4.6" or "/Developer/Tools/Qt/qmake" for Qt.

Browse Source 
Task-number: QTCREATORBUG-463
Reviewed-by: dt
This commit is contained in:
con
2009-12-11 16:30:49 +01:00
parent bdde628374
commit 8f586cedcd
2 changed files with 1 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/projectexplorer/debugginghelper.cpp
View File

@@ -228,10 +228,6 @@ QString DebuggingHelperLibrary::buildDebuggingHelperLibrary(const QString &direc
QString DebuggingHelperLibrary::qtVersionForQMake(const QString &qmakePath) QString DebuggingHelperLibrary::qtVersionForQMake(const QString &qmakePath)
{ {
QString binary = qmakePath.mid(qmakePath.lastIndexOf('/')+1);
if (!possibleQMakeCommands().contains(binary))
return QString();
QProcess qmake; QProcess qmake;
qmake.start(qmakePath, QStringList(QLatin1String("--version"))); qmake.start(qmakePath, QStringList(QLatin1String("--version")));
if (!qmake.waitForFinished()) if (!qmake.waitForFinished())

3
src/plugins/qt4projectmanager/qtversionmanager.cpp
View File

@@ -889,8 +889,7 @@ void QtVersion::updateVersionInfo() const
m_hasDocumentation = false; m_hasDocumentation = false;
QFileInfo qmake(qmakeCommand()); QFileInfo qmake(qmakeCommand());
if (ProjectExplorer::DebuggingHelperLibrary::possibleQMakeCommands().contains(qmake.fileName()) if (qmake.exists() && qmake.isExecutable()) {
&& qmake.exists()) {
static const char * const variables[] = { static const char * const variables[] = {
"QT_VERSION", "QT_VERSION",
"QT_INSTALL_DATA", "QT_INSTALL_DATA",