diff options
| author | Warwick Allison <warwick.allison@nokia.com> | 2010-02-25 01:56:59 (GMT) |
|---|---|---|
| committer | Warwick Allison <warwick.allison@nokia.com> | 2010-02-25 01:56:59 (GMT) |
| commit | 43b1f81bc359a2c9d5c3d26f5110319803ef31c2 (patch) | |
| tree | e7e5abfad71174c2b5a68eb3d67f77602946b42f /src/plugins | |
| parent | d9e0fad176e277d84af4d80c916becabdf01d969 (diff) | |
| download | Qt-43b1f81bc359a2c9d5c3d26f5110319803ef31c2.zip Qt-43b1f81bc359a2c9d5c3d26f5110319803ef31c2.tar.gz Qt-43b1f81bc359a2c9d5c3d26f5110319803ef31c2.tar.bz2 | |
Make QML_REGISTER...TYPE functions unnecessary (still exist for now).
Fix multimedia plugin.
Diffstat (limited to 'src/plugins')
| -rw-r--r-- | src/plugins/qdeclarativemodules/multimedia/multimedia.cpp | 4 | ||||
| -rw-r--r-- | src/plugins/qdeclarativemodules/widgets/widgets.cpp | 12 |
2 files changed, 8 insertions, 8 deletions
diff --git a/src/plugins/qdeclarativemodules/multimedia/multimedia.cpp b/src/plugins/qdeclarativemodules/multimedia/multimedia.cpp index e27dd8d..1158c88 100644 --- a/src/plugins/qdeclarativemodules/multimedia/multimedia.cpp +++ b/src/plugins/qdeclarativemodules/multimedia/multimedia.cpp @@ -41,7 +41,7 @@ #include <QtDeclarative/qdeclarativeextensionplugin.h> #include <QtDeclarative/qdeclarative.h> -#include <QtMultimedia/multimediadeclarative.h> +#include <QtMultimedia/qdeclarative.h> QT_BEGIN_NAMESPACE @@ -51,7 +51,7 @@ class QMultimediaQmlModule : public QDeclarativeExtensionPlugin public: virtual void initialize(QDeclarativeEngine *engine, const char *uri) { - QtMultimedia::qRegisterDeclarativeElements(engine, uri); + QtMultimedia::qRegisterQmlElements(engine, uri); } }; diff --git a/src/plugins/qdeclarativemodules/widgets/widgets.cpp b/src/plugins/qdeclarativemodules/widgets/widgets.cpp index dc45428..7229d88 100644 --- a/src/plugins/qdeclarativemodules/widgets/widgets.cpp +++ b/src/plugins/qdeclarativemodules/widgets/widgets.cpp @@ -127,12 +127,12 @@ public: QML_REGISTER_INTERFACE(QGraphicsLayoutItem); QML_REGISTER_INTERFACE(QGraphicsLayout); - qmlRegisterType<QGraphicsLinearLayoutStretchItemObject>(uri,4,6,"QGraphicsLinearLayoutStretchItem","QGraphicsLinearLayoutStretchItemObject"); - qmlRegisterType<QGraphicsLinearLayoutObject>(uri,4,6,"QGraphicsLinearLayout","QGraphicsLinearLayoutObject"); - qmlRegisterType<QGraphicsGridLayoutObject>(uri,4,6,"QGraphicsGridLayout","QGraphicsGridLayoutObject"); - qmlRegisterExtendedType<QGraphicsView, QGraphicsViewDeclarativeUI>(uri,4,6,"QGraphicsView","QGraphicsView"); - qmlRegisterExtendedType<QGraphicsScene,QGraphicsSceneDeclarativeUI>(uri,4,6,"QGraphicsScene","QGraphicsScene"); - qmlRegisterExtendedType<QGraphicsWidget,QGraphicsWidgetDeclarativeUI>(uri,4,6,"QGraphicsWidget","QGraphicsWidget"); + qmlRegisterType<QGraphicsLinearLayoutStretchItemObject>(uri,4,6,"QGraphicsLinearLayoutStretchItem"); + qmlRegisterType<QGraphicsLinearLayoutObject>(uri,4,6,"QGraphicsLinearLayout"); + qmlRegisterType<QGraphicsGridLayoutObject>(uri,4,6,"QGraphicsGridLayout"); + qmlRegisterExtendedType<QGraphicsView, QGraphicsViewDeclarativeUI>(uri,4,6,"QGraphicsView"); + qmlRegisterExtendedType<QGraphicsScene,QGraphicsSceneDeclarativeUI>(uri,4,6,"QGraphicsScene"); + qmlRegisterExtendedType<QGraphicsWidget,QGraphicsWidgetDeclarativeUI>(uri,4,6,"QGraphicsWidget"); QML_REGISTER_INTERFACE(QGraphicsItem); } }; |