diff options
| author | Eike Ziller <eike.ziller@theqtcompany.com> | 2014-10-17 13:53:46 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@theqtcompany.com> | 2014-10-17 14:23:49 +0200 |
| commit | fc568fd0d4353e9c0fde57e18952a854cc58c180 (patch) | |
| tree | 5a893c0600feb5600eb0abe3f361b82df81992f0 /src | |
| parent | cc42a0872317b7b51c96bf68171993bff90bdf2c (diff) | |
| download | qt-creator-fc568fd0d4353e9c0fde57e18952a854cc58c180.tar.gz | |
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: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/libs/utils/buildablehelperlibrary.cpp | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/src/libs/utils/buildablehelperlibrary.cpp b/src/libs/utils/buildablehelperlibrary.cpp index bfdd4de98a..abcae50ca8 100644 --- a/src/libs/utils/buildablehelperlibrary.cpp +++ b/src/libs/utils/buildablehelperlibrary.cpp @@ -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. |