From 3e73e3552c8644ace6ac86a8f72e9f1217611979 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Tue, 2 Jun 2015 21:21:53 +0200 Subject: [PATCH] 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 --- qmake/generators/makefile.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp index 0d7571341ab..e329fe28981 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); }