Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui

11 files changed, 17 insertions, 17 deletions

diff --git a/src/declarative/extra/qfxanimatedimageitem.cpp b/src/declarative/extra/qfxanimatedimageitem.cpp
index 4c74f6f..44a1d67 100644
--- a/src/declarative/extra/qfxanimatedimageitem.cpp
+++ b/src/declarative/extra/qfxanimatedimageitem.cpp
@@ -77,7 +77,7 @@ Item {
     \endqml
     \endtable
 */
-QML_DEFINE_TYPE(QFxAnimatedImageItem, AnimatedImage)
+QML_DEFINE_TYPE(Qt,4,6,(QT_VERSION&0x00ff00)>>8,AnimatedImage,QFxAnimatedImageItem)
 
 QFxAnimatedImageItem::QFxAnimatedImageItem(QFxItem *parent)
     : QFxImage(*(new QFxAnimatedImageItemPrivate), parent)
diff --git a/src/declarative/extra/qfxflowview.cpp b/src/declarative/extra/qfxflowview.cpp
index e1200c7..1757c5a 100644
--- a/src/declarative/extra/qfxflowview.cpp
+++ b/src/declarative/extra/qfxflowview.cpp
@@ -373,7 +373,7 @@ void QFxFlowView::mouseMoveEvent(QGraphicsSceneMouseEvent *event)
     }
 }
 
-QML_DEFINE_TYPE(QFxFlowView,FlowView);
+QML_DEFINE_TYPE(Qt, 4,6, (QT_VERSION&0x00ff00)>>8, FlowView, QFxFlowView);
 
 QT_END_NAMESPACE
 
diff --git a/src/declarative/extra/qfxintegermodel.cpp b/src/declarative/extra/qfxintegermodel.cpp
index 437073e..3cd46d7 100644
--- a/src/declarative/extra/qfxintegermodel.cpp
+++ b/src/declarative/extra/qfxintegermodel.cpp
@@ -43,7 +43,7 @@
 
 QT_BEGIN_NAMESPACE
 
