diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2015-06-02 21:21:53 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2015-10-02 14:01:00 +0000 |
| commit | 3e73e3552c8644ace6ac86a8f72e9f1217611979 (patch) | |
| tree | cefa62f6812340374aec3fcaf19acca7b9be9a8e /qmake/generators/makefile.cpp | |
| parent | 2677cc47fc9e5bfa1d3daf69e464521041a8144c (diff) | |
make lflags deduplication independent from link_prl
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>
Diffstat (limited to 'qmake/generators/makefile.cpp')
| -rw-r--r-- | qmake/generators/makefile.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp index 0d7571341a..e329fe2898 100644 --- a/qmake/generators/makefile.cpp +++ b/qmake/generators/makefile.cpp @@ -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); } |