From 75032a4e1f0a9e50bed9f323f79bc955c7217932 Mon Sep 17 00:00:00 2001
From: hjk <hjk@qt.io>
Date: Mon, 17 May 2021 08:46:40 +0200
Subject: [PATCH] QtSupport: Allow remote qmakes in some places

Useful for Docker support.

Change-Id: I9eba01e14c23dc704bfdf531ecfda86174d44b0b
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
---
 src/plugins/qtsupport/baseqtversion.cpp | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/src/plugins/qtsupport/baseqtversion.cpp b/src/plugins/qtsupport/baseqtversion.cpp
index f848ebc544e..b37e392e07a 100644
--- a/src/plugins/qtsupport/baseqtversion.cpp
+++ b/src/plugins/qtsupport/baseqtversion.cpp
@@ -1733,12 +1733,11 @@ Tasks BaseQtVersion::reportIssuesImpl(const QString &proFile, const QString &bui
         results.append(BuildSystemTask(Task::Error, msg));
     }
 
-    QFileInfo qmakeInfo = qmakeCommand().toFileInfo();
-    if (!qmakeInfo.exists() ||
-        !qmakeInfo.isExecutable()) {
+    FilePath qmake = qmakeCommand();
+    if (!qmake.isExecutableFile()) {
         //: %1: Path to qmake executable
         const QString msg = QCoreApplication::translate("QmakeProjectManager::QtVersion",
-                                                        "The qmake command \"%1\" was not found or is not executable.").arg(qmakeCommand().toUserOutput());
+                                                        "The qmake command \"%1\" was not found or is not executable.").arg(qmake.toUserOutput());
         results.append(BuildSystemTask(Task::Error, msg));
     }
 
@@ -1762,8 +1761,7 @@ QtConfigWidget *BaseQtVersion::createConfigurationWidget() const
     return nullptr;
 }
 
-static QByteArray runQmakeQuery(const FilePath &binary, const Environment &env,
-                                QString *error)
+static QByteArray runQmakeQuery(const FilePath &binary, const Environment &env, QString *error)
 {
     QTC_ASSERT(error, return QByteArray());
 
@@ -1803,8 +1801,7 @@ bool BaseQtVersionPrivate::queryQMakeVariables(const FilePath &binary, const Env
     if (!error)
         error = &tmp;
 
-    const QFileInfo qmake = binary.toFileInfo();
-    if (!qmake.exists() || !qmake.isExecutable() || qmake.isDir()) {
+    if (!binary.isExecutableFile()) {
         *error = QCoreApplication::translate("QtVersion", "qmake \"%1\" is not an executable.").arg(binary.toUserOutput());
         return false;
     }
@@ -2320,8 +2317,7 @@ BaseQtVersion *QtVersionFactory::createQtVersionFromQMakePath
         return l->m_priority > r->m_priority;
     });
 
-    QFileInfo fi = qmakePath.toFileInfo();
-    if (!fi.exists() || !fi.isExecutable() || !fi.isFile())
+    if (!qmakePath.isExecutableFile())
         return nullptr;
 
     QtVersionFactory::SetupData setup;