From: Sune Vuorela <debian@pusling.com>
Date: Tue, 22 Aug 2023 13:42:24 +0000 (+0100)
Subject: Fix qmake makefile generation - should not add double slashes to makefiles.
X-Git-Tag: archive/raspbian/4%4.8.7+dfsg-18+rpi1+deb10u2^2~39
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=73a77ad8405c417a5dce8d0cbecbcb268620e4b7;p=qt4-x11.git

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 d61409b12..727aea487 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) \