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

Change-Id: I4af0bf8ec1569097d97f8ce0bb8bf1a0e4a989ec

1 files changed, 9 insertions, 2 deletions

diff --git a/tools/qmlplugindump/main.cpp b/tools/qmlplugindump/main.cpp
index de6e2f9b4d..776e19fdf4 100644
--- a/tools/qmlplugindump/main.cpp
+++ b/tools/qmlplugindump/main.cpp
@@ -786,12 +786,19 @@ static bool readDependenciesData(QString dependenciesFile, const QByteArray &fil
                   << ": expected an array" << std::endl;
         return false;
     }
+    // Workaround for avoiding conflicting types when no dependency has been found.
+    //
+    // qmlplugindump used to import QtQuick, so all types defined in QtQuick used to be skipped when dumping.
+    // Now that it imports only Qt, it is no longer the case: if no dependency is found all the types defined
+    // in QtQuick will be dumped, causing conflicts.
+    if (dependencies->isEmpty())
+        dependencies->push_back(QLatin1String("QtQuick 2.0"));
     return true;
 }
 
-static bool readDependenciesFile(QString dependenciesFile, QStringList *dependencies,
+static bool readDependenciesFile(const QString &dependenciesFile, QStringList *dependencies,
                                 const QStringList &urisToSkip) {
-    if (!QFileInfo(dependenciesFile).exists()) {
+    if (!QFileInfo::exists(dependenciesFile)) {
         std::cerr << "non existing dependencies file " << dependenciesFile.toStdString()
                   << std::endl;
         return false;