From b289d669a5025c7969ee35f2ee0d4284d173dec5 Mon Sep 17 00:00:00 2001
From: Joerg Bornemann <joerg.bornemann@qt.io>
Date: Fri, 29 Sep 2023 11:17:07 +0200
Subject: [PATCH] QMake: Make 'entrypoint' and 'qt' CONFIG values
 order-independent
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

If users have
    CONFIG += qt
in their .pro file then the project won't link if the platform requires
the entrypoint module. This is because qt.prf is loaded before
entrypoint.prf in this situation.

Make the CONFIG values 'entrypoint' and 'qt' independent of their order
by embedding the content of entrypoint.prf into qt.prf.

Pick-to: 6.5 6.6
Fixes: QTBUG-117674
Change-Id: I72a3c9be023a73d70454533262544a4211cb6974
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
---
 mkspecs/features/entrypoint.prf | 10 ----------
 mkspecs/features/qt.prf         | 12 ++++++++++++
 2 files changed, 12 insertions(+), 10 deletions(-)
 delete mode 100644 mkspecs/features/entrypoint.prf

diff --git a/mkspecs/features/entrypoint.prf b/mkspecs/features/entrypoint.prf
deleted file mode 100644
index 98c41161a0..0000000000
--- a/mkspecs/features/entrypoint.prf
+++ /dev/null
@@ -1,10 +0,0 @@
-!qt: return()
-
-win32 {
-    !console:contains(TEMPLATE, ".*app"): \
-        QT_PRIVATE += entrypoint_private
-} else:uikit {
-    qt_depends = $$resolve_depends(QT, "QT.")
-    !watchos:equals(TEMPLATE, app):contains(qt_depends, gui(-private)?): \
-        QT_PRIVATE += entrypoint_private
-}
diff --git a/mkspecs/features/qt.prf b/mkspecs/features/qt.prf
index d6a87b7599..3b71eea6bc 100644
--- a/mkspecs/features/qt.prf
+++ b/mkspecs/features/qt.prf
@@ -69,6 +69,18 @@ unix {
     }
 }
 
+# Load the entrypoint module if requested
+entrypoint {
+    win32 {
+        !console:contains(TEMPLATE, ".*app"): \
+            QT_PRIVATE += entrypoint_private
+    } else:uikit {
+        qt_depends = $$resolve_depends(QT, "QT.")
+        !watchos:equals(TEMPLATE, app):contains(qt_depends, gui(-private)?): \
+            QT_PRIVATE += entrypoint_private
+    }
+}
+
 # Will automatically add plugins, so run first
 contains(QT_CONFIG, permissions): load(permissions)