diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-11-25 10:32:29 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-11-25 10:32:29 +0100 |
| commit | 50aeedd86ce0244fbb77ebefdce8da72db881e45 (patch) | |
| tree | 209b0e39b8bde2e43da9497ab327767679ebbdb6 /qmake/generators/win32/mingw_make.cpp | |
| parent | 08dea594fe4a55d7546a17773f84f44de2c2d200 (diff) | |
| parent | 17d72c783747dd8d9ce767002988d5d5a54a790e (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
mkspecs/features/qml_module.prf
src/corelib/tools/qdatetimeparser_p.h
Change-Id: I5382cee3ddb33107dc61ee20f7a9188c4a68a882
Diffstat (limited to 'qmake/generators/win32/mingw_make.cpp')
| -rw-r--r-- | qmake/generators/win32/mingw_make.cpp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/qmake/generators/win32/mingw_make.cpp b/qmake/generators/win32/mingw_make.cpp index 382b10c37b..e3d76cd76e 100644 --- a/qmake/generators/win32/mingw_make.cpp +++ b/qmake/generators/win32/mingw_make.cpp @@ -308,7 +308,12 @@ void MingwMakefileGenerator::writeBuildRulesPart(QTextStream &t) { t << "first: all\n"; t << "all: " << escapeDependencyPath(fileFixify(Option::output.fileName())) - << ' ' << depVar("ALL_DEPS") << " $(DESTDIR_TARGET)\n\n"; + << ' ' << depVar("ALL_DEPS"); + if (project->first("TEMPLATE") == "aux") { + t << "\n\n"; + return; + } + t << " $(DESTDIR_TARGET)\n\n"; t << "$(DESTDIR_TARGET): " << depVar("PRE_TARGETDEPS") << " $(OBJECTS) " << depVar("POST_TARGETDEPS"); if(!project->isEmpty("QMAKE_PRE_LINK")) t << "\n\t" <<var("QMAKE_PRE_LINK"); @@ -318,7 +323,7 @@ void MingwMakefileGenerator::writeBuildRulesPart(QTextStream &t) } else { t << "\n\t" << objectsLinkLine << " " ; } - } else if (project->first("TEMPLATE") != "aux") { + } else { t << "\n\t$(LINKER) $(LFLAGS) " << var("QMAKE_LINK_O_FLAG") << "$(DESTDIR_TARGET) " << objectsLinkLine << " $(LIBS)"; } if(!project->isEmpty("QMAKE_POST_LINK")) |