create missing output directories for substituted files

it wasn't the fault of fileFixify() after all ...

Reviewed-by: joerg

3 files changed, 4 insertions, 4 deletions

diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp
index 851e587..852471d 100644
--- a/qmake/generators/makefile.cpp
+++ b/qmake/generators/makefile.cpp
@@ -538,6 +538,7 @@ MakefileGenerator::init()
                         continue;
                     }
                 }
+                mkdir(QFileInfo(out).absolutePath());
                 if(out.open(QFile::WriteOnly)) {
                     v["QMAKE_INTERNAL_INCLUDED_FILES"].append(subs.at(i));
                     out.write(contents.toUtf8());
diff --git a/tests/auto/qmake/testdata/substitutes/test.pro b/tests/auto/qmake/testdata/substitutes/test.pro
index 5bce312..ddad93f 100644
--- a/tests/auto/qmake/testdata/substitutes/test.pro
+++ b/tests/auto/qmake/testdata/substitutes/test.pro
@@ -1,2 +1 @@
-QMAKE_SUBSTITUTES += test.in
-# doesn't work for the time being: sub/test2.in
+QMAKE_SUBSTITUTES += test.in sub/test2.in
diff --git a/tests/auto/qmake/tst_qmake.cpp b/tests/auto/qmake/tst_qmake.cpp
index 1a3f843..060fa01 100644
--- a/tests/auto/qmake/tst_qmake.cpp
+++ b/tests/auto/qmake/tst_qmake.cpp
@@ -483,13 +483,13 @@ void tst_qmake::substitutes()
     QString workDir = base_path + "/testdata/substitutes";
     QVERIFY( test_compiler.qmake( workDir, "test" ));
     QVERIFY( test_compiler.exists( workDir, "test", Plain, "" ));
-    //QVERIFY( test_compiler.exists( workDir, "sub/test2", Plain, "" ));
+    QVERIFY( test_compiler.exists( workDir, "sub/test2", Plain, "" ));
     QVERIFY( test_compiler.makeDistClean( workDir ));
 
     QString buildDir = base_path + "/testdata/substitutes_build";
     QVERIFY( test_compiler.qmake( workDir, "test", buildDir ));
     QVERIFY( test_compiler.exists( buildDir, "test", Plain, "" ));
-    //QVERIFY( test_compiler.exists( buildDir, "sub/test2", Plain, "" ));
+    QVERIFY( test_compiler.exists( buildDir, "sub/test2", Plain, "" ));
     QVERIFY( test_compiler.makeDistClean( buildDir ));
 }