From fe3f0a5003135cdeb7c8fc478fd63ec026a51963 Mon Sep 17 00:00:00 2001 From: Andreas Hartmetz Date: Tue, 31 Jan 2012 17:32:54 +0100 Subject: 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 --- qmake/generators/makefile.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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, QListprofile.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"; -- cgit v0.12