diff options
| author | Joerg Bornemann <joerg.bornemann@qt.io> | 2017-10-04 15:53:56 +0200 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@qt.io> | 2017-10-06 14:49:39 +0000 |
| commit | a685b5fc6ad7332e941240f9f879a6ac5a51f63b (patch) | |
| tree | ec88ae0666673079caf46ca139b1b50d93272d5e /share/qbs/modules/cpp/GenericGCC.qbs | |
| parent | 867ffbb1655b86adde0c8fcdad0459f689b03a34 (diff) | |
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>
Diffstat (limited to 'share/qbs/modules/cpp/GenericGCC.qbs')
| -rw-r--r-- | share/qbs/modules/cpp/GenericGCC.qbs | 5 |
1 files changed, 2 insertions, 3 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: { |