Don't rely on the module.pri for the entrypoint linking to the library

Depending on the presence and behavior of HEADER_MODULE/header_module
in CMake and qmake land, the module.pri might end up with an empty
module line, which means adding the module via QT_PRIVATE += entrypoint
will not link to the static library.

To avoid this problem we write an explicit module entry (QT.foo.bar)
into the same module.pri file as the one generated by qt_module,
where the auto-generated one has header_module enabled, and hence
no link behavior, while the manually written entry has a module
component, and will ensure linkage to the static library.

Change-Id: Ib98484f74410fab45c4d109f3610028200fba0c5
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>

1 files changed, 4 insertions, 30 deletions

diff --git a/src/entrypoint/entrypoint.pro b/src/entrypoint/entrypoint.pro
index 4a0b0b6e4c..261b3e68b3 100644
--- a/src/entrypoint/entrypoint.pro
+++ b/src/entrypoint/entrypoint.pro
@@ -1,34 +1,8 @@
 # Additional Qt project file for QtEntryPoint lib
 !win32:error("$$_FILE_ is intended only for Windows!")
 
-TARGET = QtEntryPoint
+TEMPLATE = subdirs
+CONFIG += ordered
 
-CONFIG += static no_module_headers internal_module
-QT = core
-
-DEFINES += QT_NO_FOREACH
-
-win32 {
-    SOURCES = qtentrypoint_win.cpp
-    CONFIG -= qt
-
-    QMAKE_USE_PRIVATE += shell32
-
-    msvc {
-        QMAKE_CFLAGS_DEBUG -= -Zi
-        QMAKE_CXXFLAGS_DEBUG -= -Zi
-        QMAKE_CFLAGS_DEBUG *= -Z7
-        QMAKE_CXXFLAGS_DEBUG *= -Z7
-    }
-    mingw {
-        DEFINES += QT_NEEDS_QMAIN
-        MODULE_DEFINES += QT_NEEDS_QMAIN
-
-        # This library needs to come before the entry-point library in the
-        # linker line, so that the static linker will pick up the WinMain
-        # symbol from the entry-point library.
-        MODULE_LDFLAGS += -lmingw32
-    }
-}
-
-load(qt_module)
+SUBDIRS += entrypoint_module.pro
+SUBDIRS += entrypoint_implementation.pro