diff options
author | Liang Qi <liang.qi@qt.io> | 2018-01-07 14:45:46 +0100 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2018-01-07 14:47:19 +0100 |
commit | 24fba6744cea1163ceee06d69d31b4eb619cd386 (patch) | |
tree | 87850fde25ac7ac662de366e3ce3be91061245ce /qmake/generators/win32 | |
parent | 0749ba2c5eacc4822cf9c7a31edf8d70c4ef6064 (diff) | |
parent | 1c8224511dee2794553da9dc8ed484d49dc78b45 (diff) |
Merge remote-tracking branch 'origin/5.9' into 5.10
Conflicts:
tests/auto/network/socket/qudpsocket/tst_qudpsocket.cpp
Change-Id: Ib6dd965a7eb6f59103e276b3407739147ecd37b2
Diffstat (limited to 'qmake/generators/win32')
-rw-r--r-- | qmake/generators/win32/mingw_make.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/qmake/generators/win32/mingw_make.cpp b/qmake/generators/win32/mingw_make.cpp index 792ffb1997..d6d6b04148 100644 --- a/qmake/generators/win32/mingw_make.cpp +++ b/qmake/generators/win32/mingw_make.cpp @@ -324,7 +324,8 @@ void MingwMakefileGenerator::writeBuildRulesPart(QTextStream &t) t << "\n\t" <<var("QMAKE_PRE_LINK"); if(project->isActiveConfig("staticlib") && project->first("TEMPLATE") == "lib") { t << "\n\t-$(DEL_FILE) $(DESTDIR_TARGET) 2>" << var("QMAKE_SHELL_NULL_DEVICE"); - if (project->values("OBJECTS").count() < var("QMAKE_LINK_OBJECT_MAX").toInt()) { + const ProString &objmax = project->first("QMAKE_LINK_OBJECT_MAX"); + if (objmax.isEmpty() || project->values("OBJECTS").count() < objmax.toInt()) { t << "\n\t$(LIB) $(DESTDIR_TARGET) " << objectsLinkLine << " " ; } else { t << "\n\t" << objectsLinkLine << " " ; |