From 67b082b51bee5ae5bf2bd188c65e9b26d003a33b Mon Sep 17 00:00:00 2001
From: Christian Stenger <christian.stenger@qt.io>
Date: Fri, 23 Jul 2021 11:23:05 +0200
Subject: [PATCH] QtSupport: Fix host specific handling

When handling qmake on a device we need to take the
device's host os into account instead of ours.

Change-Id: Ice5d11dc5c623be702d1e54d6b3d0c635ff57c7a
Reviewed-by: hjk <hjk@qt.io>
---
 src/plugins/qtsupport/baseqtversion.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/plugins/qtsupport/baseqtversion.cpp b/src/plugins/qtsupport/baseqtversion.cpp
index 8b34f3c5b98..037d602297c 100644
--- a/src/plugins/qtsupport/baseqtversion.cpp
+++ b/src/plugins/qtsupport/baseqtversion.cpp
@@ -1901,7 +1901,8 @@ FilePath BaseQtVersionPrivate::mkspecFromVersionInfo(const QHash<ProKey, ProStri
 
     // qDebug() << "default mkspec is located at" << mkspecFullPath;
 
-    if (HostOsInfo::isWindowsHost()) {
+    OsType osInfo = mkspecFullPath.osType();
+    if (osInfo == OsTypeWindows) {
         if (!qt5) {
             QFile f2(mkspecFullPath.toString() + "/qmake.conf");
             if (f2.exists() && f2.open(QIODevice::ReadOnly)) {
@@ -1931,7 +1932,7 @@ FilePath BaseQtVersionPrivate::mkspecFromVersionInfo(const QHash<ProKey, ProStri
             }
         }
     } else {
-        if (HostOsInfo::isMacHost()) {
+        if (osInfo == OsTypeMac) {
             QFile f2(mkspecFullPath.toString() + "/qmake.conf");
             if (f2.exists() && f2.open(QIODevice::ReadOnly)) {
                 while (!f2.atEnd()) {