Get rid of the ".obj" subdir in our build directories

We claim that build directories are opaque, yet there's a ".obj" subdir
where object files are placed. This needlessly adds a level in the build
dir structure. Remove the creation and usage of this directory, which is
clearly qmake legacy.

Change-Id: I3afa6bd61b76941ecebbc2cd8f4109621694e371
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: Jake Petroules <jake.petroules@qt.io>

5 files changed, 12 insertions, 13 deletions

diff --git a/share/qbs/modules/cpp/GenericGCC.qbs b/share/qbs/modules/cpp/GenericGCC.qbs
index 638882aa7..b6bc10003 100644
--- a/share/qbs/modules/cpp/GenericGCC.qbs
+++ b/share/qbs/modules/cpp/GenericGCC.qbs
@@ -538,8 +538,7 @@ CppModule {
                 tags.push("cpp_obj");
             return [{
                 fileTags: tags,
-                filePath: FileInfo.joinPaths(".obj",
-                                             Utilities.getHash(input.baseDir),
+                filePath: FileInfo.joinPaths(Utilities.getHash(input.baseDir),
                                              input.fileName + ".o")
             }];
         }
@@ -555,7 +554,7 @@ CppModule {
 
         Artifact {
             fileTags: ["obj"]
-            filePath: FileInfo.joinPaths(".obj", Utilities.getHash(input.baseDir), input.fileName + ".o")
+            filePath: FileInfo.joinPaths(Utilities.getHash(input.baseDir), input.fileName + ".o")
         }
 
         prepare: {
diff --git a/share/qbs/modules/cpp/msvc.js b/share/qbs/modules/cpp/msvc.js
index 13e5d8821..de99d63ef 100644
--- a/share/qbs/modules/cpp/msvc.js
+++ b/share/qbs/modules/cpp/msvc.js
@@ -232,7 +232,7 @@ function prepareCompiler(project, product, inputs, outputs, input, output, expli
     if (pchOutput)
         cmd.description += ' (' + tag + ')';
     cmd.highlight = "compiler";
-    cmd.workingDirectory = product.buildDirectory + "/.obj";
+    cmd.workingDirectory = product.buildDirectory;
     cmd.responseFileUsagePrefix = '@';
     // cl.exe outputs the cpp file name. We filter that out.
     cmd.inputFileName = input.fileName;
diff --git a/share/qbs/modules/cpp/windows-mingw.qbs b/share/qbs/modules/cpp/windows-mingw.qbs
index f09c4dd22..cba8044cf 100644
--- a/share/qbs/modules/cpp/windows-mingw.qbs
+++ b/share/qbs/modules/cpp/windows-mingw.qbs
@@ -134,7 +134,7 @@ GenericGCC {
         auxiliaryInputs: ["hpp"]
 
         Artifact {
-            filePath: ".obj/" + Utilities.getHash(input.baseDir) + "/" + input.completeBaseName + "_res.o"
+            filePath: Utilities.getHash(input.baseDir) + "/" + input.completeBaseName + "_res.o"
             fileTags: ["obj"]
         }
 
diff --git a/share/qbs/modules/cpp/windows-msvc.qbs b/share/qbs/modules/cpp/windows-msvc.qbs
index 5736a071a..ba632368d 100644
--- a/share/qbs/modules/cpp/windows-msvc.qbs
+++ b/share/qbs/modules/cpp/windows-msvc.qbs
@@ -142,11 +142,11 @@ CppModule {
         auxiliaryInputs: ["hpp"]
         Artifact {
             fileTags: ['obj']
-            filePath: ".obj/" + Utilities.getHash(input.completeBaseName) + '_c.obj'
+            filePath: Utilities.getHash(input.completeBaseName) + '_c.obj'
         }
         Artifact {
             fileTags: ['c_pch']
-            filePath: ".obj/" + product.name + '_c.pch'
+            filePath: product.name + '_c.pch'
         }
         prepare: {
             return MSVC.prepareCompiler.apply(MSVC, arguments);
@@ -160,11 +160,11 @@ CppModule {
         auxiliaryInputs: ["hpp"]
         Artifact {
             fileTags: ['obj']
-            filePath: ".obj/" + Utilities.getHash(input.completeBaseName) + '_cpp.obj'
+            filePath: Utilities.getHash(input.completeBaseName) + '_cpp.obj'
         }
         Artifact {
             fileTags: ['cpp_pch']
-            filePath: ".obj/" + product.name + '_cpp.pch'
+            filePath: product.name + '_cpp.pch'
         }
         prepare: {
             return MSVC.prepareCompiler.apply(MSVC, arguments);
@@ -179,7 +179,7 @@ CppModule {
 
         Artifact {
             fileTags: ['obj']
-            filePath: ".obj/" + Utilities.getHash(input.baseDir) + "/" + input.fileName + ".obj"
+            filePath: Utilities.getHash(input.baseDir) + "/" + input.fileName + ".obj"
         }
 
         prepare: {
@@ -295,7 +295,7 @@ CppModule {
         auxiliaryInputs: ["hpp"]
 
         Artifact {
-            filePath: ".obj/" + Utilities.getHash(input.baseDir) + "/" + input.completeBaseName + ".res"
+            filePath: Utilities.getHash(input.baseDir) + "/" + input.completeBaseName + ".res"
             fileTags: ["obj"]
         }
 
@@ -354,7 +354,7 @@ CppModule {
     Rule {
         inputs: ["asm"]
         Artifact {
-            filePath: ".obj/" + Utilities.getHash(input.baseDir) + "/" + input.completeBaseName + ".obj"
+            filePath: Utilities.getHash(input.baseDir) + "/" + input.completeBaseName + ".obj"
             fileTags: ["obj"]
         }
         prepare: {
diff --git a/share/qbs/modules/wix/WiXModule.qbs b/share/qbs/modules/wix/WiXModule.qbs
index 11b34bc4b..94955eab4 100644
--- a/share/qbs/modules/wix/WiXModule.qbs
+++ b/share/qbs/modules/wix/WiXModule.qbs
@@ -183,7 +183,7 @@ Module {
 
         Artifact {
             fileTags: ["wixobj"]
-            filePath: FileInfo.joinPaths(".obj", Utilities.getHash(input.baseDir),
+            filePath: FileInfo.joinPaths(Utilities.getHash(input.baseDir),
                                          FileInfo.baseName(input.fileName) + ".wixobj")
         }