whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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 <alexandru.croitor@qt.io>
bb10
Tor Arne Vestbø 2020-11-10 12:57:14 +01:00
parent 30a9b045cc
commit 6e9a0f6688
2 changed files with 15 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/entrypoint/entrypoint_implementation.pro
View File

@ -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

15
src/entrypoint/entrypoint_module.pro
View File

@ -7,4 +7,19 @@ CONFIG += header_module no_module_headers internal_module
MODULE_DEPENDS = entrypoint_implementation
QT =
mingw {
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
}
MODULE_PRI_EXTRA_CONTENT = \
"QT.entrypoint_implementation.name = QtEntryPointImplementation" \
"QT.entrypoint_implementation.module = Qt6EntryPoint" \
"QT.entrypoint_implementation.libs = \$\$QT_MODULE_LIB_BASE" \
"QT.entrypoint_implementation.module_config = staticlib v2 internal_module"
load(qt_module)