diff options
| author | Andreas Hartmetz <andreas.hartmetz@kdab.com> | 2012-01-31 16:32:54 (GMT) |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-01-31 21:19:02 (GMT) |
| commit | fe3f0a5003135cdeb7c8fc478fd63ec026a51963 (patch) | |
| tree | 2df57312b83879d8e1aa1343beebd518e7a8b6dd /qmake | |
| parent | 76f2fca9a3bd5b4aa4bde20992adc89fa18f9cec (diff) | |
| download | Qt-fe3f0a5003135cdeb7c8fc478fd63ec026a51963.zip Qt-fe3f0a5003135cdeb7c8fc478fd63ec026a51963.tar.gz Qt-fe3f0a5003135cdeb7c8fc478fd63ec026a51963.tar.bz2 | |
Escape path names in qmake-generated Makefiles.
qmake-generated Makefiles since 4.6 (according to bug report) contain
recursive qmake invocations with absolute paths to .pro files, where the
absolute paths are not escaped.
This is a backport of ea2c9f764fed654a57972223449f41e208e05863
from qtbase master.
Task-number: QTBUG-11776
Change-Id: If926fe4f2ee4c0e72e140c0fcc376e5a0fd20f21
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Diffstat (limited to 'qmake')
| -rw-r--r-- | qmake/generators/makefile.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp index d009482..6e3aa31 100644 --- a/qmake/generators/makefile.cpp +++ b/qmake/generators/makefile.cpp @@ -2476,7 +2476,7 @@ MakefileGenerator::writeSubTargets(QTextStream &t, QList<MakefileGenerator::SubT //qmake it if(!subtarget->profile.isEmpty()) { QString out = subtarget->makefile; - QString in = fileFixify(in_directory + subtarget->profile, FileFixifyAbsolute); + QString in = escapeFilePath(fileFixify(in_directory + subtarget->profile, FileFixifyAbsolute)); if(out.startsWith(in_directory)) out = out.mid(in_directory.length()); t << mkfile << ": " << "\n\t"; |