Allow span of versions to be defined, not just one.

Span is from version where introduced (all 4.6) to current QT_VERSION.

2 files changed, 6 insertions, 6 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)
diff --git a/src/declarative/widgets/graphicswidgets.cpp b/src/declarative/widgets/graphicswidgets.cpp
index 782ffba..4c6dcf9 100644
--- a/src/declarative/widgets/graphicswidgets.cpp
+++ b/src/declarative/widgets/graphicswidgets.cpp
@@ -59,7 +59,7 @@ public:
         static_cast<QGraphicsView *>(parent())->setScene(scene);
     }
 };
-QML_DEFINE_EXTENDED_TYPE(Qt,4.6,QGraphicsView,QGraphicsView,QGraphicsViewDeclarativeUI)
+QML_DEFINE_EXTENDED_TYPE(Qt,4,6,(QT_VERSION&0x00ff00)>>8,QGraphicsView,QGraphicsView,QGraphicsViewDeclarativeUI)
 
 class QGraphicsSceneDeclarativeUI : public QObject
 {
@@ -111,7 +111,7 @@ private:
     };
     Children _children;
 };
-QML_DEFINE_EXTENDED_TYPE(Qt,4.6,QGraphicsScene,QGraphicsScene,QGraphicsSceneDeclarativeUI)
+QML_DEFINE_EXTENDED_TYPE(Qt,4,6,(QT_VERSION&0x00ff00)>>8,QGraphicsScene,QGraphicsScene,QGraphicsSceneDeclarativeUI)
 
 class QGraphicsWidgetDeclarativeUI : public QObject
 {
@@ -164,7 +164,7 @@ private:
     QmlConcreteList<QObject *> _data;
 };
 
-QML_DEFINE_EXTENDED_TYPE(Qt,4.6,QGraphicsWidget,QGraphicsWidget,QGraphicsWidgetDeclarativeUI)
+QML_DEFINE_EXTENDED_TYPE(Qt,4,6,(QT_VERSION&0x00ff00)>>8,QGraphicsWidget,QGraphicsWidget,QGraphicsWidgetDeclarativeUI)
 
 QML_DEFINE_INTERFACE(QGraphicsItem)