Move PersistenValue and WeakValue into it's own file

They deserve having their own set of files, and it helps
reduce dependencies.

Change-Id: Ifd4394f88ef51cbccc61bf92dd20636f570141d9
Reviewed-by: Simon Hausmann <[email protected]>

7 files changed, 427 insertions, 324 deletions

diff --git a/src/qml/jsruntime/jsruntime.pri b/src/qml/jsruntime/jsruntime.pri
index 6afcc77f40..43eb61ac9a 100644
--- a/src/qml/jsruntime/jsruntime.pri
+++ b/src/qml/jsruntime/jsruntime.pri
@@ -6,6 +6,7 @@ SOURCES += \
     $$PWD/qv4context.cpp \
     $$PWD/qv4runtime.cpp \
     $$PWD/qv4value.cpp \
+    $$PWD/qv4persistent.cpp \
     $$PWD/qv4debugging.cpp \
     $$PWD/qv4lookup.cpp \
     $$PWD/qv4identifier.cpp \
@@ -51,6 +52,7 @@ HEADERS += \
     $$PWD/qv4math_p.h \
     $$PWD/qv4value_inl_p.h \
     $$PWD/qv4value_p.h \
+    $$PWD/qv4persistent_p.h \
     $$PWD/qv4debugging_p.h \
     $$PWD/qv4lookup_p.h \
     $$PWD/qv4identifier_p.h \
