Merge remote-tracking branch 'origin/5.6' into dev

Change-Id: Iec1b2de53c275996364c4bab0123ccb3e6e9895e

1 files changed, 18 insertions, 13 deletions

diff --git a/tools/qmlimportscanner/main.cpp b/tools/qmlimportscanner/main.cpp
index 736816f769..af6b272fc6 100644
--- a/tools/qmlimportscanner/main.cpp
+++ b/tools/qmlimportscanner/main.cpp
@@ -339,6 +339,24 @@ QVariantList mergeImports(const QVariantList &a, const QVariantList &b)
     return merged;
 }
 
+// Predicates needed by findQmlImportsInDirectory.
+
+struct isMetainfo {
+    bool operator() (const QFileInfo &x) const {
+        return x.suffix() == QLatin1String("metainfo");
+    }
+};
+
+struct pathStartsWith {
+    pathStartsWith(const QString &path) : _path(path) {}
+    bool operator() (const QString &x) const {
+        return _path.startsWith(x);
+    }
+    const QString _path;
+};
+
+
+
 // Scan all qml files in directory for import statements
 QVariantList findQmlImportsInDirectory(const QString &qmlDir)
 {
@@ -348,19 +366,6 @@ QVariantList findQmlImportsInDirectory(const QString &qmlDir)
 
     QDirIterator iterator(qmlDir, QDir::AllDirs | QDir::NoDotDot, QDirIterator::Subdirectories);
     QStringList blacklist;
-    struct isMetainfo {
-        bool operator() (const QFileInfo &x) const {
-            return x.suffix() == QLatin1String("metainfo");
-        }
-    };
-    struct pathStartsWith {
-        pathStartsWith(const QString &path) : _path(path) {}
-        bool operator() (const QString &x) const {
-            return _path.startsWith(x);
-        }
-        const QString _path;
-    };
-
 
     while (iterator.hasNext()) {
         iterator.next();