AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix QMAKE_MANIFEST for shadow builds

Browse Source 
Change-Id: Iea71f4a4d483e9465b3a7f0ce4560b2e9fa6cd63
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
This commit is contained in:
Oswald Buddenhagen 2012-09-14 17:10:27 +02:00 committed by Qt by Nokia
parent 53ab67cdfe
commit 1b569fe455
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
qmake/generators/win32/msvc_nmake.cpp
View File

@ -394,6 +394,8 @@ void NmakeMakefileGenerator::writeBuildRulesPart(QTextStream &t)
manifest = escapeFilePath(target + ".embed.manifest"); manifest = escapeFilePath(target + ".embed.manifest");
extraLFlags = "/MANIFEST /MANIFESTFILE:" + manifest; extraLFlags = "/MANIFEST /MANIFESTFILE:" + manifest;
project->values("QMAKE_CLEAN") << manifest; project->values("QMAKE_CLEAN") << manifest;
} else {
manifest = escapeFilePath(fileFixify(manifest));
} }
const bool incrementalLinking = project->values("QMAKE_LFLAGS").toQStringList().filter(QRegExp("(/|-)INCREMENTAL:NO")).isEmpty(); 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; project->values("QMAKE_CLEAN") << manifest_rc << manifest_res;
t << "\n\techo 1 /* CREATEPROCESS_MANIFEST_RESOURCE_ID */ 24 /* RT_MANIFEST */ " 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) { if (generateManifest) {
t << "\n\tif not exist $(DESTDIR_TARGET) del " << manifest << ">NUL 2>&1"; t << "\n\tif not exist $(DESTDIR_TARGET) del " << manifest << ">NUL 2>&1";