Commit fc568fd0 authored by Eike Ziller's avatar Eike Ziller

QtSupport/OS X: Fix issues with selecting qmake from Qt 4 packages

Native file dialogs can only filter against the names of resolved
symlinks, not the name of the symlink (native Cocoa issue), which is
"qmake-4.8" in case of Qt 4 binary packages.
Simply avoid any stupid issues with not being able to select qmake
executables with whatever prefix by making the filter "qmake*".

Task-number: QTCREATORBUG-13190
Change-Id: Ieb059da75f3f1ecf2a2ff4a3e0633719e54ea43e
Reviewed-by: default avatarDaniel Teske <daniel.teske@digia.com>
Reviewed-by: default avatarEike Ziller <eike.ziller@theqtcompany.com>
parent cc42a087
......@@ -134,15 +134,11 @@ QString BuildableHelperLibrary::qtVersionForQMake(const QString &qmakePath, bool
QStringList BuildableHelperLibrary::possibleQMakeCommands()
{
// On windows no one has renamed qmake, right?
if (HostOsInfo::isWindowsHost())
return QStringList(QLatin1String("qmake.exe"));
// On unix some distributions renamed qmake to avoid clashes
QStringList result;
result << QLatin1String("qmake") << QLatin1String("qmake-qt4") << QLatin1String("qmake4")
<< QLatin1String("qmake-qt5") << QLatin1String("qmake5") ;
return result;
// On Windows it is always "qmake.exe"
// On Unix some distributions renamed qmake with a postfix to avoid clashes
// On OS X, Qt 4 binary packages also has renamed qmake. There are also symbolic links that are
// named "qmake", but the file dialog always checks against resolved links (native Cocoa issue)
return QStringList(QLatin1String("qmake*"));
}
// Copy helper source files to a target directory, replacing older files.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment