forked from qt-creator/qt-creator
Couldn't set "/usr/bin/qmake-4.6" or "/Developer/Tools/Qt/qmake" for Qt.
Task-number: QTCREATORBUG-463 Reviewed-by: dt
This commit is contained in:
@@ -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())
|
||||
|
@@ -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",
|
||||
|
Reference in New Issue
Block a user