From 6e9a0f6688bd8554321f8eff10af2c9d9db564a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= Date: Tue, 10 Nov 2020 12:57:14 +0100 Subject: Remove custom logic for writing entrypoint implementation pri Trying to keep the logic self-contained resulted in a race condition during 'make install', even if the two sub projects were CONFIG+=ordered. The approach is now similar to what we have on the CMake side, where the ldflags and defines end up in the 'interface' module. Change-Id: Id08a3ca12da8e7fc36ad76124b52ca4c79aebe3b Reviewed-by: Alexandru Croitor --- src/entrypoint/entrypoint_implementation.pro | 21 --------------------- 1 file changed, 21 deletions(-) (limited to 'src/entrypoint/entrypoint_implementation.pro') diff --git a/src/entrypoint/entrypoint_implementation.pro b/src/entrypoint/entrypoint_implementation.pro index 900e143336..3866163220 100644 --- a/src/entrypoint/entrypoint_implementation.pro +++ b/src/entrypoint/entrypoint_implementation.pro @@ -22,12 +22,6 @@ win32 { } 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 } } @@ -36,21 +30,6 @@ win32 { load(qt_build_paths) load(qt_common) -!build_pass { - MODULE_PRI_CONTENT = \ - "QT.entrypoint_implementation.name = QtEntryPointImplementation" \ - "QT.entrypoint_implementation.module = Qt6EntryPoint" \ - "QT.entrypoint_implementation.ldflags = $$MODULE_LDFLAGS" \ - "QT.entrypoint_implementation.libs = \$\$QT_MODULE_LIB_BASE" \ - "QT.entrypoint_implementation.DEFINES = $$MODULE_DEFINES" \ - "QT.entrypoint_implementation.module_config = staticlib v2 internal_module" - - module_path = $$MODULE_QMAKE_OUTDIR/mkspecs/modules - force_independent|split_incpath: module_path = "$${module_path}-inst" - MODULE_PRI = $$module_path/qt_lib_entrypoint_private.pri - write_file($$MODULE_PRI, MODULE_PRI_CONTENT, append)|error() -} - qtConfig(debug_and_release): CONFIG += debug_and_release qtConfig(build_all): CONFIG += build_all -- cgit v1.2.3