1 files changed, 11 insertions, 3 deletions

diff --git a/src/qml/qml/qqmlimport_p.h b/src/qml/qml/qqmlimport_p.h
index 8a0a4ea4f1..a1911515d0 100644
--- a/src/qml/qml/qqmlimport_p.h
+++ b/src/qml/qml/qqmlimport_p.h
@@ -70,6 +70,10 @@ class QQmlImportDatabase;
 class QQmlTypeLoader;
 class QQmlTypeLoaderQmldirContent;
 
+namespace QQmlImport {
+    enum RecursionRestriction { PreventRecursion, AllowRecursion };
+}
+
 struct QQmlImportInstance
 {
     QString uri; // e.g. QtQuick
@@ -77,6 +81,7 @@ struct QQmlImportInstance
     int majversion; // the major version imported
     int minversion; // the minor version imported
     bool isLibrary; // true means that this is not a file import
+    bool implicitlyImported = false;
     QQmlDirComponents qmlDirComponents; // a copy of the components listed in the qmldir
     QQmlDirScripts qmlDirScripts; // a copy of the scripts in the qmldir
 
@@ -87,7 +92,8 @@ struct QQmlImportInstance
 
     bool resolveType(QQmlTypeLoader *typeLoader, const QHashedStringRef &type,
                      int *vmajor, int *vminor, QQmlType* type_return,
-                     QString *base = 0, bool *typeRecursionDetected = 0) const;
+                     QString *base = 0, bool *typeRecursionDetected = 0,
+                     QQmlImport::RecursionRestriction recursionRestriction = QQmlImport::PreventRecursion) const;
 };
 
 class QQmlImportNamespace
@@ -102,7 +108,8 @@ public:
 
     bool resolveType(QQmlTypeLoader *typeLoader, const QHashedStringRef& type,
                      int *vmajor, int *vminor, QQmlType* type_return,
-                     QString *base = 0, QList<QQmlError> *errors = 0);
+                     QString *base = 0, QList<QQmlError> *errors = 0,
+                     QQmlImport::RecursionRestriction recursionRestriction = QQmlImport::PreventRecursion);
 
     // Prefix when used as a qualified import.  Otherwise empty.
     QHashedString prefix;
@@ -128,7 +135,8 @@ public:
                      QQmlType *type_return,
                      int *version_major, int *version_minor,
                      QQmlImportNamespace **ns_return,
-                     QList<QQmlError> *errors = 0) const;
+                     QList<QQmlError> *errors = 0,
+                     QQmlImport::RecursionRestriction recursionRestriction = QQmlImport::PreventRecursion) const;
     bool resolveType(QQmlImportNamespace *,
                      const QHashedStringRef& type,
                      QQmlType *type_return, int *version_major, int *version_minor) const;