QmakeProjectManager: Fix Makefile compatibility checkv13.0.0-beta2

E.g. qmake "binaries" for Android are actually shell scripts that call a
Desktop qmake in a different location, which lead Qt Creator to conclude
that the directory contains an incompatible build.
Fix this by checking that the -qtconf argument passed to qmake points
into the real qmake's parent directory, as is the case in the
abovementioned scenario.

Fixes: QTCREATORBUG-30354
Change-Id: Id6e878fab3379a3a8893389447514a1b7226784c
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>

1 files changed, 2 insertions, 0 deletions

diff --git a/src/plugins/qmakeprojectmanager/makefileparse.h b/src/plugins/qmakeprojectmanager/makefileparse.h
index e9e5be0812..18be3f801a 100644
--- a/src/plugins/qmakeprojectmanager/makefileparse.h
+++ b/src/plugins/qmakeprojectmanager/makefileparse.h
@@ -30,6 +30,7 @@ public:
     MakefileState makeFileState() const;
     Utils::FilePath qmakePath() const;
     Utils::FilePath srcProFile() const;
+    Utils::FilePath qtConfPath() const { return m_qtConfFile;}
     QMakeStepConfig config() const;
 
     QString unparsedArguments() const;
@@ -59,6 +60,7 @@ private:
     MakefileState m_state;
     Utils::FilePath m_qmakePath;
     Utils::FilePath m_srcProFile;
+    Utils::FilePath m_qtConfFile;
 
     QmakeBuildConfig m_qmakeBuildConfig;
     QMakeStepConfig m_config;