diff options
| author | Gunnar Sletta <gunnar.sletta@nokia.com> | 2011-08-11 16:03:12 +0200 |
|---|---|---|
| committer | Gunnar Sletta <gunnar.sletta@nokia.com> | 2011-08-11 16:03:12 +0200 |
| commit | f9949f501890a7f8289fcbda85d3a4085bdbb21a (patch) | |
| tree | 759e57bb3ed156e46a98c3a4223951c3edc55d43 /src/declarative/qml/qdeclarativeengine.cpp | |
| parent | 1ddef09c351f2899b1662ddd1de190c0d0a8b7bf (diff) | |
| parent | 3e0c19d5ba0e4826c3f036c3172d8ea0e30530a6 (diff) | |
Merge branch 'master' into refactor
Conflicts:
src/declarative/declarative.pro
src/imports/gestures/gestures.pro
src/imports/inputcontext/inputcontext.pro
src/qtquick1/graphicsitems/qdeclarativeitem.cpp
src/qtquick1/qtquick1.pro
Change-Id: I782be7090d8b6da9c890bc8e778722da93da8037
Diffstat (limited to 'src/declarative/qml/qdeclarativeengine.cpp')
| -rw-r--r-- | src/declarative/qml/qdeclarativeengine.cpp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/declarative/qml/qdeclarativeengine.cpp b/src/declarative/qml/qdeclarativeengine.cpp index 8fdc7b1c22..4781264bde 100644 --- a/src/declarative/qml/qdeclarativeengine.cpp +++ b/src/declarative/qml/qdeclarativeengine.cpp @@ -441,7 +441,7 @@ void QDeclarativeEnginePrivate::init() Q_Q(QDeclarativeEngine); qRegisterMetaType<QVariant>("QVariant"); qRegisterMetaType<QDeclarativeScriptString>("QDeclarativeScriptString"); - qRegisterMetaType<QScriptValue>("QScriptValue"); + qRegisterMetaType<QJSValue>("QJSValue"); qRegisterMetaType<QDeclarativeComponent::Status>("QDeclarativeComponent::Status"); qRegisterMetaType<QList<QObject*> >("QList<QObject*>"); qRegisterMetaType<QList<int> >("QList<int>"); @@ -449,8 +449,7 @@ void QDeclarativeEnginePrivate::init() QDeclarativeData::init(); - // Init V8 data - v8engine.init(q); + v8engine()->setEngine(q); rootContext = new QDeclarativeContext(q,true); @@ -505,7 +504,7 @@ QDeclarativeWorkerScriptEngine *QDeclarativeEnginePrivate::getWorkerScriptEngine Create a new QDeclarativeEngine with the given \a parent. */ QDeclarativeEngine::QDeclarativeEngine(QObject *parent) -: QObject(*new QDeclarativeEnginePrivate(this), parent) +: QJSEngine(*new QDeclarativeEnginePrivate(this), parent) { Q_D(QDeclarativeEngine); d->init(); @@ -1386,13 +1385,13 @@ bool QDeclarativeEngine::importPlugin(const QString &filePath, const QString &ur void QDeclarativeEngine::setOfflineStoragePath(const QString& dir) { Q_D(QDeclarativeEngine); - qt_qmlsqldatabase_setOfflineStoragePath(&d->v8engine, dir); + qt_qmlsqldatabase_setOfflineStoragePath(d->v8engine(), dir); } QString QDeclarativeEngine::offlineStoragePath() const { Q_D(const QDeclarativeEngine); - return qt_qmlsqldatabase_getOfflineStoragePath(&d->v8engine); + return qt_qmlsqldatabase_getOfflineStoragePath(d->v8engine()); } static void voidptr_destructor(void *v) |