diff options
Diffstat (limited to 'src/declarative/qml/qdeclarativeengine.cpp')
-rw-r--r-- | src/declarative/qml/qdeclarativeengine.cpp | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/declarative/qml/qdeclarativeengine.cpp b/src/declarative/qml/qdeclarativeengine.cpp index bbf2b6be..b38a4991 100644 --- a/src/declarative/qml/qdeclarativeengine.cpp +++ b/src/declarative/qml/qdeclarativeengine.cpp @@ -188,13 +188,16 @@ void QDeclarativeEnginePrivate::defineModule() qmlRegisterType<QObject>("QtQuick",1,0,"QtObject"); qmlRegisterType<QDeclarativeWorkerScript>("QtQuick",1,0,"WorkerScript"); + qmlRegisterType<QDeclarativeBinding>(); +} + +void QDeclarativeEnginePrivate::defineModuleCompat() +{ #ifndef QT_NO_IMPORT_QT47_QML qmlRegisterType<QDeclarativeComponent>("Qt",4,7,"Component"); qmlRegisterType<QObject>("Qt",4,7,"QtObject"); qmlRegisterType<QDeclarativeWorkerScript>("Qt",4,7,"WorkerScript"); #endif - - qmlRegisterType<QDeclarativeBinding>(); } /*! @@ -356,10 +359,10 @@ QDeclarativeEnginePrivate::QDeclarativeEnginePrivate(QDeclarativeEngine *e) { if (!qt_QmlQtModule_registered) { qt_QmlQtModule_registered = true; - QDeclarativeItemModule::defineModule(); - QDeclarativeUtilModule::defineModule(); QDeclarativeEnginePrivate::defineModule(); + QDeclarativeItemModule::defineModule(); QDeclarativeValueTypeFactory::registerValueTypes(); + QDeclarativeUtilModule::defineModule(); } globalClass = new QDeclarativeGlobalScriptClass(&scriptEngine); } |