Add the input file's extension when generating .o filenames.

Old behavior (conflict):
main.cpp -> main.o
main.mm -> main.o

New behavior (no conflict; same behavior as CMake):
main.cpp -> main.cpp.o
main.mm -> main.mm.o

Task-number: QBS-211

Change-Id: I27c71ffe368a2191c56fc0fc34089a6ad7ec8f61
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>

2 files changed, 3 insertions, 3 deletions

diff --git a/share/qbs/modules/cpp/GenericGCC.qbs b/share/qbs/modules/cpp/GenericGCC.qbs
index d8362495d..61ecca573 100644
--- a/share/qbs/modules/cpp/GenericGCC.qbs
+++ b/share/qbs/modules/cpp/GenericGCC.qbs
@@ -250,7 +250,7 @@ CppModule {
         Artifact {
             fileTags: ["obj"]
             // ### make it possible to override ".obj" in a project file
-            fileName: ".obj/" + product.name + "/" + input.baseDir + "/" + input.completeBaseName + ".o"
+            fileName: ".obj/" + product.name + "/" + input.baseDir + "/" + input.fileName + ".o"
         }
 
         prepare: {
diff --git a/share/qbs/modules/cpp/windows-msvc.qbs b/share/qbs/modules/cpp/windows-msvc.qbs
index 23ec1dfca..5039fc91f 100644
--- a/share/qbs/modules/cpp/windows-msvc.qbs
+++ b/share/qbs/modules/cpp/windows-msvc.qbs
@@ -96,9 +96,9 @@ CppModule {
         Artifact {
             fileTags: ['obj']
             // ### make the object file dir overridable
-            fileName: ".obj/" + product.name + "/" + input.baseDir.replace(':', '') + "/" + input.completeBaseName + ".obj"
+            fileName: ".obj/" + product.name + "/" + input.baseDir.replace(':', '') + "/" + input.fileName + ".obj"
         }
- 
+
         prepare: {
             var platformDefines = ModUtils.moduleProperties(input, 'platformDefines');
             var defines = ModUtils.moduleProperties(input, 'defines');