AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

make lflags deduplication independent from link_prl

Browse Source 
the dependency doesn't seem to make any sense.

while the deduplication is a bit naive and thus dangerous, it was
already enabled by default anyway by virtue of link_prl being enabled by
default, so this amounts to a non-change for by far most projects.
use no_lflags_merge to disable it.

Change-Id: Ia441931ddbc41ed617aee21e6fe8821e3448d2bc
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
This commit is contained in:
Oswald Buddenhagen 2015-06-02 21:21:53 +02:00
parent 2677cc47fc
commit 3e73e3552c
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
qmake/generators/makefile.cpp
View File

@ -254,8 +254,7 @@ MakefileGenerator::setProjectFile(QMakeProject *p)
init();
bool linkPrl = (Option::qmake_mode == Option::QMAKE_GENERATE_MAKEFILE)
&& project->isActiveConfig("link_prl");
bool mergeLflags = linkPrl
&& !project->isActiveConfig("no_smart_library_merge")
bool mergeLflags = !project->isActiveConfig("no_smart_library_merge")
&& !project->isActiveConfig("no_lflags_merge");
findLibraries(linkPrl, mergeLflags);
}