Qt modules: fix handling of file names with more than one dot

Task-number: QBS-169

Change-Id: I0de6cca8dff13ccb69a7dea6161f12a9c6efa364
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>

2 files changed, 10 insertions, 9 deletions

diff --git a/share/qbs/modules/qt/core/qtcore.qbs b/share/qbs/modules/qt/core/qtcore.qbs
index 4c266871f..9a08de02f 100644
--- a/share/qbs/modules/qt/core/qtcore.qbs
+++ b/share/qbs/modules/qt/core/qtcore.qbs
@@ -99,8 +99,7 @@ Module {
         inputs: ["moc_cpp"]
 
         Artifact {
-            fileName: 'GeneratedFiles/' + product.name + '/' + input.baseName + '.moc'
-//            fileName: input.baseDir + '/' + input.baseName + '.moc'
+            fileName: 'GeneratedFiles/' + product.name + '/' + input.completeBaseName + '.moc'
             fileTags: ["hpp"]
         }
 
@@ -116,7 +115,7 @@ Module {
         inputs: ["moc_hpp"]
 
         Artifact {
-            fileName: 'GeneratedFiles/' + product.name + '/moc_' + input.baseName + '.cpp'
+            fileName: 'GeneratedFiles/' + product.name + '/moc_' + input.completeBaseName + '.cpp'
             fileTags: [ "cpp" ]
         }
 
@@ -132,7 +131,7 @@ Module {
         inputs: ["moc_hpp_inc"]
 
         Artifact {
-            fileName: 'GeneratedFiles/' + product.name + '/moc_' + input.baseName + '.cpp'
+            fileName: 'GeneratedFiles/' + product.name + '/moc_' + input.completeBaseName + '.cpp'
             fileTags: [ "hpp" ]
         }
 
@@ -149,11 +148,14 @@ Module {
 
         Artifact {
 //  ### TODO we want to access the module's property "generatedFilesDir" here. But without evaluating all available properties a priori.
-            fileName: 'GeneratedFiles/' + product.name + '/qrc_' + input.baseName + '.cpp'
+            fileName: 'GeneratedFiles/' + product.name + '/qrc_' + input.completeBaseName + '.cpp'
             fileTags: ["cpp"]
         }
         prepare: {
-            var cmd = new Command(product.module.binPath + '/rcc', [input.fileName, '-name', FileInfo.baseName(input.fileName), '-o', output.fileName]);
+            var cmd = new Command(product.module.binPath + '/rcc',
+                                  [input.fileName, '-name',
+                                   FileInfo.completeBaseName(input.fileName),
+                                   '-o', output.fileName]);
             cmd.description = 'rcc ' + FileInfo.fileName(input.fileName);
             cmd.highlight = 'codegen';
             return cmd;
@@ -164,7 +166,7 @@ Module {
         inputs: ["ts"]
 
         Artifact {
-            fileName: FileInfo.joinPaths(product.module.qmFilesDir, input.baseName + ".qm")
+            fileName: FileInfo.joinPaths(product.module.qmFilesDir, input.completeBaseName + ".qm")
             fileTags: ["qm"]
         }
 
diff --git a/share/qbs/modules/qt/gui/qtgui.qbs b/share/qbs/modules/qt/gui/qtgui.qbs
index 913936067..6b5384110 100644
--- a/share/qbs/modules/qt/gui/qtgui.qbs
+++ b/share/qbs/modules/qt/gui/qtgui.qbs
@@ -15,8 +15,7 @@ QtModule {
 
         Artifact {
 //  ### TODO we want to access the module's property "qt.core.generatedFilesDir" here. But without evaluating all available properties a priori.
-//            fileName: input.baseDir + '/qrc_' + input.baseName + '.cpp'
-            fileName: 'GeneratedFiles/' + product.name + '/ui_' + input.baseName + '.h'
+            fileName: 'GeneratedFiles/' + product.name + '/ui_' + input.completeBaseName + '.h'
             fileTags: ["hpp"]
         }