Fix QmlProfiler in Qbs build

* add Qbs module qsb_compiler
* add Qbs module qmldir
* also set qml import properties

Author: arBmind

qbs/modules/qmldir/qmldir.qbs

@@ -0,0 +1,42 @@
+import qbs.File
+import qbs.FileInfo
+import qbs.TextFile
+import qbs.Utilities
+
+Module {
+    Rule {
+        name: "QmldirBuilder"
+
+        multiplex: true
+        inputs: ["qt.qml.qml"]
+        outputFileTags: ["qmldir_generated", "qt.core.resource_data"]
+        outputArtifacts: [{
+            filePath: product.buildDirectory + "/qmldir",
+            fileTags: ["qmldir_generated", "qt.core.resource_data"],
+            Qt: { core: { resourcePrefix: "" + inputs["qt.qml.qml"][0].Qt.core.resourcePrefix } }
+        }]
+
+        prepare: {
+            var content = [
+              ["module", product.Qt.qml.importName].join(" "),
+              ["prefer", ":" + inputs["qt.qml.qml"][0].Qt.core.resourcePrefix.replace(/^\/?/, "/").replace(/\/?$/, "/")].join(" "),
+            ];
+            for (var i = 0; i < inputs["qt.qml.qml"].length; ++i) {
+                var input = inputs["qt.qml.qml"][i];
+                content.push([input.baseName, product.Qt.qml.importVersion, input.fileName].join(" "));
+            }
+
+            var cmd = new JavaScriptCommand();
+            cmd.description = "generating qmldir for " + product.Qt.qml.importName;
+            cmd.highlight = 'codegen';
+            cmd.content = content.join("\n");
+            cmd.sourceCode = function() {
+              var file = new TextFile(output.filePath, TextFile.WriteOnly);
+                file.truncate();
+                file.write(content);
+                file.close();
+            }
+            return cmd;
+        }
+    }
+}

qbs/modules/qsb_compiler/qsb_compiler.qbs

@@ -0,0 +1,31 @@
+import qbs.FileInfo
+
+Module {
+    property stringList extraArgs: []
+
+    FileTagger {
+        patterns: ["*.comp", "*.frag", "*.vert"]
+        fileTags: ["qsb_src"]
+    }
+
+    Rule {
+        name: "QSB"
+
+        inputs: ["qsb_src"]
+        outputFileTags: ["qsb_compiled", "qt.core.resource_data"]
+        outputArtifacts: [{
+            filePath: product.buildDirectory + '/qsb/' + input.fileName + ".qsb",
+            fileTags: ["qsb_compiled", "qt.core.resource_data"],
+            Qt: { core: { resourcePrefix: "" + input.Qt.core.resourcePrefix } }
+        }]
+
+        prepare: {
+            var tool = FileInfo.joinPaths(product.Qt.core.binPath, "qsb");
+            var args = input.qsb_compiler.extraArgs.concat(["-o", output.filePath, input.filePath]);
+            var cmd = new Command(tool, args);
+            cmd.description = "qsb " + input.fileName;
+            cmd.highlight = 'codegen';
+            return cmd;
+        }
+    }
+}

src/libs/tracing/tracing.qbs

@@ -5,6 +5,10 @@ QtcLibrary {
     Depends { name: "Qt.testlib"; condition: qtc.withAutotests }
     Depends { name: "Utils" }
 
+    Qt.qml.importName: "QtCreator.Tracing"
+    Qt.qml.importVersion: "1.0"
+    cpp.includePaths: ["."] // needed to allow registraction to compile
+
     Group {
         name: "General"
         files: [
@@ -35,11 +39,26 @@ QtcLibrary {
         ]
     }
 
+    Depends { name: "qsb_compiler" }
+    Depends { name: "qmldir" }
+    Qt.core.resourcePrefix: "/qt/qml/QtCreator/Tracing"
     Group {
         name: "Qml Files"
-        Qt.core.resourcePrefix: "qt/qml/QtCreator/Tracing/"
-        fileTags: "qt.core.resource_data"
-        files: "qml/**"
+        fileTags: ["qt.qml.qml", "qt.core.resource_data"]
+        prefix: "qml/"
+        files: ["**/*.qml"]
+    }
+    Group {
+        name: "Images"
+        fileTags: ["qt.core.resource_data"]
+        prefix: "qml/"
+        files: ["**/*.png"]
+    }
+    Group {
+        name: "Shaders"
+        qsb_compiler.extraArgs: ["--batchable", "--qt6"]
+        prefix: "qml/"
+        files: ["**/*.vert", "**/*.frag"]
     }
 
     cpp.defines: base.concat("TRACING_LIBRARY")

src/plugins/perfprofiler/perfprofiler.qbs

@@ -15,6 +15,10 @@ QtcPlugin {
         submodules: ["network", "quick", "quickwidgets"]
     }
 
+    Qt.qml.importName: "QtCreator.PerfProfiler"
+    Qt.qml.importVersion: "1.0"
+    cpp.includePaths: ["."] // needed to allow registraction to compile
+
     files: [
         "perfconfigeventsmodel.cpp",
         "perfconfigeventsmodel.h",
@@ -58,14 +62,13 @@ QtcPlugin {
         "perfsettings.h",
         "perftracepointdialog.cpp",
         "perftracepointdialog.h",
-        "perfprofiler.qrc",
     ]
 
-    Qt.core.resourceFileBaseName: "PerfProfilerQml" // avoid conflicting qrc file
+    Depends { name: "qmldir" }
+    Qt.core.resourcePrefix: "/qt/qml/QtCreator/PerfProfiler"
     Group {
         name: "Qml Files"
-        Qt.core.resourcePrefix: "qt/qml/QtCreator/PerfProfiler/"
-        fileTags: "qt.core.resource_data"
+        fileTags: ["qt.qml.qml", "qt.core.resource_data"]
         files: [ "PerfProfilerFlameGraphView.qml" ]
     }
 

src/plugins/qmlprofiler/qmlprofiler.qbs

@@ -16,6 +16,10 @@ QtcPlugin {
     Depends { name: "QtSupport" }
     Depends { name: "TextEditor" }
 
+    Qt.qml.importName: "QtCreator.QmlProfiler"
+    Qt.qml.importVersion: "1.0"
+    cpp.includePaths: ["."] // needed to allow registraction to compile
+
     Group {
         name: "General"
         files: [
@@ -58,11 +62,26 @@ QtcPlugin {
         ]
     }
 
+    Depends { name: "qsb_compiler" }
+    Depends { name: "qmldir" }
+    Qt.core.resourcePrefix: "/qt/qml/QtCreator/QmlProfiler"
     Group {
         name: "Qml Files"
-        Qt.core.resourcePrefix: "qt/qml/QtCreator/QmlProfiler/"
-        fileTags: "qt.core.resource_data"
-        files: "qml/**"
+        fileTags: ["qt.qml.qml", "qt.core.resource_data"]
+        prefix: "qml/"
+        files: ["**/*.qml"]
+    }
+    Group {
+        name: "Images"
+        fileTags: ["qt.core.resource_data"]
+        prefix: "qml/"
+        files: ["**/*.png"]
+    }
+    Group {
+        name: "Shaders"
+        qsb_compiler.extraArgs: ["--batchable", "--qt6"]
+        prefix: "qml/"
+        files: ["**/*.vert", "**/*.frag"]
     }
 
     QtcTestFiles {