diff options
Diffstat (limited to 'src/quick/items/qquickloader_p_p.h')
| -rw-r--r-- | src/quick/items/qquickloader_p_p.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/quick/items/qquickloader_p_p.h b/src/quick/items/qquickloader_p_p.h index b7d2d3142b..a24bfb892a 100644 --- a/src/quick/items/qquickloader_p_p.h +++ b/src/quick/items/qquickloader_p_p.h @@ -58,7 +58,7 @@ #include "qquickitemchangelistener_p.h" #include <qqmlincubator.h> -#include <private/qv8_p.h> +#include <private/qv4value_p.h> QT_BEGIN_NAMESPACE @@ -96,8 +96,8 @@ public: void incubatorStateChanged(QQmlIncubator::Status status); void setInitialState(QObject *o); void disposeInitialPropertyValues(); - QUrl resolveSourceUrl(QQmlV8Function *args); - v8::Handle<v8::Object> extractInitialPropertyValues(QQmlV8Function *args, QObject *loader, bool *error); + QUrl resolveSourceUrl(QQmlV4Function *args); + QV4::Value extractInitialPropertyValues(QQmlV4Function *args, QObject *loader, bool *error); virtual qreal getImplicitWidth() const; virtual qreal getImplicitHeight() const; @@ -108,8 +108,8 @@ public: QQmlComponent *component; QQmlContext *itemContext; QQuickLoaderIncubator *incubator; - v8::Persistent<v8::Object> initialPropertyValues; - v8::Persistent<v8::Object> qmlGlobalForIpv; + QV4::PersistentValue initialPropertyValues; + QV4::PersistentValue qmlGlobalForIpv; bool updatingSize: 1; bool active : 1; bool loadingFromSource : 1; |