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

Conflicts:
	tests/auto/quick/qquicklistview/tst_qquicklistview.cpp

Change-Id: I9588a3e2c7d590e031dd4c66905a79f0d74d3ac8

1 files changed, 8 insertions, 0 deletions

diff --git a/tools/qmlplugindump/main.cpp b/tools/qmlplugindump/main.cpp
index 0f73afcc7b..aa2e8755e6 100644
--- a/tools/qmlplugindump/main.cpp
+++ b/tools/qmlplugindump/main.cpp
@@ -849,6 +849,14 @@ static bool getDependencies(const QQmlEngine &engine, const QString &pluginImpor
         std::cerr << "failed to proecess output of qmlimportscanner" << std::endl;
         return false;
     }
+
+    QStringList aux;
+    foreach (const QString &str, *dependencies) {
+        if (!str.startsWith("Qt.test.qtestroot"))
+            aux += str;
+    }
+    *dependencies = aux;
+
     return true;
 }