From: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
Date: Sun, 14 Jun 2015 16:38:43 +0000 (+0000)
Subject: _fix_qmake_makefile_generation
X-Git-Tag: archive/raspbian/4%4.8.6+git64-g5dc8b2b+dfsg-3+deb8u2+rpi1~33
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=3a019d419f42fbec060e22722daf03f3743a751f;p=qt4-x11.git

_fix_qmake_makefile_generation


Gbp-Pq: Name 15_fix_qmake_makefile_generation.diff
---

diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp
index 045759bcd..bffd8e6c1 100644
--- a/qmake/generators/makefile.cpp
+++ b/qmake/generators/makefile.cpp
@@ -2470,7 +2470,7 @@ MakefileGenerator::writeSubTargets(QTextStream &t, QList<MakefileGenerator::SubT
 
         QString mkfile = subtarget->makefile;
         if(!in_directory.isEmpty())
-            mkfile.prepend(out_directory);
+            mkfile.prepend(out_directory + Option::dir_sep);
 
         QString in_directory_cdin, in_directory_cdout, out_directory_cdin, out_directory_cdout;
 #define MAKE_CD_IN_AND_OUT(directory) \