Merge remote-tracking branch 'origin/13.0'

Change-Id: If752e3383b35873b696e8beca27d8838a4096c8a

1 files changed, 6 insertions, 0 deletions

diff --git a/src/libs/qmljs/qmljsplugindumper.cpp b/src/libs/qmljs/qmljsplugindumper.cpp
index b2591fbf0ab..36f2cd802db 100644
--- a/src/libs/qmljs/qmljsplugindumper.cpp
+++ b/src/libs/qmljs/qmljsplugindumper.cpp
@@ -569,6 +569,9 @@ void PluginDumper::loadQmltypesFile(const FilePaths &qmltypesFilePaths,
     Utils::onFinished(loadQmlTypeDescription(qmltypesFilePaths), this,
             [this, qmltypesFilePaths, libraryPath, libraryInfo]
             (const QFuture<PluginDumper::QmlTypeDescription> &typesFuture) {
+        if (typesFuture.isCanceled() || typesFuture.resultCount() == 0)
+            return;
+
         PluginDumper::QmlTypeDescription typesResult = typesFuture.result();
         if (!typesResult.dependencies.isEmpty())
         {
@@ -576,6 +579,9 @@ void PluginDumper::loadQmltypesFile(const FilePaths &qmltypesFilePaths,
                                                QSharedPointer<QSet<FilePath>>()), this,
                               [typesResult, libraryInfo, libraryPath, this] (const QFuture<PluginDumper::DependencyInfo> &loadFuture)
             {
+                if (loadFuture.isCanceled() || loadFuture.resultCount() == 0)
+                    return;
+
                 PluginDumper::DependencyInfo loadResult = loadFuture.result();
                 QStringList errors = typesResult.errors;
                 QStringList warnings = typesResult.errors;