diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-08-15 16:30:10 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-08-15 16:31:48 +0200 |
| commit | 106d3b9bf93325ea93c678270290b2c3dda9b764 (patch) | |
| tree | 26c56932d60964c83e81d9c33d6f37ebc36d6c56 /qmake/generators | |
| parent | 79f679da9483c12979500dd48bc096d33af9ca6f (diff) | |
| parent | 8bebded9ab02b8eec67c44bfddf802d6bf9cda3c (diff) | |
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
src/plugins/platforms/cocoa/qcocoamenu.h
src/plugins/platforms/cocoa/qcocoamenu.mm
src/plugins/platforms/cocoa/qcocoawindow.mm
src/widgets/styles/qstylehelper_p.h
Change-Id: I54247c98dd79d2b3826fc062b8b11048c9c7d9bb
Diffstat (limited to 'qmake/generators')
| -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 c3b876531c..bad53dc5b7 100644 --- a/qmake/generators/win32/mingw_make.cpp +++ b/qmake/generators/win32/mingw_make.cpp @@ -285,7 +285,8 @@ void MingwMakefileGenerator::writeLibsPart(QTextStream &t) void MingwMakefileGenerator::writeObjectsPart(QTextStream &t) { - 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()) { objectsLinkLine = "$(OBJECTS)"; } else if (project->isActiveConfig("staticlib") && project->first("TEMPLATE") == "lib") { QString ar_script_file = var("QMAKE_LINK_OBJECT_SCRIPT") + "." + var("TARGET"); |