diff options
| author | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2020-10-20 16:42:10 +0200 |
|---|---|---|
| committer | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2020-10-20 17:12:44 +0200 |
| commit | 4ad464461f285af3fb2845eb27b1a20fc0b09b08 (patch) | |
| tree | dad890ccac6258cfa2febb02df40c0488b3266de | |
| parent | 0948846b42e0009ed2c9211c6995ce228db07032 (diff) | |
Fix linking of non-console application on mingw
As a result of b5af1408099d the link dependency to the
mingw32 static library was ordered after the entrypoint
library, which resulted in the WinMain symbol not being
found during linking due to how the static linker processes
archives.
Fixes: QTBUG-87725
Change-Id: I8e075f91f7f06dcdc618a4e0ae6d9c1d832888c0
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
| -rw-r--r-- | mkspecs/features/entrypoint.prf | 11 | ||||
| -rw-r--r-- | src/entrypoint/entrypoint.pro | 1 |
2 files changed, 10 insertions, 2 deletions
diff --git a/mkspecs/features/entrypoint.prf b/mkspecs/features/entrypoint.prf index 8442f8930b..4601455c4a 100644 --- a/mkspecs/features/entrypoint.prf +++ b/mkspecs/features/entrypoint.prf @@ -1,2 +1,11 @@ -qt:!console:contains(TEMPLATE, ".*app"): \ +qt:!console:contains(TEMPLATE, ".*app") { + # 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. Unfortunately qmake and the + # module system doesn't allow specifying linker flags or dependencies + # as part of the module that end up _before_ the library itself, so + # we have to work around it by declaring the dependency here. + mingw: LIBS += -lmingw32 + QT_PRIVATE += entrypoint +} diff --git a/src/entrypoint/entrypoint.pro b/src/entrypoint/entrypoint.pro index dd0618cd56..9dc8de57d4 100644 --- a/src/entrypoint/entrypoint.pro +++ b/src/entrypoint/entrypoint.pro @@ -23,7 +23,6 @@ win32 { mingw { DEFINES += QT_NEEDS_QMAIN MODULE_DEFINES += QT_NEEDS_QMAIN - LIBS += -lmingw32 } } |