summaryrefslogtreecommitdiffstats
path: root/src/declarative/widgets/graphicslayouts.cpp
diff options
context:
space:
mode:
authorWarwick Allison <warwick.allison@nokia.com>2009-07-23 01:32:46 (GMT)
committerWarwick Allison <warwick.allison@nokia.com>2009-07-23 01:32:46 (GMT)
commit6f7b1c9270131d2a55218b14f3ec29cc553c8e2f (patch)
tree8161b08aad3e0cad07983707f0e4482cee0a36db /src/declarative/widgets/graphicslayouts.cpp
parent8987d9c2946d2cc565cec562393ee3627582699f (diff)
downloadQt-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/widgets/graphicslayouts.cpp')
-rw-r--r--src/declarative/widgets/graphicslayouts.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/declarative/widgets/graphicslayouts.cpp b/src/declarative/widgets/graphicslayouts.cpp
index 217ecf7..35f1e35 100644
--- a/src/declarative/widgets/graphicslayouts.cpp
+++ b/src/declarative/widgets/graphicslayouts.cpp
@@ -89,7 +89,7 @@ private:
Qt::Alignment _alignment;
};
-QML_DEFINE_TYPE(Qt,4.6,QGraphicsLinearLayoutStretchItem,QGraphicsLinearLayoutStretchItemObject)
+QML_DEFINE_TYPE(Qt,4,6,(QT_VERSION&0x00ff00)>>8,QGraphicsLinearLayoutStretchItem,QGraphicsLinearLayoutStretchItemObject)
QGraphicsLinearLayoutStretchItemObject::QGraphicsLinearLayoutStretchItemObject(QObject *parent)
: QObject(parent)
@@ -103,7 +103,7 @@ QSizeF QGraphicsLinearLayoutStretchItemObject::sizeHint(Qt::SizeHint which, cons
return QSizeF();
}
-QML_DEFINE_TYPE(Qt,4.6,QGraphicsLinearLayout,QGraphicsLinearLayoutObject)
+QML_DEFINE_TYPE(Qt,4,6,(QT_VERSION&0x00ff00)>>8,QGraphicsLinearLayout,QGraphicsLinearLayoutObject)
QGraphicsLinearLayoutObject::QGraphicsLinearLayoutObject(QObject *parent)
: QObject(parent), _children(this)
@@ -246,7 +246,7 @@ private:
Qt::Alignment _alignment;
};
-QML_DEFINE_TYPE(Qt,4.6,QGraphicsGridLayout,QGraphicsGridLayoutObject)
+QML_DEFINE_TYPE(Qt,4,6,(QT_VERSION&0x00ff00)>>8,QGraphicsGridLayout,QGraphicsGridLayoutObject)
QGraphicsGridLayoutObject::QGraphicsGridLayoutObject(QObject *parent)