Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
home:rhabacker:branches:windows:mingw:win32:Qt511
mingw32-libqt5-qtbase
0001-Add-qmake-variable-QMAKE_LIBS_POST-to-be-a...
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File 0001-Add-qmake-variable-QMAKE_LIBS_POST-to-be-able-to-appen.patch of Package mingw32-libqt5-qtbase
From 1b803131a2716d9b4d9732eacfaa0c713fb41ba5 Mon Sep 17 00:00:00 2001 From: Ralf Habacker <ralf.habacker@freenet.de> Date: Tue, 1 Aug 2017 13:00:13 +0200 Subject: [PATCH] Add qmake variable QMAKE_LIBS_POST to be able to append libraries at the end of the link line. Change-Id: I65cbadd6a523e49ec34409f7d554c0fbe9b254b5 --- qmake/generators/win32/mingw_make.cpp | 3 ++- qmake/generators/win32/winmakefile.cpp | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/qmake/generators/win32/mingw_make.cpp b/qmake/generators/win32/mingw_make.cpp index b9895fb..a2be26d 100644 --- a/qmake/generators/win32/mingw_make.cpp +++ b/qmake/generators/win32/mingw_make.cpp @@ -279,7 +279,8 @@ void MingwMakefileGenerator::writeLibsPart(QTextStream &t) t << "LFLAGS = " << var("QMAKE_LFLAGS") << endl; t << "LIBS = " << fixLibFlags("QMAKE_LIBS").join(' ') << ' ' - << fixLibFlags("QMAKE_LIBS_PRIVATE").join(' ') << endl; + << fixLibFlags("QMAKE_LIBS_PRIVATE").join(' ') << ' ' + << fixLibFlags("QMAKE_LIBS_POST").join(' ') << endl; } } diff --git a/qmake/generators/win32/winmakefile.cpp b/qmake/generators/win32/winmakefile.cpp index 75bb5d2..ef4b248 100644 --- a/qmake/generators/win32/winmakefile.cpp +++ b/qmake/generators/win32/winmakefile.cpp @@ -84,7 +84,7 @@ Win32MakefileGenerator::findLibraries(bool linkPrl, bool mergeLflags) if (impexts.isEmpty()) impexts = project->values("QMAKE_EXTENSION_STATICLIB"); QList<QMakeLocalFileName> dirs; - static const char * const lflags[] = { "QMAKE_LIBS", "QMAKE_LIBS_PRIVATE", 0 }; + static const char * const lflags[] = { "QMAKE_LIBS", "QMAKE_LIBS_PRIVATE", "QMAKE_LIBS_POST", 0 }; for (int i = 0; lflags[i]; i++) { ProStringList &l = project->values(lflags[i]); for (ProStringList::Iterator it = l.begin(); it != l.end();) { @@ -634,7 +634,8 @@ void Win32MakefileGenerator::writeLibsPart(QTextStream &t) t << "LINKER = " << var("QMAKE_LINK") << endl; t << "LFLAGS = " << var("QMAKE_LFLAGS") << endl; t << "LIBS = " << fixLibFlags("QMAKE_LIBS").join(' ') << ' ' - << fixLibFlags("QMAKE_LIBS_PRIVATE").join(' ') << endl; + << fixLibFlags("QMAKE_LIBS_PRIVATE").join(' ') << ' ' + << fixLibFlags("QMAKE_LIBS_POST").join(' ') << endl; } } -- 1.8.4.5
Locations
Projects
Search
Status Monitor
Help
OpenBuildService.org
Documentation
API Documentation
Code of Conduct
Contact
Support
@OBShq
Terms
openSUSE Build Service is sponsored by
The Open Build Service is an
openSUSE project
.
Sign Up
Log In
Places
Places
All Projects
Status Monitor