diff options
| author | Warwick Allison <warwick.allison@nokia.com> | 2009-07-23 01:32:46 (GMT) |
|---|---|---|
| committer | Warwick Allison <warwick.allison@nokia.com> | 2009-07-23 01:32:46 (GMT) |
| commit | 6f7b1c9270131d2a55218b14f3ec29cc553c8e2f (patch) | |
| tree | 8161b08aad3e0cad07983707f0e4482cee0a36db /src/declarative/fx/qfxlayouts.cpp | |
| parent | 8987d9c2946d2cc565cec562393ee3627582699f (diff) | |
| download | Qt-6f7b1c9270131d2a55218b14f3ec29cc553c8e2f.zip Qt-6f7b1c9270131d2a55218b14f3ec29cc553c8e2f.tar.gz Qt-6f7b1c9270131d2a55218b14f3ec29cc553c8e2f.tar.bz2 | |
Allow span of versions to be defined, not just one.
Span is from version where introduced (all 4.6) to current QT_VERSION.
Diffstat (limited to 'src/declarative/fx/qfxlayouts.cpp')
| -rw-r--r-- | src/declarative/fx/qfxlayouts.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/declarative/fx/qfxlayouts.cpp b/src/declarative/fx/qfxlayouts.cpp index c098dfc..3e8a64c 100644 --- a/src/declarative/fx/qfxlayouts.cpp +++ b/src/declarative/fx/qfxlayouts.cpp @@ -445,7 +445,7 @@ void QFxBaseLayout::applyRemove(const QList<QPair<QString, QVariant> >& changes, applyTransition(changes,target, remove()); } -QML_DEFINE_TYPE(Qt,4.6,VerticalLayout,QFxVerticalLayout) +QML_DEFINE_TYPE(Qt,4,6,(QT_VERSION&0x00ff00)>>8,VerticalLayout,QFxVerticalLayout) /*! \qmlclass VerticalLayout \brief The VerticalLayout item arranges its children in a vertical layout. @@ -648,7 +648,7 @@ void QFxVerticalLayout::doLayout() setMovingItem(0); } -QML_DEFINE_TYPE(Qt,4.6,HorizontalLayout,QFxHorizontalLayout) +QML_DEFINE_TYPE(Qt,4,6,(QT_VERSION&0x00ff00)>>8,HorizontalLayout,QFxHorizontalLayout) /*! \qmlclass HorizontalLayout \brief The HorizontalLayout item arranges its children in a horizontal layout. @@ -813,7 +813,7 @@ void QFxHorizontalLayout::doLayout() setWidth(hoffset); } -QML_DEFINE_TYPE(Qt,4.6,GridLayout,QFxGridLayout) +QML_DEFINE_TYPE(Qt,4,6,(QT_VERSION&0x00ff00)>>8,GridLayout,QFxGridLayout) /*! \qmlclass GridLayout QFxGridLayout |