Fix qmake makefile generation - should not add double slashes to makefiles.

Gbp-Pq: Name 15_fix_qmake_makefile_generation.diff

diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp
index d61409b123df010e21659540ca27344a2bba20c8..727aea4875ee9a082bd53dadb3b5cab5a5581eb2 100644 (file)
--- 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) \