Allow non-standard names for Qt tools.

This is needed for distributions that name their binaries e.g.
"qmake-qt4" etc.

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

3 files changed, 15 insertions, 4 deletions

diff --git a/share/qbs/modules/qt/core/moc.js b/share/qbs/modules/qt/core/moc.js
index e94a1a877..369a2cdb0 100644
--- a/share/qbs/modules/qt/core/moc.js
+++ b/share/qbs/modules/qt/core/moc.js
@@ -13,3 +13,7 @@ function args(product, input, output, config)
     return args;
 }
 
+function fullPath(module)
+{
+    return module.binPath + '/' + module.mocName;
+}
diff --git a/share/qbs/modules/qt/core/qtcore.qbs b/share/qbs/modules/qt/core/qtcore.qbs
index 42dba6807..4898ccd4b 100644
--- a/share/qbs/modules/qt/core/qtcore.qbs
+++ b/share/qbs/modules/qt/core/qtcore.qbs
@@ -16,6 +16,7 @@ Module {
     property string incPath
     property string libPath
     property string mkspecPath
+    property string mocName: "moc"
     property string version: "4.7.0"
     property var versionParts: version.split('.').map(function(item) { return parseInt(item, 10); })
     property var versionMajor: versionParts[0]
@@ -116,7 +117,8 @@ Module {
         }
 
         prepare: {
-            var cmd = new Command(product.module.binPath + '/moc', Moc.args(product, input.fileName, output.fileName, input));
+            var cmd = new Command(Moc.fullPath(product.module),
+                                  Moc.args(product, input.fileName, output.fileName, input));
             cmd.description = 'moc ' + FileInfo.fileName(input.fileName);
             cmd.highlight = 'codegen';
             return cmd;
@@ -132,7 +134,8 @@ Module {
         }
 
         prepare: {
-            var cmd = new Command(product.module.binPath + '/moc', Moc.args(product, input.fileName, output.fileName, input));
+            var cmd = new Command(Moc.fullPath(product.module),
+                                  Moc.args(product, input.fileName, output.fileName, input));
             cmd.description = 'moc ' + FileInfo.fileName(input.fileName);
             cmd.highlight = 'codegen';
             return cmd;
@@ -148,7 +151,8 @@ Module {
         }
 
         prepare: {
-            var cmd = new Command(product.module.binPath + '/moc', Moc.args(product, input.fileName, output.fileName, input));
+            var cmd = new Command(Moc.fullPath(product.module),
+                                  Moc.args(product, input.fileName, output.fileName, input));
             cmd.description = 'moc ' + FileInfo.fileName(input.fileName);
             cmd.highlight = 'codegen';
             return cmd;
diff --git a/share/qbs/modules/qt/gui/qtgui.qbs b/share/qbs/modules/qt/gui/qtgui.qbs
index 6b5384110..24a1a248c 100644
--- a/share/qbs/modules/qt/gui/qtgui.qbs
+++ b/share/qbs/modules/qt/gui/qtgui.qbs
@@ -5,6 +5,8 @@ import '../QtModule.qbs' as QtModule
 QtModule {
     qtModuleName: "Gui"
 
+    property string uicName: "uic"
+
     FileTagger {
         pattern: "*.ui"
         fileTags: ["ui"]
@@ -20,7 +22,8 @@ QtModule {
         }
 
         prepare: {
-            var cmd = new Command(product.module.binPath + '/uic', [input.fileName, '-o', output.fileName])
+            var cmd = new Command(product.module.binPath + '/' + product.module.uicName,
+                                  [input.fileName, '-o', output.fileName])
             cmd.description = 'uic ' + FileInfo.fileName(input.fileName);
             cmd.highlight = 'codegen';
             return cmd;