summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Jones <martin.jones@nokia.com>2010-01-20 00:09:08 (GMT)
committerMartin Jones <martin.jones@nokia.com>2010-01-20 00:09:08 (GMT)
commita731aa9f32aa8f031832cae323cc76a5308d1af4 (patch)
tree395eb375c825c1add09c98baab39c3ee053698de
parent43d59c9c6efcf9a9dc65549a48969a66a5979367 (diff)
parent22263b31dac2114b434b7c1badab33bbd19df484 (diff)
downloadQt-a731aa9f32aa8f031832cae323cc76a5308d1af4.zip
Qt-a731aa9f32aa8f031832cae323cc76a5308d1af4.tar.gz
Qt-a731aa9f32aa8f031832cae323cc76a5308d1af4.tar.bz2
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
-rw-r--r--src/declarative/graphicsitems/qmlgraphicsanchors.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/declarative/graphicsitems/qmlgraphicsanchors.cpp b/src/declarative/graphicsitems/qmlgraphicsanchors.cpp
index 4948633..93055fc 100644
--- a/src/declarative/graphicsitems/qmlgraphicsanchors.cpp
+++ b/src/declarative/graphicsitems/qmlgraphicsanchors.cpp
@@ -50,7 +50,7 @@
QT_BEGIN_NAMESPACE
-QML_DEFINE_TYPE(Qt,4,6,Anchors,QmlGraphicsAnchors)
+QML_DEFINE_NOCREATE_TYPE(QmlGraphicsAnchors)
//TODO: should we cache relationships, so we don't have to check each time (parent-child or sibling)?
//TODO: support non-parent, non-sibling (need to find lowest common ancestor)