Simplify Qbs setup4.6

We require Qbs 1.8 now, which enables us to do autodetection
of the available plugins

Change-Id: Ia2140965494b70e92aa27cdd7c73aa46646f8714
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>

1 files changed, 24 insertions, 29 deletions

diff --git a/qtc-super.qbs b/qtc-super.qbs
index d656d0e..c924e13 100644
--- a/qtc-super.qbs
+++ b/qtc-super.qbs
@@ -8,41 +8,36 @@ Project {
 
     qbsSearchPaths: ["qtcreator/qbs"]
 
-// TODO: enable when we can require Qbs 1.8
-//    Probe {
-//        id: submodules
-//        property var modules: []
+    Probe {
+        id: submodules
+        property var modules: []
 
-//        configure: {
-//            var mods = [];
-//            var gitmodules = new TextFile(FileInfo.joinPaths(path, ".gitmodules"));
-//            var module = null;
-//            while (!gitmodules.atEof()) {
-//                var line = gitmodules.readLine();
-//                var modLine = line.match(/^\[submodule "([^"]+)"\]$/);
-//                if (modLine) {
-//                    module = { _name: modLine[1] };
-//                    mods.push(module);
-//                } else if (module) {
-//                    var propLine = line.match(/^\t([^ =]+) *= *(.*)$/);
-//                    if (propLine)
-//                        module[propLine[1]] = propLine[2];
-//                    else
-//                        console.warn("Malformed line in .gitmodules: " + line);
-//                }
-//            }
-//            modules = mods;
-//        }
-//    }
+        configure: {
+            var mods = [];
+            var gitmodules = new TextFile(FileInfo.joinPaths(path, ".gitmodules"));
+            var module = null;
+            while (!gitmodules.atEof()) {
+                var line = gitmodules.readLine();
+                var modLine = line.match(/^\[submodule "([^"]+)"\]$/);
+                if (modLine) {
+                    module = { _name: modLine[1] };
+                    mods.push(module);
+                } else if (module) {
+                    var propLine = line.match(/^\t([^ =]+) *= *(.*)$/);
+                    if (propLine)
+                        module[propLine[1]] = propLine[2];
+                    else
+                        console.warn("Malformed line in .gitmodules: " + line);
+                }
+            }
+            modules = mods;
+        }
+    }
 
     SubProject {
         filePath: "qtcreator/qtcreator.qbs"
         Properties {
             additionalPlugins: {
-                // TODO remove when we can use the Probe
-                var submodules = { modules: [
-                        { _name: "fossil", path: "plugins/fossil" }
-                    ]}
                 var plugins = [];
                 submodules.modules.forEach(function(module) {
                     var modulePath = module.path;