aboutsummaryrefslogtreecommitdiffstats
path: root/src/qml/qml/qqmltypewrapper_p.h
diff options
context:
space:
mode:
authorLars Knoll <lars.knoll@qt.io>2017-06-23 13:09:03 +0200
committerSimon Hausmann <simon.hausmann@qt.io>2017-08-02 16:32:37 +0000
commita6633e41e7c6795bbbc016ce36e4ff91ec5248ad (patch)
tree084c03ead7bc38c146333e262637f3fd0a45881d /src/qml/qml/qqmltypewrapper_p.h
parentee1de29c2dcb16a4b0c691c7fc53310e175fa49f (diff)
Use QQmlType by value in the type wrapper
Task-number: QTBUG-61536 Change-Id: Ie40cb3a6e170331b0ec7ab5deaf7c1d7ef0cdaeb Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'src/qml/qml/qqmltypewrapper_p.h')
-rw-r--r--src/qml/qml/qqmltypewrapper_p.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/qml/qml/qqmltypewrapper_p.h b/src/qml/qml/qqmltypewrapper_p.h
index 3b0ae04cc1..c21a66424b 100644
--- a/src/qml/qml/qqmltypewrapper_p.h
+++ b/src/qml/qml/qqmltypewrapper_p.h
@@ -76,7 +76,9 @@ struct QmlTypeWrapper : Object {
TypeNameMode mode;
QQmlQPointer<QObject> object;
- QQmlType *type;
+ QQmlType type() const;
+
+ QQmlTypePrivate *typePrivate;
QQmlTypeNameCache *typeNamespace;
const void *importNamespace;
};
@@ -93,7 +95,7 @@ struct Q_QML_EXPORT QmlTypeWrapper : Object
QVariant toVariant() const;
- static ReturnedValue create(ExecutionEngine *, QObject *, QQmlType *,
+ static ReturnedValue create(ExecutionEngine *, QObject *, const QQmlType &,
Heap::QmlTypeWrapper::TypeNameMode = Heap::QmlTypeWrapper::IncludeEnums);
static ReturnedValue create(ExecutionEngine *, QObject *, QQmlTypeNameCache *, const void *,
Heap::QmlTypeWrapper::TypeNameMode = Heap::QmlTypeWrapper::IncludeEnums);