Avoid explicit checks for windows host when working with file paths

We have fileNameCaseSensitivity and withExecutableSuffix et al.

Change-Id: I79bd2cd57e258c3f15673a661a49bab597d7afa4
Reviewed-by: Daniel Teske <daniel.teske@digia.com>

2 files changed, 11 insertions, 22 deletions

diff --git a/src/plugins/qtsupport/baseqtversion.cpp b/src/plugins/qtsupport/baseqtversion.cpp
index f67317b16a..200377bc46 100644
--- a/src/plugins/qtsupport/baseqtversion.cpp
+++ b/src/plugins/qtsupport/baseqtversion.cpp
@@ -715,37 +715,26 @@ QString BaseQtVersion::findQtBinary(Binaries binary) const
 
     QStringList possibleCommands;
     switch (binary) {
-    case QmlScene: {
-        if (HostOsInfo::isWindowsHost())
-            possibleCommands << QLatin1String("qmlscene.exe");
-        else
-            possibleCommands << QLatin1String("qmlscene");
-    }
+    case QmlScene:
+        possibleCommands << HostOsInfo::withExecutableSuffix(QLatin1String("qmlscene"));
         break;
     case QmlViewer: {
-        if (HostOsInfo::isWindowsHost())
-            possibleCommands << QLatin1String("qmlviewer.exe");
-        else if (HostOsInfo::isMacHost())
+        if (HostOsInfo::isMacHost())
             possibleCommands << QLatin1String("QMLViewer.app/Contents/MacOS/QMLViewer");
         else
-            possibleCommands << QLatin1String("qmlviewer");
+            possibleCommands << HostOsInfo::withExecutableSuffix(QLatin1String("qmlviewer"));
     }
         break;
     case Designer:
-        if (HostOsInfo::isWindowsHost())
-            possibleCommands << QLatin1String("designer.exe");
-        else if (HostOsInfo::isMacHost())
+        if (HostOsInfo::isMacHost())
             possibleCommands << QLatin1String("Designer.app/Contents/MacOS/Designer");
         else
-            possibleCommands << QLatin1String("designer");
+            possibleCommands << HostOsInfo::withExecutableSuffix(QLatin1String("designer"));
         break;
     case Linguist:
-        if (HostOsInfo::isWindowsHost())
-            possibleCommands << QLatin1String("linguist.exe");
-        else if (HostOsInfo::isMacHost())
+        if (HostOsInfo::isMacHost())
             possibleCommands << QLatin1String("Linguist.app/Contents/MacOS/Linguist");
-        else
-            possibleCommands << QLatin1String("linguist");
+            possibleCommands << HostOsInfo::withExecutableSuffix(QLatin1String("linguist"));
         break;
     case Uic:
         if (HostOsInfo::isWindowsHost()) {
diff --git a/src/plugins/qtsupport/qtversionmanager.cpp b/src/plugins/qtsupport/qtversionmanager.cpp
index 3747d3bef1..1c40e8fbb4 100644
--- a/src/plugins/qtsupport/qtversionmanager.cpp
+++ b/src/plugins/qtsupport/qtversionmanager.cpp
@@ -632,9 +632,9 @@ FileName QtVersionManager::findQMakeBinaryFromMakefile(const QString &makefile)
                     qDebug()<<"#~~ QMAKE is:"<<r1.cap(1).trimmed();
                 QFileInfo qmake(r1.cap(1).trimmed());
                 QString qmakePath = qmake.filePath();
-                if (HostOsInfo::isWindowsHost()
-                        && !qmakePath.endsWith(QLatin1String(".exe"))) {
-                    qmakePath.append(QLatin1String(".exe"));
+                if (!QString::fromLatin1(QTC_HOST_EXE_SUFFIX).isEmpty()
+                        && !qmakePath.endsWith(QLatin1String(QTC_HOST_EXE_SUFFIX))) {
+                    qmakePath.append(QLatin1String(QTC_HOST_EXE_SUFFIX));
                 }
                 // Is qmake still installed?
                 QFileInfo fi(qmakePath);