diff --git a/src/qml/jsruntime/qv4persistent.cpp b/src/qml/jsruntime/qv4persistent.cpp
new file mode 100644
index 0000000000..72e3651757
--- /dev/null
+++ b/src/qml/jsruntime/qv4persistent.cpp
@@ -0,0 +1,255 @@
+/****************************************************************************
+**
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the QtQml module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia.  For licensing terms and
+** conditions see http://qt.digia.com/licensing.  For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Digia gives you certain additional
+** rights.  These rights are described in the Digia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qv4persistent_p.h"
+#include "qv4mm_p.h"
+
+using namespace QV4;
+
+PersistentValue::PersistentValue(const ValueRef val)
+    : d(new PersistentValuePrivate(val.asReturnedValue()))
+{
+}
+
+PersistentValue::PersistentValue(ReturnedValue val)
+    : d(new PersistentValuePrivate(val))
+{
+}
+
+PersistentValue::PersistentValue(const PersistentValue &other)
+    : d(other.d)
+{
+    if (d)
+        d->ref();
+}
+
+PersistentValue &PersistentValue::operator=(const PersistentValue &other)
+{
+    if (d == other.d)
+        return *this;
+
+    // the memory manager cleans up those with a refcount of 0
+
+    if (d)
+        d->deref();
+    d = other.d;
+    if (d)
+        d->ref();
+
+    return *this;
+}
+
+PersistentValue &PersistentValue::operator =(const ValueRef other)
+{
+    if (!d) {
+        d = new PersistentValuePrivate(other.asReturnedValue());
+        return *this;
+    }
+    d = d->detach(other.asReturnedValue());
+    return *this;
+}
+
+PersistentValue &PersistentValue::operator =(ReturnedValue other)
+{
+    if (!d) {
+        d = new PersistentValuePrivate(other);
+        return *this;
+    }
+    d = d->detach(other);
+    return *this;
+}
+
+PersistentValue::~PersistentValue()
+{
+    if (d)
+        d->deref();
+}
+
+WeakValue::WeakValue(const ValueRef val)
+    : d(new PersistentValuePrivate(val.asReturnedValue(), /*engine*/0, /*weak*/true))
+{
+}
+
+WeakValue::WeakValue(const WeakValue &other)
+    : d(other.d)
+{
+    if (d)
+        d->ref();
+}
+
+WeakValue::WeakValue(ReturnedValue val)
+    : d(new PersistentValuePrivate(val, /*engine*/0, /*weak*/true))
+{
+}
+
+WeakValue &WeakValue::operator=(const WeakValue &other)
+{
+    if (d == other.d)
+        return *this;
+
+    // the memory manager cleans up those with a refcount of 0
+
+    if (d)
+        d->deref();
+    d = other.d;
+    if (d)
+        d->ref();
+
+    return *this;
+}
+
+WeakValue &WeakValue::operator =(const ValueRef other)
+{
+    if (!d) {
+        d = new PersistentValuePrivate(other.asReturnedValue(), /*engine*/0, /*weak*/true);
+        return *this;
+    }
+    d = d->detach(other.asReturnedValue(), /*weak*/true);
+    return *this;
+}
+
+WeakValue &WeakValue::operator =(const ReturnedValue &other)
+{
+    if (!d) {
+        d = new PersistentValuePrivate(other, /*engine*/0, /*weak*/true);
+        return *this;
+    }
+    d = d->detach(other, /*weak*/true);
+    return *this;
+}
+
+
+WeakValue::~WeakValue()
+{
+    if (d)
+        d->deref();
+}
+
+void WeakValue::markOnce(ExecutionEngine *e)
+{
+    if (!d)
+        return;
+    d->value.mark(e);
+}
+
+PersistentValuePrivate::PersistentValuePrivate(ReturnedValue v, ExecutionEngine *e, bool weak)
+    : refcount(1)
+    , weak(weak)
+    , engine(e)
+    , prev(0)
+    , next(0)
+{
+    value.val = v;
+    init();
+}
+
+void PersistentValuePrivate::init()
+{
+    if (!engine) {
+        Managed *m = value.asManaged();
+        if (!m)
+            return;
+
+        engine = m->engine();
+    }
+    if (engine && !prev) {
+        PersistentValuePrivate **listRoot = weak ? &engine->memoryManager->m_weakValues : &engine->memoryManager->m_persistentValues;
+
+        prev = listRoot;
+        next = *listRoot;
+        *prev = this;
+        if (next)
+            next->prev = &this->next;
+    }
+}
+
+PersistentValuePrivate::~PersistentValuePrivate()
+{
+}
+
+void PersistentValuePrivate::removeFromList()
+{
+    if (prev) {
+        if (next)
+            next->prev = prev;
+        *prev = next;
+        next = 0;
+        prev = 0;
+    }
+}
+
+void PersistentValuePrivate::deref()
+{
+    // if engine is not 0, they are registered with the memory manager
+    // and will get cleaned up in the next gc run
+    if (!--refcount) {
+        removeFromList();
+        delete this;
+    }
+}
+
+PersistentValuePrivate *PersistentValuePrivate::detach(const QV4::ReturnedValue val, bool weak)
+{
+    if (refcount == 1) {
+        value.val = val;
+
+        Managed *m = value.asManaged();
+        if (!prev) {
+            if (m) {
+                ExecutionEngine *engine = m->engine();
+                if (engine) {
+                    PersistentValuePrivate **listRoot = weak ? &engine->memoryManager->m_weakValues : &engine->memoryManager->m_persistentValues;
+                    prev = listRoot;
+                    next = *listRoot;
+                    *prev = this;
+                    if (next)
+                        next->prev = &this->next;
+                }
+            }
+        } else if (!m)
+            removeFromList();
+
+        return this;
+    }
+    --refcount;
+    return new PersistentValuePrivate(val, engine, weak);
+}
+
diff --git a/src/qml/jsruntime/qv4persistent_p.h b/src/qml/jsruntime/qv4persistent_p.h
new file mode 100644
index 0000000000..07e8ee9775
--- /dev/null
+++ b/src/qml/jsruntime/qv4persistent_p.h
@@ -0,0 +1,168 @@
+/****************************************************************************
+**
+** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the QtQml module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia.  For licensing terms and
+** conditions see http://qt.digia.com/licensing.  For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Digia gives you certain additional
+** rights.  These rights are described in the Digia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+#ifndef QV4PERSISTENT_H
+#define QV4PERSISTENT_H
+
+#include "qv4value_inl_p.h"
+
+QT_BEGIN_NAMESPACE
+
+namespace QV4 {
+
+struct Q_QML_PRIVATE_EXPORT PersistentValuePrivate
+{
+    PersistentValuePrivate(ReturnedValue v, ExecutionEngine *engine = 0, bool weak = false);
+    virtual ~PersistentValuePrivate();
+    Value value;
+    uint refcount;
+    bool weak;
+    QV4::ExecutionEngine *engine;
+    PersistentValuePrivate **prev;
+    PersistentValuePrivate *next;
+
+    void init();
+    void removeFromList();
+    void ref() { ++refcount; }
+    void deref();
+    PersistentValuePrivate *detach(const ReturnedValue value, bool weak = false);
+
+    bool checkEngine(QV4::ExecutionEngine *otherEngine) {
+        if (!engine) {
+            Q_ASSERT(!value.isObject());
+            engine = otherEngine;
+        }
+        return (engine == otherEngine);
+    }
+};
+
+class Q_QML_EXPORT PersistentValue
+{
+public:
+    PersistentValue() : d(0) {}
+    PersistentValue(const PersistentValue &other);
+    PersistentValue &operator=(const PersistentValue &other);
+
+    PersistentValue(const ValueRef val);
+    PersistentValue(ReturnedValue val);
+    template<typename T>
+    PersistentValue(Returned<T> *obj);
+    template<typename T>
+    PersistentValue(const Referenced<T> obj);
+    PersistentValue &operator=(const ValueRef other);
+    PersistentValue &operator =(ReturnedValue other);
+    template<typename T>
+    PersistentValue &operator=(Returned<T> *obj);
+    template<typename T>
+    PersistentValue &operator=(const Referenced<T> obj);
+    ~PersistentValue();
+
+    ReturnedValue value() const {
+        return (d ? d->value.asReturnedValue() : Primitive::undefinedValue().asReturnedValue());
+    }
+
+    ExecutionEngine *engine() {
+        if (!d)
+            return 0;
+        if (d->engine)
+            return d->engine;
+        Managed *m = d->value.asManaged();
+        return m ? m->engine() : 0;
+    }
+
+    bool isUndefined() const { return !d || d->value.isUndefined(); }
+    bool isNullOrUndefined() const { return !d || d->value.isNullOrUndefined(); }
+    void clear() {
+        *this = PersistentValue();
+    }
+
+private:
+    friend struct ValueRef;
+    PersistentValuePrivate *d;
+};
+
+class Q_QML_EXPORT WeakValue
+{
+public:
+    WeakValue() : d(0) {}
+    WeakValue(const ValueRef val);
+    WeakValue(const WeakValue &other);
+    WeakValue(ReturnedValue val);
+    template<typename T>
+    WeakValue(Returned<T> *obj);
+    WeakValue &operator=(const WeakValue &other);
+    WeakValue &operator=(const ValueRef other);
+    WeakValue &operator =(const ReturnedValue &other);
+    template<typename T>
+    WeakValue &operator=(Returned<T> *obj);
+
+    ~WeakValue();
+
+    ReturnedValue value() const {
+        return (d ? d->value.asReturnedValue() : Primitive::undefinedValue().asReturnedValue());
+    }
+
+    ExecutionEngine *engine() {
+        if (!d)
+            return 0;
+        if (d->engine)
+            return d->engine;
+        Managed *m = d->value.asManaged();
+        return m ? m->engine() : 0;
+    }
+
+    bool isUndefined() const { return !d || d->value.isUndefined(); }
+    bool isNullOrUndefined() const { return !d || d->value.isNullOrUndefined(); }
+    void clear() {
+        *this = WeakValue();
+    }
+
+    void markOnce(ExecutionEngine *e);
+
+private:
+    friend struct ValueRef;
+    PersistentValuePrivate *d;
+};
+
+} // namespace QV4
+
+QT_END_NAMESPACE
+
+#endif
diff --git a/src/qml/jsruntime/qv4scopedvalue_p.h b/src/qml/jsruntime/qv4scopedvalue_p.h
index 678b18c829..34fb05835f 100644
--- a/src/qml/jsruntime/qv4scopedvalue_p.h
+++ b/src/qml/jsruntime/qv4scopedvalue_p.h
@@ -43,6 +43,7 @@
 
 #include "qv4engine_p.h"
 #include "qv4value_p.h"
+#include "qv4persistent_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/qml/jsruntime/qv4value.cpp b/src/qml/jsruntime/qv4value.cpp
index 33084e0499..c91084caee 100644
--- a/src/qml/jsruntime/qv4value.cpp
+++ b/src/qml/jsruntime/qv4value.cpp
@@ -281,213 +281,3 @@ Object *Value::toObject(ExecutionContext *ctx) const
     return __qmljs_convert_to_object(ctx, ValueRef::fromRawValue(this))->getPointer();
 }
 
-
-PersistentValue::PersistentValue(const ValueRef val)
-    : d(new PersistentValuePrivate(val.asReturnedValue()))
-{
-}
-
-PersistentValue::PersistentValue(ReturnedValue val)
-    : d(new PersistentValuePrivate(val))
-{
-}
-
-PersistentValue::PersistentValue(const PersistentValue &other)
-    : d(other.d)
-{
-    if (d)
-        d->ref();
-}
-
-PersistentValue &PersistentValue::operator=(const PersistentValue &other)
-{
-    if (d == other.d)
-        return *this;
-
-    // the memory manager cleans up those with a refcount of 0
-
-    if (d)
-        d->deref();
-    d = other.d;
-    if (d)
-        d->ref();
-
-    return *this;
-}
-
-PersistentValue &PersistentValue::operator =(const ValueRef other)
-{
-    if (!d) {
-        d = new PersistentValuePrivate(other.asReturnedValue());
-        return *this;
-    }
-    d = d->detach(other.asReturnedValue());
-    return *this;
-}
-
-PersistentValue &PersistentValue::operator =(ReturnedValue other)
-{
-    if (!d) {
-        d = new PersistentValuePrivate(other);
-        return *this;
-    }
-    d = d->detach(other);
-    return *this;
-}
-
-PersistentValue::~PersistentValue()
-{
-    if (d)
-        d->deref();
-}
-
-WeakValue::WeakValue(const ValueRef val)
-    : d(new PersistentValuePrivate(val.asReturnedValue(), /*engine*/0, /*weak*/true))
-{
-}
-
-WeakValue::WeakValue(const WeakValue &other)
-    : d(other.d)
-{
-    if (d)
-        d->ref();
-}
-
-WeakValue::WeakValue(ReturnedValue val)
-    : d(new PersistentValuePrivate(val, /*engine*/0, /*weak*/true))
-{
-}
-
-WeakValue &WeakValue::operator=(const WeakValue &other)
-{
-    if (d == other.d)
-        return *this;
-
-    // the memory manager cleans up those with a refcount of 0
-
-    if (d)
-        d->deref();
-    d = other.d;
-    if (d)
-        d->ref();
-
-    return *this;
-}
-
-WeakValue &WeakValue::operator =(const ValueRef other)
-{
-    if (!d) {
-        d = new PersistentValuePrivate(other.asReturnedValue(), /*engine*/0, /*weak*/true);
-        return *this;
-    }
-    d = d->detach(other.asReturnedValue(), /*weak*/true);
-    return *this;
-}
-
-WeakValue &WeakValue::operator =(const ReturnedValue &other)
-{
-    if (!d) {
-        d = new PersistentValuePrivate(other, /*engine*/0, /*weak*/true);
-        return *this;
-    }
-    d = d->detach(other, /*weak*/true);
-    return *this;
-}
-
-
-WeakValue::~WeakValue()
-{
-    if (d)
-        d->deref();
-}
-
-void WeakValue::markOnce(ExecutionEngine *e)
-{
-    if (!d)
-        return;
-    d->value.mark(e);
-}
-
-PersistentValuePrivate::PersistentValuePrivate(ReturnedValue v, ExecutionEngine *e, bool weak)
-    : refcount(1)
-    , weak(weak)
-    , engine(e)
-    , prev(0)
-    , next(0)
-{
-    value.val = v;
-    init();
-}
-
-void PersistentValuePrivate::init()
-{
-    if (!engine) {
-        Managed *m = value.asManaged();
-        if (!m)
-            return;
-
-        engine = m->engine();
-    }
-    if (engine && !prev) {
-        PersistentValuePrivate **listRoot = weak ? &engine->memoryManager->m_weakValues : &engine->memoryManager->m_persistentValues;
-
-        prev = listRoot;
-        next = *listRoot;
-        *prev = this;
-        if (next)
-            next->prev = &this->next;
-    }
-}
-
-PersistentValuePrivate::~PersistentValuePrivate()
-{
-}
-
-void PersistentValuePrivate::removeFromList()
-{
-    if (prev) {
-        if (next)
-            next->prev = prev;
-        *prev = next;
-        next = 0;
-        prev = 0;
-    }
-}
-
-void PersistentValuePrivate::deref()
-{
-    // if engine is not 0, they are registered with the memory manager
-    // and will get cleaned up in the next gc run
-    if (!--refcount) {
-        removeFromList();
-        delete this;
-    }
-}
-
-PersistentValuePrivate *PersistentValuePrivate::detach(const QV4::ReturnedValue val, bool weak)
-{
-    if (refcount == 1) {
-        value.val = val;
-
-        Managed *m = value.asManaged();
-        if (!prev) {
-            if (m) {
-                ExecutionEngine *engine = m->engine();
-                if (engine) {
-                    PersistentValuePrivate **listRoot = weak ? &engine->memoryManager->m_weakValues : &engine->memoryManager->m_persistentValues;
-                    prev = listRoot;
-                    next = *listRoot;
-                    *prev = this;
-                    if (next)
-                        next->prev = &this->next;
-                }
-            }
-        } else if (!m)
-            removeFromList();
-
-        return this;
-    }
-    --refcount;
-    return new PersistentValuePrivate(val, engine, weak);
-}
-
diff --git a/src/qml/jsruntime/qv4value_inl_p.h b/src/qml/jsruntime/qv4value_inl_p.h
index 7ec7e12b16..d82af0643e 100644
--- a/src/qml/jsruntime/qv4value_inl_p.h
+++ b/src/qml/jsruntime/qv4value_inl_p.h
@@ -276,120 +276,6 @@ inline ErrorObject *Value::asErrorObject() const
 template<typename T>
 inline T *Value::as() const { Managed *m = isObject() ? managed() : 0; return m ? m->as<T>() : 0; }
 
