diff options
| author | Joerg Bornemann <joerg.bornemann@nokia.com> | 2012-08-23 11:30:36 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-08-23 15:54:02 +0200 |
| commit | 8633f7ac0d137cc8139e084d9caae64ab90be03c (patch) | |
| tree | 69ca121cf39442f2b925e20f8fcc74e89c5eea86 /qmake | |
| parent | 022e3a358dcc6815d28a5103eb6562d4dc045a7c (diff) | |
| download | qtbase-8633f7ac0d137cc8139e084d9caae64ab90be03c.tar.gz | |
qmake: fix manifest resource for non-trivial target names
The Microsoft Resource Compiler bails out if the rc file contains
non-trivial file name references. In particular it doesn't like
dashes in file names. We're now always quoting the file name.
Change-Id: I67b8d2c13010a0b2ec26cac915ebd1be95f1c274
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.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 de3bd60125..a2b97d9c66 100644 --- a/qmake/generators/win32/msvc_nmake.cpp +++ b/qmake/generators/win32/msvc_nmake.cpp @@ -396,7 +396,7 @@ void NmakeMakefileGenerator::writeBuildRulesPart(QTextStream &t) 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 */ " - << QFileInfo(unescapeFilePath(manifest)).fileName() << ">" << manifest_rc; + << '"' << QFileInfo(unescapeFilePath(manifest)).fileName() << "\">" << manifest_rc; if (generateManifest) { t << "\n\tif not exist $(DESTDIR_TARGET) del " << manifest << ">NUL 2>&1"; |