-QML_DEFINE_TYPE(QFxIntegerModel, IntegerModel)
+QML_DEFINE_TYPE(Qt,4,6,(QT_VERSION&0x00ff00)>>8,IntegerModel,QFxIntegerModel)
 
 class QFxIntegerModelPrivate
 {
diff --git a/src/declarative/extra/qfxparticles.cpp b/src/declarative/extra/qfxparticles.cpp
index a7b01dd..13c14b0 100644
--- a/src/declarative/extra/qfxparticles.cpp
+++ b/src/declarative/extra/qfxparticles.cpp
@@ -102,7 +102,7 @@ public:
 
 //---------------------------------------------------------------------------
 
-QML_DEFINE_TYPE(QFxParticleMotion,ParticleMotion)
+QML_DEFINE_TYPE(Qt,4,6,(QT_VERSION&0x00ff00)>>8,ParticleMotion,QFxParticleMotion)
 
 /*!
     \class QFxParticleMotion
@@ -162,7 +162,7 @@ void QFxParticleMotion::destroy(QFxParticle &particle)
     \brief The QFxParticleMotionLinear class moves the particles linearly.
 */
 
-QML_DEFINE_TYPE(QFxParticleMotionLinear,ParticleMotionLinear)
+QML_DEFINE_TYPE(Qt,4,6,(QT_VERSION&0x00ff00)>>8,ParticleMotionLinear,QFxParticleMotionLinear)
 
 void QFxParticleMotionLinear::advance(QFxParticle &p, int interval)
 {
@@ -184,7 +184,7 @@ void QFxParticleMotionLinear::advance(QFxParticle &p, int interval)
     \brief The QFxParticleMotionGravity class moves the particles towards a point.
 */
 
-QML_DEFINE_TYPE(QFxParticleMotionGravity,ParticleMotionGravity)
+QML_DEFINE_TYPE(Qt,4,6,(QT_VERSION&0x00ff00)>>8,ParticleMotionGravity,QFxParticleMotionGravity)
 
 /*!
     \qmlproperty int ParticleMotionGravity::xattractor
@@ -286,7 +286,7 @@ Rect {
     This property holds how quickly the paricles will move from side to side.
 */
 
-QML_DEFINE_TYPE(QFxParticleMotionWander,ParticleMotionWander)
+QML_DEFINE_TYPE(Qt,4,6,(QT_VERSION&0x00ff00)>>8,ParticleMotionWander,QFxParticleMotionWander)
 
 void QFxParticleMotionWander::advance(QFxParticle &p, int interval)
 {
@@ -528,7 +528,7 @@ void QFxParticlesPrivate::updateOpacity(QFxParticle &p, int age)
     }
 }
 
-QML_DEFINE_TYPE(QFxParticles,Particles)
+QML_DEFINE_TYPE(Qt,4,6,(QT_VERSION&0x00ff00)>>8,Particles,QFxParticles)
 
 /*!
     \qmlclass Particles
diff --git a/src/declarative/extra/qmlbehaviour.cpp b/src/declarative/extra/qmlbehaviour.cpp
index 92a85b0..0e70bdc 100644
--- a/src/declarative/extra/qmlbehaviour.cpp
+++ b/src/declarative/extra/qmlbehaviour.cpp
@@ -48,7 +48,7 @@
 
 QT_BEGIN_NAMESPACE
 
-QML_DEFINE_TYPE(QmlBehaviour,Behavior)
+QML_DEFINE_TYPE(Qt,4,6,(QT_VERSION&0x00ff00)>>8,Behavior,QmlBehaviour)
 
 class QmlBehaviourData : public QObject
 {
diff --git a/src/declarative/extra/qmldatetimeformatter.cpp b/src/declarative/extra/qmldatetimeformatter.cpp
index 158431a..91ebce6 100644
--- a/src/declarative/extra/qmldatetimeformatter.cpp
+++ b/src/declarative/extra/qmldatetimeformatter.cpp
@@ -365,6 +365,6 @@ void QmlDateTimeFormatter::classComplete()
     d->updateText();
 }
 
-QML_DEFINE_TYPE(QmlDateTimeFormatter, DateTimeFormatter)
+QML_DEFINE_TYPE(Qt,4,6,(QT_VERSION&0x00ff00)>>8,DateTimeFormatter,QmlDateTimeFormatter)
 
 QT_END_NAMESPACE
diff --git a/src/declarative/extra/qmlfolderlistmodel.cpp b/src/declarative/extra/qmlfolderlistmodel.cpp
index 1c05a6d..e632f72 100644
--- a/src/declarative/extra/qmlfolderlistmodel.cpp
+++ b/src/declarative/extra/qmlfolderlistmodel.cpp
@@ -318,7 +318,7 @@ void QmlFolderListModel::dataChanged(const QModelIndex &start, const QModelIndex
         emit itemsChanged(start.row(), end.row() - start.row() + 1, roles());
 }
 
-QML_DEFINE_TYPE(QmlFolderListModel,FolderListModel)
+QML_DEFINE_TYPE(Qt,4,6,(QT_VERSION&0x00ff00)>>8,FolderListModel,QmlFolderListModel)
 
 QT_END_NAMESPACE
 
diff --git a/src/declarative/extra/qmlnumberformatter.cpp b/src/declarative/extra/qmlnumberformatter.cpp
index b24f2d8..1818c36 100644
--- a/src/declarative/extra/qmlnumberformatter.cpp
+++ b/src/declarative/extra/qmlnumberformatter.cpp
@@ -210,6 +210,6 @@ void QmlNumberFormatter::classComplete()
     d->classComplete = true;
     d->updateText();
 }
-QML_DEFINE_TYPE(QmlNumberFormatter, NumberFormatter);
+QML_DEFINE_TYPE(Qt,4,6,(QT_VERSION&0x00ff00)>>8,NumberFormatter,QmlNumberFormatter);
 
 QT_END_NAMESPACE
diff --git a/src/declarative/extra/qmlsqlconnection.cpp b/src/declarative/extra/qmlsqlconnection.cpp
index 5cf572b..3384ccd 100644
--- a/src/declarative/extra/qmlsqlconnection.cpp
+++ b/src/declarative/extra/qmlsqlconnection.cpp
@@ -51,7 +51,7 @@
 
 QT_BEGIN_NAMESPACE
 
-QML_DEFINE_TYPE(QmlSqlConnection, SqlConnection)
+QML_DEFINE_TYPE(Qt,4,6,(QT_VERSION&0x00ff00)>>8,SqlConnection,QmlSqlConnection)
 
 class QmlSqlConnectionPrivate: public QObjectPrivate
 {
diff --git a/src/declarative/extra/qmlsqlquery.cpp b/src/declarative/extra/qmlsqlquery.cpp
index d9d9760..4894de7 100644
--- a/src/declarative/extra/qmlsqlquery.cpp
+++ b/src/declarative/extra/qmlsqlquery.cpp
@@ -56,8 +56,8 @@
 
 QT_BEGIN_NAMESPACE
 
-QML_DEFINE_TYPE(QmlSqlBind, SqlBind)
-QML_DEFINE_TYPE(QmlSqlQuery, SqlQuery)
+QML_DEFINE_TYPE(Qt,4,6,(QT_VERSION&0x00ff00)>>8,SqlBind,QmlSqlBind)
+QML_DEFINE_TYPE(Qt,4,6,(QT_VERSION&0x00ff00)>>8,SqlQuery,QmlSqlQuery)
 
 class QmlSqlBindPrivate : public QObjectPrivate
 {
diff --git a/src/declarative/extra/qmlxmllistmodel.cpp b/src/declarative/extra/qmlxmllistmodel.cpp
index 1321f41..077e9a9 100644
--- a/src/declarative/extra/qmlxmllistmodel.cpp
+++ b/src/declarative/extra/qmlxmllistmodel.cpp
@@ -58,8 +58,8 @@
 
 QT_BEGIN_NAMESPACE
 
-QML_DEFINE_TYPE(XmlListModelRole, XmlRole)
-QML_DEFINE_TYPE(QmlXmlListModel, XmlListModel)
+QML_DEFINE_TYPE(Qt,4,6,(QT_VERSION&0x00ff00)>>8,XmlRole,XmlListModelRole)
+QML_DEFINE_TYPE(Qt,4,6,(QT_VERSION&0x00ff00)>>8,XmlListModel,QmlXmlListModel)
 
 class QmlXmlListModelPrivate;
 struct QmlXmlRoleList : public QmlConcreteList<XmlListModelRole *>