-struct Q_QML_PRIVATE_EXPORT PersistentValuePrivate
-{
-    PersistentValuePrivate(ReturnedValue v, ExecutionEngine *engine = 0, bool weak = false);
-    virtual ~PersistentValuePrivate();
-    Value value;
-    uint refcount;
-    bool weak;
-    QV4::ExecutionEngine *engine;
-    PersistentValuePrivate **prev;
-    PersistentValuePrivate *next;
-
-    void init();
-    void removeFromList();
-    void ref() { ++refcount; }
-    void deref();
-    PersistentValuePrivate *detach(const ReturnedValue value, bool weak = false);
-
-    bool checkEngine(QV4::ExecutionEngine *otherEngine) {
-        if (!engine) {
-            Q_ASSERT(!value.isObject());
-            engine = otherEngine;
-        }
-        return (engine == otherEngine);
-    }
-};
-
-class Q_QML_EXPORT PersistentValue
-{
-public:
-    PersistentValue() : d(0) {}
-    PersistentValue(const PersistentValue &other);
-    PersistentValue &operator=(const PersistentValue &other);
-
-    PersistentValue(const ValueRef val);
-    PersistentValue(ReturnedValue val);
-    template<typename T>
-    PersistentValue(Returned<T> *obj);
-    template<typename T>
-    PersistentValue(const Referenced<T> obj);
-    PersistentValue &operator=(const ValueRef other);
-    PersistentValue &operator =(ReturnedValue other);
-    template<typename T>
-    PersistentValue &operator=(Returned<T> *obj);
-    template<typename T>
-    PersistentValue &operator=(const Referenced<T> obj);
-    ~PersistentValue();
-
-    ReturnedValue value() const {
-        return (d ? d->value.asReturnedValue() : Primitive::undefinedValue().asReturnedValue());
-    }
-
-    ExecutionEngine *engine() {
-        if (!d)
-            return 0;
-        if (d->engine)
-            return d->engine;
-        Managed *m = d->value.asManaged();
-        return m ? m->engine() : 0;
-    }
-
-    bool isUndefined() const { return !d || d->value.isUndefined(); }
-    bool isNullOrUndefined() const { return !d || d->value.isNullOrUndefined(); }
-    void clear() {
-        *this = PersistentValue();
-    }
-
-private:
-    friend struct ValueRef;
-    PersistentValuePrivate *d;
-};
-
-class Q_QML_EXPORT WeakValue
-{
-public:
-    WeakValue() : d(0) {}
-    WeakValue(const ValueRef val);
-    WeakValue(const WeakValue &other);
-    WeakValue(ReturnedValue val);
-    template<typename T>
-    WeakValue(Returned<T> *obj);
-    WeakValue &operator=(const WeakValue &other);
-    WeakValue &operator=(const ValueRef other);
-    WeakValue &operator =(const ReturnedValue &other);
-    template<typename T>
-    WeakValue &operator=(Returned<T> *obj);
-
-    ~WeakValue();
-
-    ReturnedValue value() const {
-        return (d ? d->value.asReturnedValue() : Primitive::undefinedValue().asReturnedValue());
-    }
-
-    ExecutionEngine *engine() {
-        if (!d)
-            return 0;
-        if (d->engine)
-            return d->engine;
-        Managed *m = d->value.asManaged();
-        return m ? m->engine() : 0;
-    }
-
-    bool isUndefined() const { return !d || d->value.isUndefined(); }
-    bool isNullOrUndefined() const { return !d || d->value.isNullOrUndefined(); }
-    void clear() {
-        *this = WeakValue();
-    }
-
-    void markOnce(ExecutionEngine *e);
-
-private:
-    friend struct ValueRef;
-    PersistentValuePrivate *d;
-};
-
 } // namespace QV4
 
 QT_END_NAMESPACE
diff --git a/src/qml/qml/qqmldata_p.h b/src/qml/qml/qqmldata_p.h
index f29b54dda2..93060e97fb 100644
--- a/src/qml/qml/qqmldata_p.h
+++ b/src/qml/qml/qqmldata_p.h
@@ -57,6 +57,7 @@
 #include <private/qobject_p.h>
 
 #include <private/qv4value_inl_p.h>
+#include <private/qv4persistent_p.h>
 
 QT_BEGIN_NAMESPACE