aboutsummaryrefslogtreecommitdiffstats
path: root/src/qml/qml
diff options
context:
space:
mode:
Diffstat (limited to 'src/qml/qml')
-rw-r--r--src/qml/qml/qqmlcomponent.cpp10
-rw-r--r--src/qml/qml/qqmlxmlhttprequest.cpp2
2 files changed, 6 insertions, 6 deletions
diff --git a/src/qml/qml/qqmlcomponent.cpp b/src/qml/qml/qqmlcomponent.cpp
index 487846f610..79e52f3914 100644
--- a/src/qml/qml/qqmlcomponent.cpp
+++ b/src/qml/qml/qqmlcomponent.cpp
@@ -1047,11 +1047,11 @@ namespace QV4 {
namespace Heap {
#define QmlIncubatorObjectMembers(class, Member) \
- Member(class, Value, valuemap) \
- Member(class, Value, statusChanged) \
- Member(class, Pointer<QmlContext>, qmlContext) \
- Member(class, QQmlComponentIncubator *, incubator) \
- Member(class, QQmlQPointer<QObject>, parent)
+ Member(class, Value, Value, valuemap) \
+ Member(class, Value, Value, statusChanged) \
+ Member(class, Pointer, QmlContext *, qmlContext) \
+ Member(class, NoMark, QQmlComponentIncubator *, incubator) \
+ Member(class, NoMark, QQmlQPointer<QObject>, parent)
DECLARE_HEAP_OBJECT(QmlIncubatorObject, Object) {
DECLARE_MARK_TABLE(QmlIncubatorObject);
diff --git a/src/qml/qml/qqmlxmlhttprequest.cpp b/src/qml/qml/qqmlxmlhttprequest.cpp
index 868120a2f6..502a693d5c 100644
--- a/src/qml/qml/qqmlxmlhttprequest.cpp
+++ b/src/qml/qml/qqmlxmlhttprequest.cpp
@@ -1598,7 +1598,7 @@ struct QQmlXMLHttpRequestWrapper : Object {
};
#define QQmlXMLHttpRequestCtorMembers(class, Member) \
- Member(class, Pointer<Object>, proto)
+ Member(class, Pointer, Object *, proto)
DECLARE_HEAP_OBJECT(QQmlXMLHttpRequestCtor, FunctionObject) {
DECLARE_MARK_TABLE(QQmlXMLHttpRequestCtor);