1 files changed, 56 insertions, 0 deletions
diff --git a/share/qbs/modules/Qt/core/core.qbs b/share/qbs/modules/Qt/core/core.qbs
index c940a1bfe..8b5a6fdf1 100644
--- a/share/qbs/modules/Qt/core/core.qbs
+++ b/share/qbs/modules/Qt/core/core.qbs
@@ -202,6 +202,62 @@ Module {
         fileTags: ["qhp"]
     }
 
+//    TagScanner {
+//        name: "QtMocCppScanner"
+//        inputTags: ["cpp"]
+//        outputTags: ["includes_moc_hpp", "moc_cpp"]
+//        scan: {
+//            var fileTags = [];
+//            var cppResult = scanCppForMocHints(artifact.filePath);
+//            if (cppResult.hasQObject)
+//                fileTags.push("moc_cpp");
+//            if (!this.mocIncludes)
+//                this.mocIncludes = {};
+//            if (cppResult.mocIncludes) {
+//                var c = cppResult.mocIncludes.length;
+//                for (var i = 0; i < c; ++i) {
+//                    var headerBaseName = cppResult.mocIncludes[i];
+//                    headerBaseName = headerBaseName.slice(4).slice(0, -4);  // remove moc_ and .cpp
+//                    this.mocIncludes[cppResult.mocIncludes[i]] = true;
+//                }
+//            }
+//            return fileTags;
+//        }
+//    }
+
+//    TagScanner {
+//        name: "QtMocHppScanner"
+//        dependencies: ["QtMocCppScanner"]
+//        inputTags: ["hpp"]
+//        outputTags: ["moc_hpp", "moc_hpp_inc"]
+//        scan: {
+//            var fileTags = [];
+//            var hppFile = scanHppForMocHints(artifact.filePath);
+//            if (hppFile.hasQObject) {
+//                if (QtMocCppScanner.mocIncludes[artifact.completeBaseName])
+//                    fileTags.push("moc_hpp_inc");
+//                else
+//                    fileTags.push("moc_hpp");
+//            }
+//            return fileTags;
+//        }
+//    }
+
+    TagScanner {
+        name: "QtMocCppScanner"
+        inputTags: ["cpp"]
+        outputTags: ["moc_cpp"]
+        scan: { /* implemented internally */ }
+    }
+
+    TagScanner {
+        name: "QtMocHppScanner"
+        dependencies: ["QtMocCppScanner"]
+        inputTags: ["hpp"]
+        outputTags: ["moc_hpp", "moc_hpp_inc"]
+        scan: { /* implemented internally */ }
+    }
+
     Rule {
         inputs: ["moc_cpp"]