diff options
| author | Max Desyatov <max.desyatov@gmail.com> | 2012-03-06 14:18:53 (GMT) |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-03-07 04:09:17 (GMT) |
| commit | 74b8a6134a296bbe47ad5e695ee7463c5f1e1130 (patch) | |
| tree | 01569a18ba388e9786adad39e96bf477f0066dba /qmake | |
| parent | c75f9e83b9a83d4d53e4c2d21d294bca0bbc1c62 (diff) | |
| download | Qt-74b8a6134a296bbe47ad5e695ee7463c5f1e1130.zip Qt-74b8a6134a296bbe47ad5e695ee7463c5f1e1130.tar.gz Qt-74b8a6134a296bbe47ad5e695ee7463c5f1e1130.tar.bz2 | |
escape *_script_file usages in MingwMakefileGenerator::writeObjectsPart
(cherry picked from qtbase commit 9d5e721e96f19812a766a4c7d3f8b41f455f507c)
Task-number: QTBUG-24595
Change-Id: I761e4ffb0e473c35784cf1ba5289a79dae5a012b
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Diffstat (limited to 'qmake')
| -rw-r--r-- | qmake/generators/win32/mingw_make.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/qmake/generators/win32/mingw_make.cpp b/qmake/generators/win32/mingw_make.cpp index 7a089c6..f7ee7b0 100644 --- a/qmake/generators/win32/mingw_make.cpp +++ b/qmake/generators/win32/mingw_make.cpp @@ -410,14 +410,14 @@ void MingwMakefileGenerator::writeObjectsPart(QTextStream &t) QString ar_cmd = project->values("QMAKE_LIB").join(" "); if (ar_cmd.isEmpty()) ar_cmd = "armar --create"; - objectsLinkLine = ar_cmd + " " + var("DEST_TARGET") + " --via " + ar_script_file; + objectsLinkLine = ar_cmd + " " + var("DEST_TARGET") + " --via " + escapeFilePath(ar_script_file); } else { // Strip off any options since the ar commands will be read from file. QString ar_cmd = var("QMAKE_LIB").section(" ", 0, 0);; if (ar_cmd.isEmpty()) ar_cmd = "ar"; createArObjectScriptFile(ar_script_file, var("DEST_TARGET"), project->values("OBJECTS")); - objectsLinkLine = ar_cmd + " -M < " + ar_script_file; + objectsLinkLine = ar_cmd + " -M < " + escapeFilePath(ar_script_file); } } else { QString ld_script_file = var("QMAKE_LINK_OBJECT_SCRIPT") + "." + var("TARGET"); @@ -426,10 +426,10 @@ void MingwMakefileGenerator::writeObjectsPart(QTextStream &t) } if (project->isActiveConfig("rvct_linker")) { createRvctObjectScriptFile(ld_script_file, project->values("OBJECTS")); - objectsLinkLine = QString::fromLatin1("--via ") + ld_script_file; + objectsLinkLine = QString::fromLatin1("--via ") + escapeFilePath(ld_script_file); } else { createLdObjectScriptFile(ld_script_file, project->values("OBJECTS")); - objectsLinkLine = ld_script_file; + objectsLinkLine = escapeFilePath(ld_script_file); } } Win32MakefileGenerator::writeObjectsPart(t); |