aboutsummaryrefslogtreecommitdiffstats
path: root/src/qml/qml/qqmlmetatype_p.h
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@qt.io>2017-06-23 13:36:13 +0200
committerSimon Hausmann <simon.hausmann@qt.io>2017-08-02 16:32:49 +0000
commitc6b2dd879d02b21b18f80faab541f8f04286685a (patch)
treecfae0855871c1fa2cd2fcdf21b14af0a392ced93 /src/qml/qml/qqmlmetatype_p.h
parentdb1034d093d76b4b6e66fcdd178800e0cf9d1005 (diff)
Move property cache from the engine to QQmlType
Now that the property cache is independent of a specific engine, we can cache them in QQmlType instead of caching them per engine. This simplifies the logic and avoids duplicated property caches when multiple engines are running. Task-number: QTBUG-61536 Change-Id: I6f082e1e7495ae0f5b92559e8d0a3437c56e303a Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src/qml/qml/qqmlmetatype_p.h')
-rw-r--r--src/qml/qml/qqmlmetatype_p.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/qml/qml/qqmlmetatype_p.h b/src/qml/qml/qqmlmetatype_p.h
index d17172a917..c577a9cc18 100644
--- a/src/qml/qml/qqmlmetatype_p.h
+++ b/src/qml/qml/qqmlmetatype_p.h
@@ -70,6 +70,7 @@ class QQmlTypeModule;
class QHashedString;
class QHashedStringRef;
class QMutex;
+class QQmlPropertyCache;
namespace QV4 { struct String; }
@@ -89,6 +90,8 @@ public:
static QQmlType qmlType(const QUrl &url, bool includeNonFileImports = false);
static QQmlType qmlTypeFromIndex(int);
+ static QQmlPropertyCache *propertyCache(const QMetaObject *metaObject);
+
static QMetaProperty defaultProperty(const QMetaObject *);
static QMetaProperty defaultProperty(QObject *);
static QMetaMethod defaultMethod(const QMetaObject *);