diff options
| -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); } |