diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-09-14 17:10:27 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-09-18 00:59:08 +0200 |
| commit | 1b569fe4550462fa2226093a72e7383f2d0f5ba2 (patch) | |
| tree | 5143f085e82856d9d6e654c6d8a16c097abc93eb /qmake | |
| parent | 53ab67cdfe66693b27789282afc099d4dcffd4fa (diff) | |
fix QMAKE_MANIFEST for shadow builds
Change-Id: Iea71f4a4d483e9465b3a7f0ce4560b2e9fa6cd63
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Diffstat (limited to 'qmake')
| -rw-r--r-- | qmake/generators/win32/msvc_nmake.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/qmake/generators/win32/msvc_nmake.cpp b/qmake/generators/win32/msvc_nmake.cpp index ba490a9dfb..0c852cdf87 100644 --- a/qmake/generators/win32/msvc_nmake.cpp +++ b/qmake/generators/win32/msvc_nmake.cpp @@ -394,6 +394,8 @@ void NmakeMakefileGenerator::writeBuildRulesPart(QTextStream &t) manifest = escapeFilePath(target + ".embed.manifest"); extraLFlags = "/MANIFEST /MANIFESTFILE:" + manifest; project->values("QMAKE_CLEAN") << manifest; + } else { + manifest = escapeFilePath(fileFixify(manifest)); } const bool incrementalLinking = project->values("QMAKE_LFLAGS").toQStringList().filter(QRegExp("(/|-)INCREMENTAL:NO")).isEmpty(); @@ -406,7 +408,7 @@ void NmakeMakefileGenerator::writeBuildRulesPart(QTextStream &t) project->values("QMAKE_CLEAN") << manifest_rc << manifest_res; t << "\n\techo 1 /* CREATEPROCESS_MANIFEST_RESOURCE_ID */ 24 /* RT_MANIFEST */ " - << cQuoted(QFileInfo(unescapeFilePath(manifest)).fileName()) << ">" << manifest_rc; + << cQuoted(unescapeFilePath(manifest)) << ">" << manifest_rc; if (generateManifest) { t << "\n\tif not exist $(DESTDIR_TARGET) del " << manifest << ">NUL 2>&1"; |