Merge remote-tracking branch 'origin/4.3'

Change-Id: I34eda923b93e7c0e755b4bc210a1d7d2402a221c

1 files changed, 21 insertions, 0 deletions

diff --git a/3rdparty/elfutils/qbs/imports/Disasm.qbs b/3rdparty/elfutils/qbs/imports/Disasm.qbs
index 838f8cc..a4e8bb7 100644
--- a/3rdparty/elfutils/qbs/imports/Disasm.qbs
+++ b/3rdparty/elfutils/qbs/imports/Disasm.qbs
@@ -1,5 +1,6 @@
 import qbs
 import qbs.FileInfo
+import qbs.TextFile
 
 ElfUtilsStaticLib {
     property string arch
@@ -7,6 +8,26 @@ ElfUtilsStaticLib {
     name: arch + " disasm"
     Depends { name: arch + " disasm header" }
     Depends { name: arch + " mnemonics" }
+
+    // FIXME: QBS-1113
+    Rule {
+        multiplex: true
+        inputsFromDependencies: ["hpp", "mnemonics"]
+        Artifact {
+            filePath: "dummy.h"
+            fileTags: ["hpp"]
+        }
+        prepare: {
+            var cmd = new JavaScriptCommand();
+            cmd.silent = true;
+            cmd.sourceCode = function() {
+                var f = new TextFile(output.filePath, TextFile.WriteOnly);
+                f.close();
+            }
+            return [cmd];
+        }
+    }
+
     cpp.includePaths: base.concat([FileInfo.joinPaths(product.sourceDirectory, "..")])
     files: [FileInfo.joinPaths(sourceDirectory, "..",  arch + "_disasm.c")]
 }