diff options
| author | Yann Bodson <yann.bodson@nokia.com> | 2009-11-05 03:57:09 (GMT) |
|---|---|---|
| committer | Yann Bodson <yann.bodson@nokia.com> | 2009-11-05 03:57:09 (GMT) |
| commit | d39ec85b7e5d8702c2888cdad4ccdae72531c199 (patch) | |
| tree | f38aa46e3c0d9c6432d9175d1511f1ac0d4de940 /src/declarative/graphicsitems/qmlgraphicspositioners.cpp | |
| parent | 43163cec2bcf9012944b445b393f6f8a6e895138 (diff) | |
| parent | deca6c1c9885554e4e51ebd6dafdd78a424904e4 (diff) | |
| download | Qt-d39ec85b7e5d8702c2888cdad4ccdae72531c199.zip Qt-d39ec85b7e5d8702c2888cdad4ccdae72531c199.tar.gz Qt-d39ec85b7e5d8702c2888cdad4ccdae72531c199.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'src/declarative/graphicsitems/qmlgraphicspositioners.cpp')
| -rw-r--r-- | src/declarative/graphicsitems/qmlgraphicspositioners.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/declarative/graphicsitems/qmlgraphicspositioners.cpp b/src/declarative/graphicsitems/qmlgraphicspositioners.cpp index f599025..d6f1fb9 100644 --- a/src/declarative/graphicsitems/qmlgraphicspositioners.cpp +++ b/src/declarative/graphicsitems/qmlgraphicspositioners.cpp @@ -331,7 +331,7 @@ void QmlGraphicsBasePositioner::applyRemove(const QList<QPair<QString, QVariant> applyTransition(changes,target, d->removeActions); } -QML_DEFINE_TYPE(Qt,4,6,(QT_VERSION&0x00ff00)>>8,Column,QmlGraphicsColumn) +QML_DEFINE_TYPE(Qt,4,6,Column,QmlGraphicsColumn) /*! \qmlclass Column QmlGraphicsColumn \brief The Column item lines up its children vertically. @@ -522,7 +522,7 @@ void QmlGraphicsColumn::doPositioning() } } -QML_DEFINE_TYPE(Qt,4,6,(QT_VERSION&0x00ff00)>>8,Row,QmlGraphicsRow) +QML_DEFINE_TYPE(Qt,4,6,Row,QmlGraphicsRow) /*! \qmlclass Row QmlGraphicsRow \brief The Row item lines up its children horizontally. @@ -678,7 +678,7 @@ void QmlGraphicsRow::doPositioning() } } -QML_DEFINE_TYPE(Qt,4,6,(QT_VERSION&0x00ff00)>>8,Grid,QmlGraphicsGrid) +QML_DEFINE_TYPE(Qt,4,6,Grid,QmlGraphicsGrid) /*! \qmlclass Grid QmlGraphicsGrid |