diff options
author | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2016-01-22 14:30:58 +0000 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2016-01-22 14:30:58 +0000 |
commit | 60d27c228e6e17ed782ca0a4202768ffe2e46740 (patch) | |
tree | d45f7c354f5914e6eb23f11fe3966466fa4818c3 /tools | |
parent | ccaa12c225062e0ef654bee9a96cbe5e5f9724ae (diff) | |
parent | f286db98ee41a8aa71b9a65a235b6d3e265d79f4 (diff) |
Merge "Merge remote-tracking branch 'origin/5.6' into dev" into refs/staging/dev
Diffstat (limited to 'tools')
-rw-r--r-- | tools/qmlplugindump/main.cpp | 11 |
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; |