From 553ffa01188d3c14bec02e5f4b8d72291677b8ef Mon Sep 17 00:00:00 2001
From: Andreas Hartmetz <andreas.hartmetz@kdab.com>
Date: Thu, 23 Feb 2012 15:05:39 +0100
Subject: Revert "Escape project file name in makefile rebuild rules."

It was the result of miscoordination between Andreas Holzammer and me,
duplicating the functional change of commit
ea2c9f764fed654a57972223449f41e208e05863.
This reverts commit 8b7a9b4898c85e81d87cf642ec59ce85e917ee35.

Change-Id: I9a47746c1c12ca00b2dc5c5d50e99f9bf990e3f7
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
---
 qmake/generators/makefile.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'qmake')

diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp
index dd098596e9..7a00e0b48d 100644
--- a/qmake/generators/makefile.cpp
+++ b/qmake/generators/makefile.cpp
@@ -2508,10 +2508,10 @@ MakefileGenerator::writeSubTargets(QTextStream &t, QList<MakefileGenerator::SubT
             if(!in_directory.isEmpty()) {
                 t << mkdir_p_asstring(out_directory)
                   << out_directory_cdin
-                  << "$(QMAKE) " << escapeFilePath(in) << buildArgs(in_directory) << " -o " << out
+                  << "$(QMAKE) " << in << buildArgs(in_directory) << " -o " << out
                   << in_directory_cdout << endl;
             } else {
-                t << "$(QMAKE) " << escapeFilePath(in) << buildArgs(in_directory) << " -o " << out << endl;
+                t << "$(QMAKE) " << in << buildArgs(in_directory) << " -o " << out << endl;
             }
             t << subtarget->target << "-qmake_all: ";
             if(project->isEmpty("QMAKE_NOFORCE"))
@@ -2520,10 +2520,10 @@ MakefileGenerator::writeSubTargets(QTextStream &t, QList<MakefileGenerator::SubT
             if(!in_directory.isEmpty()) {
                 t << mkdir_p_asstring(out_directory)
                   << out_directory_cdin
-                  << "$(QMAKE) " << escapeFilePath(in) << buildArgs(in_directory) << " -o " << out
+                  << "$(QMAKE) " << in << buildArgs(in_directory) << " -o " << out
                   << in_directory_cdout << endl;
             } else {
-                t << "$(QMAKE) " << escapeFilePath(in) << buildArgs(in_directory) << " -o " << out << endl;
+                t << "$(QMAKE) " << in << buildArgs(in_directory) << " -o " << out << endl;
             }
         }
 
-- 
cgit v1.2.3