diff options
| author | mae <qt-info@nokia.com> | 2010-03-10 17:29:44 (GMT) |
|---|---|---|
| committer | mae <qt-info@nokia.com> | 2010-03-10 17:31:33 (GMT) |
| commit | e5922ab126f3532483b18720ce893d6be826d50e (patch) | |
| tree | 1d2913660c64847b8bade9ab89e159a8bdc0de63 /src/declarative/qml/qdeclarativeengine.cpp | |
| parent | b8f9d43dc87054f4f0322a2d124beeb7aaf8bb8f (diff) | |
| download | Qt-e5922ab126f3532483b18720ce893d6be826d50e.zip Qt-e5922ab126f3532483b18720ce893d6be826d50e.tar.gz Qt-e5922ab126f3532483b18720ce893d6be826d50e.tar.bz2 | |
Document - and use - the qmlRegisterXXX template functions
This commit removes the obsolete QML_REGISTER_TYPE macros.
Diffstat (limited to 'src/declarative/qml/qdeclarativeengine.cpp')
| -rw-r--r-- | src/declarative/qml/qdeclarativeengine.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/declarative/qml/qdeclarativeengine.cpp b/src/declarative/qml/qdeclarativeengine.cpp index 62fe5b5..41c0f5c 100644 --- a/src/declarative/qml/qdeclarativeengine.cpp +++ b/src/declarative/qml/qdeclarativeengine.cpp @@ -146,12 +146,12 @@ static bool qt_QmlQtModule_registered = false; void QDeclarativeEnginePrivate::defineModule() { - QML_REGISTER_TYPE(Qt,4,6,Component,QDeclarativeComponent); - QML_REGISTER_TYPE(Qt,4,6,QtObject,QObject); - QML_REGISTER_TYPE(Qt,4,6,WorkerScript,QDeclarativeWorkerScript); - QML_REGISTER_TYPE(Qt,4,6,WorkerListModel,QDeclarativeWorkerListModel); + qmlRegisterType<QDeclarativeComponent>("Qt",4,6,"Component"); + qmlRegisterType<QObject>("Qt",4,6,"QtObject"); + qmlRegisterType<QDeclarativeWorkerScript>("Qt",4,6,"WorkerScript"); + qmlRegisterType<QDeclarativeWorkerListModel>("Qt",4,6,"WorkerListModel"); - QML_REGISTER_NOCREATE_TYPE(QDeclarativeBinding); + qmlRegisterType<QDeclarativeBinding>(); } QDeclarativeEnginePrivate::QDeclarativeEnginePrivate(QDeclarativeEngine *e) |