summaryrefslogtreecommitdiffstats
path: root/src/declarative/graphicsitems/qmlgraphicspath.cpp
diff options
context:
space:
mode:
authorAlan Alpert <alan.alpert@nokia.com>2009-11-05 05:01:16 (GMT)
committerAlan Alpert <alan.alpert@nokia.com>2009-11-05 05:01:16 (GMT)
commit085dd75830357b359abf53b7d37c049cdd17977c (patch)
tree67795686c5afdeac7d1eebde5a66dfa330353283 /src/declarative/graphicsitems/qmlgraphicspath.cpp
parentaa6f6174374e0abfe94f37ccefce2d0e2b5fe13e (diff)
parente4e3b8f336b6c7d0dd52d4b8af96fee1dc628783 (diff)
downloadQt-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/graphicsitems/qmlgraphicspath.cpp')
-rw-r--r--src/declarative/graphicsitems/qmlgraphicspath.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/declarative/graphicsitems/qmlgraphicspath.cpp b/src/declarative/graphicsitems/qmlgraphicspath.cpp
index ed0dfaa..a8f571e 100644
--- a/src/declarative/graphicsitems/qmlgraphicspath.cpp
+++ b/src/declarative/graphicsitems/qmlgraphicspath.cpp
@@ -47,14 +47,14 @@
QT_BEGIN_NAMESPACE
-QML_DEFINE_TYPE(Qt,4,6,(QT_VERSION&0x00ff00)>>8,Path,QmlGraphicsPath)
+QML_DEFINE_TYPE(Qt,4,6,Path,QmlGraphicsPath)
QML_DEFINE_NOCREATE_TYPE(QmlGraphicsPathElement)
QML_DEFINE_NOCREATE_TYPE(QmlGraphicsCurve)
-QML_DEFINE_TYPE(Qt,4,6,(QT_VERSION&0x00ff00)>>8,PathAttribute,QmlGraphicsPathAttribute)
-QML_DEFINE_TYPE(Qt,4,6,(QT_VERSION&0x00ff00)>>8,PathPercent,QmlGraphicsPathPercent)
-QML_DEFINE_TYPE(Qt,4,6,(QT_VERSION&0x00ff00)>>8,PathLine,QmlGraphicsPathLine)
-QML_DEFINE_TYPE(Qt,4,6,(QT_VERSION&0x00ff00)>>8,PathQuad,QmlGraphicsPathQuad)
-QML_DEFINE_TYPE(Qt,4,6,(QT_VERSION&0x00ff00)>>8,PathCubic,QmlGraphicsPathCubic)
+QML_DEFINE_TYPE(Qt,4,6,PathAttribute,QmlGraphicsPathAttribute)
+QML_DEFINE_TYPE(Qt,4,6,PathPercent,QmlGraphicsPathPercent)
+QML_DEFINE_TYPE(Qt,4,6,PathLine,QmlGraphicsPathLine)
+QML_DEFINE_TYPE(Qt,4,6,PathQuad,QmlGraphicsPathQuad)
+QML_DEFINE_TYPE(Qt,4,6,PathCubic,QmlGraphicsPathCubic)
/*!
\qmlclass PathElement QmlGraphicsPathElement