5b3dfa470e
this avoids the scenario where the linker would pick up the wrong qt libraries for LIBS_PRIVATE because LIBS added the "wrong" path first. this is also consistent with configure-supplied dependencies as of recently. as a side effect, this also removes pretenses of lsb linker handling, as it makes no sense after the change and is certainly obsolete anyway. Fixes: QTBUG-50921 Change-Id: I84398c9143f393c2eefb3c69a31bd9f633669924 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@gmx.de> Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
17 lines
538 B
Plaintext
17 lines
538 B
Plaintext
CONFIG -= console
|
|
QMAKE_LFLAGS += $$QMAKE_LFLAGS_WINDOWS
|
|
contains(TEMPLATE, ".*app") {
|
|
QMAKE_LFLAGS += $$QMAKE_LFLAGS_EXE
|
|
mingw:DEFINES += QT_NEEDS_QMAIN
|
|
|
|
qt:for(entryLib, $$list($$unique(QMAKE_LIBS_QT_ENTRY))) {
|
|
isEqual(entryLib, -lqtmain) {
|
|
lib = $$QT.core.libs/$${QMAKE_PREFIX_STATICLIB}qtmain$$QT_LIBINFIX$$qtPlatformTargetSuffix().$$QMAKE_EXTENSION_STATICLIB
|
|
PRE_TARGETDEPS += $$lib
|
|
QMAKE_LIBS += $$lib
|
|
} else {
|
|
QMAKE_LIBS += $${entryLib}
|
|
}
|
|
}
|
|
}
|