Merge remote-tracking branch 'origin/7.0'9.08.0

Change-Id: Icbc3dfa1c0795fc0b410614348c6c8bf7a7b5edb

2 files changed, 0 insertions, 70 deletions

diff --git a/qtc-super.pro b/qtc-super.pro
deleted file mode 100644
index 4fc45cb..0000000
--- a/qtc-super.pro
+++ /dev/null
@@ -1,8 +0,0 @@
-TEMPLATE = subdirs
-
-mkpath($$OUT_PWD/qtcreator) # so the qtcreator.pro is able to create a .qmake.cache there
-
-DISTFILES += .qmake.conf
-
-QTC_SKIP_MODULES =
-include(submodules.pri)
diff --git a/submodules.pri b/submodules.pri
deleted file mode 100644
index 86221a5..0000000
--- a/submodules.pri
+++ /dev/null
@@ -1,62 +0,0 @@
-# Extract submodules from .gitmodules.
-lines = $$cat(.gitmodules, lines)
-for (line, lines) {
-    mod = $$replace(line, "^\\[submodule \"([^\"]+)\"\\]$", \\1)
-    !equals(mod, $$line) {
-        module = $$mod
-        modules += $$mod
-    } else {
-        prop = $$replace(line, "^$$escape_expand(\\t)([^ =]+) *=.*$", \\1)
-        !equals(prop, $$line) {
-            val = $$replace(line, "^[^=]+= *", )
-            module.$${module}.$$prop = $$split(val)
-        } else {
-            error("Malformed line in .gitmodules: $$line")
-        }
-    }
-}
-
-modules = $$sort_depends(modules, module., .depends .recommends)
-modules = $$reverse(modules)
-for (mod, modules) {
-    deps = $$eval(module.$${mod}.depends)
-    recs = $$eval(module.$${mod}.recommends)
-    for (d, $$list($$deps $$recs)): \
-        !contains(modules, $$d): \
-            error("'$$mod' depends on undeclared '$$d'.")
-
-    contains(QTC_SKIP_MODULES, $$mod): \
-        next()
-    !isEmpty(QTC_BUILD_MODULES):!contains(QTC_BUILD_MODULES, $$mod): \
-        next()
-
-    path = $$eval(module.$${mod}.path)
-    project = $$eval(module.$${mod}.project)
-    isEmpty(project) {
-        !exists($$path/$$section(path, /, -1).pro): \
-            next()
-        $${mod}.subdir = $$path
-    } else {
-        !exists($$path/$$project): \
-            next()
-        $${mod}.file = $$path/$$project
-        $${mod}.makefile = Makefile
-    }
-    $${mod}.target = sub-$$mod
-
-    for (d, deps) {
-        !contains(SUBDIRS, $$d) {
-            $${mod}.target =
-            break()
-        }
-        $${mod}.depends += $$d
-    }
-    isEmpty($${mod}.target): \
-        next()
-    for (d, recs) {
-        contains(SUBDIRS, $$d): \
-            $${mod}.depends += $$d
-    }
-
-    SUBDIRS += $$mod
-}