diff options
| author | Alan Alpert <alan.alpert@nokia.com> | 2009-11-05 05:01:16 (GMT) |
|---|---|---|
| committer | Alan Alpert <alan.alpert@nokia.com> | 2009-11-05 05:01:16 (GMT) |
| commit | 085dd75830357b359abf53b7d37c049cdd17977c (patch) | |
| tree | 67795686c5afdeac7d1eebde5a66dfa330353283 /src/declarative/widgets/graphicswidgets.cpp | |
| parent | aa6f6174374e0abfe94f37ccefce2d0e2b5fe13e (diff) | |
| parent | e4e3b8f336b6c7d0dd52d4b8af96fee1dc628783 (diff) | |
| download | Qt-085dd75830357b359abf53b7d37c049cdd17977c.zip Qt-085dd75830357b359abf53b7d37c049cdd17977c.tar.gz Qt-085dd75830357b359abf53b7d37c049cdd17977c.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'src/declarative/widgets/graphicswidgets.cpp')
| -rw-r--r-- | src/declarative/widgets/graphicswidgets.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/declarative/widgets/graphicswidgets.cpp b/src/declarative/widgets/graphicswidgets.cpp index 8f61999..5678520 100644 --- a/src/declarative/widgets/graphicswidgets.cpp +++ b/src/declarative/widgets/graphicswidgets.cpp @@ -162,9 +162,9 @@ private: QmlConcreteList<QObject *> _data; }; -QML_DEFINE_EXTENDED_TYPE(Qt,4,6,(QT_VERSION&0x00ff00)>>8,QGraphicsView,QGraphicsView,QGraphicsViewDeclarativeUI) -QML_DEFINE_EXTENDED_TYPE(Qt,4,6,(QT_VERSION&0x00ff00)>>8,QGraphicsScene,QGraphicsScene,QGraphicsSceneDeclarativeUI) -QML_DEFINE_EXTENDED_TYPE(Qt,4,6,(QT_VERSION&0x00ff00)>>8,QGraphicsWidget,QGraphicsWidget,QGraphicsWidgetDeclarativeUI) +QML_DEFINE_EXTENDED_TYPE(Qt,4,6,QGraphicsView,QGraphicsView,QGraphicsViewDeclarativeUI) +QML_DEFINE_EXTENDED_TYPE(Qt,4,6,QGraphicsScene,QGraphicsScene,QGraphicsSceneDeclarativeUI) +QML_DEFINE_EXTENDED_TYPE(Qt,4,6,QGraphicsWidget,QGraphicsWidget,QGraphicsWidgetDeclarativeUI) QML_DEFINE_INTERFACE(QGraphicsItem) |