From 74313fd30a79e6f26734127157870c4491331501 Mon Sep 17 00:00:00 2001
From: Ulf Hermann <ulf.hermann@qt.io>
Date: Wed, 3 Apr 2019 14:53:43 +0200
Subject: QQmlTypeCompiler: Avoid including qqmldelegatecomponent_p.h

QQmlAbstractDelegateComponent conceptually belongs to the models
library.

Change-Id: I03ad008645742c212dad6191cb1cdd16f17a0e14
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
---
 src/qml/compiler/qqmltypecompiler.cpp | 28 +++++++++++++++++++---------
 1 file changed, 19 insertions(+), 9 deletions(-)

(limited to 'src/qml/compiler/qqmltypecompiler.cpp')

diff --git a/src/qml/compiler/qqmltypecompiler.cpp b/src/qml/compiler/qqmltypecompiler.cpp
index 66d3afc7a0..239f04a58f 100644
--- a/src/qml/compiler/qqmltypecompiler.cpp
+++ b/src/qml/compiler/qqmltypecompiler.cpp
@@ -44,7 +44,6 @@
 #include <private/qqmlcustomparser_p.h>
 #include <private/qqmlvmemetaobject_p.h>
 #include <private/qqmlcomponent_p.h>
-#include <private/qqmldelegatecomponent_p.h>
 
 #define COMPILE_EXCEPTION(token, desc) \
     { \
@@ -781,6 +780,23 @@ QQmlComponentAndAliasResolver::QQmlComponentAndAliasResolver(QQmlTypeCompiler *t
 {
 }
 
+static bool isUsableComponent(const QMetaObject *metaObject)
+{
+    // The metaObject is a component we're interested in if it either is a QQmlComponent itself
+    // or if any of its parents is a QQmlAbstractDelegateComponent. We don't want to include
+    // qqmldelegatecomponent_p.h because it belongs to QtQmlModels.
+
+    if (metaObject == &QQmlComponent::staticMetaObject)
+        return true;
+
+    for (; metaObject; metaObject = metaObject->superClass()) {
+        if (qstrcmp(metaObject->className(), "QQmlAbstractDelegateComponent") == 0)
+            return true;
+    }
+
+    return false;
+}
+
 void QQmlComponentAndAliasResolver::findAndRegisterImplicitComponents(const QmlIR::Object *obj, QQmlPropertyCache *propertyCache)
 {
     QmlIR::PropertyResolver propertyResolver(propertyCache);
@@ -802,15 +818,9 @@ void QQmlComponentAndAliasResolver::findAndRegisterImplicitComponents(const QmlI
             firstMetaObject = tr->type.metaObject();
         else if (tr->compilationUnit)
             firstMetaObject = tr->compilationUnit->rootPropertyCache()->firstCppMetaObject();
-        // 1: test for QQmlComponent
-        if (firstMetaObject && firstMetaObject == &QQmlComponent::staticMetaObject)
-            continue;
-        // 2: test for QQmlAbstractDelegateComponent
-        while (firstMetaObject && firstMetaObject != &QQmlAbstractDelegateComponent::staticMetaObject)
-            firstMetaObject = firstMetaObject->superClass();
-        if (firstMetaObject)
+        if (isUsableComponent(firstMetaObject))
             continue;
-        // if here, not a QQmlComponent or a QQmlAbstractDelegateComponent, so needs wrapping
+        // if here, not a QQmlComponent, so needs wrapping
 
         QQmlPropertyData *pd = nullptr;
         if (binding->propertyNameIndex != quint32(0)) {
-- 
cgit v1.2.3