diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-09-14 17:19:38 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-09-18 00:59:08 +0200 |
| commit | d113faefb8a778a5af4f91d32c5fc41b6521453d (patch) | |
| tree | 7025c27e070feef20043154eff56d3c2cf0f1c8d /qmake | |
| parent | 321687f03b25e71ee7be7bed35a8e615dcb7f381 (diff) | |
rewrite *_manifest.rc unconditionally
the file has no dependency tracking, so changes to the source would get
missed and cause hard to debug build issues.
and as nothing does dependency tracking on that file, this change
doesn't even cause a noticable performance regression.
Change-Id: I108b490b71a43018e0c7ef5d7c0b11d79a8e726b
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Diffstat (limited to 'qmake')
| -rw-r--r-- | qmake/generators/win32/msvc_nmake.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/qmake/generators/win32/msvc_nmake.cpp b/qmake/generators/win32/msvc_nmake.cpp index 015bdc4828..bd5ead6617 100644 --- a/qmake/generators/win32/msvc_nmake.cpp +++ b/qmake/generators/win32/msvc_nmake.cpp @@ -395,7 +395,7 @@ void NmakeMakefileGenerator::writeBuildRulesPart(QTextStream &t) QString manifest_bak = escapeFilePath(target + "_manifest.bak"); project->values("QMAKE_CLEAN") << manifest_rc << manifest_res; - t << "\n\t" << "@if not exist " << manifest_rc << " echo 1 /* CREATEPROCESS_MANIFEST_RESOURCE_ID */ 24 /* RT_MANIFEST */ " + t << "\n\techo 1 /* CREATEPROCESS_MANIFEST_RESOURCE_ID */ 24 /* RT_MANIFEST */ " << '"' << QFileInfo(unescapeFilePath(manifest)).fileName() << "\">" << manifest_rc; if (generateManifest) { |