diff options
Diffstat (limited to 'src')
58 files changed, 124 insertions, 113 deletions
diff --git a/src/declarative/extra/qfxanimatedimageitem.cpp b/src/declarative/extra/qfxanimatedimageitem.cpp index 4c74f6f..c4b949a 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,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 1676512..0cfb7a9 100644 --- a/src/declarative/extra/qfxflowview.cpp +++ b/src/declarative/extra/qfxflowview.cpp @@ -1,3 +1,5 @@ +import Qt 4.6 + /**************************************************************************** ** ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). diff --git a/src/declarative/extra/qfxintegermodel.cpp b/src/declarative/extra/qfxintegermodel.cpp index 437073e..f536fee 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,IntegerModel,QFxIntegerModel) class QFxIntegerModelPrivate { diff --git a/src/declarative/extra/qfxparticles.cpp b/src/declarative/extra/qfxparticles.cpp index a7b01dd..9f7319f 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,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,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,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,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,Particles,QFxParticles) /*! \qmlclass Particles diff --git a/src/declarative/extra/qmlbehaviour.cpp b/src/declarative/extra/qmlbehaviour.cpp index 92a85b0..7f82b1a 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,Behavior,QmlBehaviour) class QmlBehaviourData : public QObject { diff --git a/src/declarative/extra/qmldatetimeformatter.cpp b/src/declarative/extra/qmldatetimeformatter.cpp index 158431a..08f73cf 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,DateTimeFormatter,QmlDateTimeFormatter) QT_END_NAMESPACE diff --git a/src/declarative/extra/qmlfolderlistmodel.cpp b/src/declarative/extra/qmlfolderlistmodel.cpp index 4a71109..4f36bbf 100644 --- a/src/declarative/extra/qmlfolderlistmodel.cpp +++ b/src/declarative/extra/qmlfolderlistmodel.cpp @@ -207,7 +207,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,FolderListModel,QmlFolderListModel) QT_END_NAMESPACE diff --git a/src/declarative/extra/qmlnumberformatter.cpp b/src/declarative/extra/qmlnumberformatter.cpp index b24f2d8..bcb9eed 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,NumberFormatter,QmlNumberFormatter); QT_END_NAMESPACE diff --git a/src/declarative/extra/qmlsqlconnection.cpp b/src/declarative/extra/qmlsqlconnection.cpp index 5cf572b..55af930 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,SqlConnection,QmlSqlConnection) class QmlSqlConnectionPrivate: public QObjectPrivate { diff --git a/src/declarative/extra/qmlsqlquery.cpp b/src/declarative/extra/qmlsqlquery.cpp index d9d9760..fb49bd5 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,SqlBind,QmlSqlBind) +QML_DEFINE_TYPE(Qt,4.6,SqlQuery,QmlSqlQuery) class QmlSqlBindPrivate : public QObjectPrivate { diff --git a/src/declarative/extra/qmlxmllistmodel.cpp b/src/declarative/extra/qmlxmllistmodel.cpp index 91ad538..f142b7c 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,XmlRole,XmlListModelRole) +QML_DEFINE_TYPE(Qt,4.6,XmlListModel,QmlXmlListModel) class QmlXmlListModelPrivate; struct QmlXmlRoleList : public QmlConcreteList<XmlListModelRole *> diff --git a/src/declarative/fx/qfxanchors.cpp b/src/declarative/fx/qfxanchors.cpp index 350cbc0..700bc01 100644 --- a/src/declarative/fx/qfxanchors.cpp +++ b/src/declarative/fx/qfxanchors.cpp @@ -47,7 +47,7 @@ QT_BEGIN_NAMESPACE -QML_DEFINE_TYPE(QFxAnchors,Anchors) +QML_DEFINE_TYPE(Qt,4.6,Anchors,QFxAnchors) //TODO: should we cache relationships, so we don't have to check each time (parent-child or sibling)? //TODO: support non-parent, non-sibling (need to find lowest common ancestor) diff --git a/src/declarative/fx/qfxcomponentinstance.cpp b/src/declarative/fx/qfxcomponentinstance.cpp index 6cf8e74..2876459 100644 --- a/src/declarative/fx/qfxcomponentinstance.cpp +++ b/src/declarative/fx/qfxcomponentinstance.cpp @@ -46,7 +46,7 @@ QT_BEGIN_NAMESPACE -QML_DEFINE_TYPE(QFxComponentInstance,ComponentInstance) +QML_DEFINE_TYPE(Qt,4.6,ComponentInstance,QFxComponentInstance) /*! \internal diff --git a/src/declarative/fx/qfxflickable.cpp b/src/declarative/fx/qfxflickable.cpp index 1db6e8b..3329ea6 100644 --- a/src/declarative/fx/qfxflickable.cpp +++ b/src/declarative/fx/qfxflickable.cpp @@ -228,7 +228,7 @@ void QFxFlickablePrivate::updateBeginningEnd() static const int FlickThreshold = 5; -QML_DEFINE_TYPE(QFxFlickable,Flickable) +QML_DEFINE_TYPE(Qt,4.6,Flickable,QFxFlickable) /*! \qmlclass Flickable diff --git a/src/declarative/fx/qfxflipable.cpp b/src/declarative/fx/qfxflipable.cpp index 6089d0a..0383051 100644 --- a/src/declarative/fx/qfxflipable.cpp +++ b/src/declarative/fx/qfxflipable.cpp @@ -46,7 +46,7 @@ QT_BEGIN_NAMESPACE -QML_DEFINE_TYPE(QFxFlipable,Flipable) +QML_DEFINE_TYPE(Qt,4.6,Flipable,QFxFlipable) class QFxFlipablePrivate : public QFxItemPrivate { diff --git a/src/declarative/fx/qfxfocusrealm.cpp b/src/declarative/fx/qfxfocusrealm.cpp index 9270bb2..04beaad 100644 --- a/src/declarative/fx/qfxfocusrealm.cpp +++ b/src/declarative/fx/qfxfocusrealm.cpp @@ -43,7 +43,7 @@ QT_BEGIN_NAMESPACE -QML_DEFINE_TYPE(QFxFocusRealm,FocusRealm) +QML_DEFINE_TYPE(Qt,4.6,FocusRealm,QFxFocusRealm) /*! \qmlclass FocusRealm diff --git a/src/declarative/fx/qfxgraphicsobjectcontainer.cpp b/src/declarative/fx/qfxgraphicsobjectcontainer.cpp index a82ea3d..f3f2e0d 100644 --- a/src/declarative/fx/qfxgraphicsobjectcontainer.cpp +++ b/src/declarative/fx/qfxgraphicsobjectcontainer.cpp @@ -56,7 +56,7 @@ QT_BEGIN_NAMESPACE */ QML_DEFINE_NOCREATE_TYPE(QGraphicsObject) -QML_DEFINE_TYPE(QFxGraphicsObjectContainer, GraphicsObjectContainer) +QML_DEFINE_TYPE(Qt,4.6,GraphicsObjectContainer,QFxGraphicsObjectContainer) QFxGraphicsObjectContainer::QFxGraphicsObjectContainer(QFxItem *parent) : QFxItem(parent), _graphicsObject(0) diff --git a/src/declarative/fx/qfxgridview.cpp b/src/declarative/fx/qfxgridview.cpp index 3c80e98..4512b46 100644 --- a/src/declarative/fx/qfxgridview.cpp +++ b/src/declarative/fx/qfxgridview.cpp @@ -1,3 +1,5 @@ +import Qt 4.6 + /**************************************************************************** ** ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). diff --git a/src/declarative/fx/qfximage.cpp b/src/declarative/fx/qfximage.cpp index 7445606..738809c 100644 --- a/src/declarative/fx/qfximage.cpp +++ b/src/declarative/fx/qfximage.cpp @@ -53,7 +53,7 @@ QT_BEGIN_NAMESPACE -QML_DEFINE_TYPE(QFxImage,Image) +QML_DEFINE_TYPE(Qt,4.6,Image,QFxImage) /*! \qmlclass Image QFxImage diff --git a/src/declarative/fx/qfxitem.cpp b/src/declarative/fx/qfxitem.cpp index 354e4cc..d229eab 100644 --- a/src/declarative/fx/qfxitem.cpp +++ b/src/declarative/fx/qfxitem.cpp @@ -71,7 +71,7 @@ QT_BEGIN_NAMESPACE #endif QML_DEFINE_NOCREATE_TYPE(QFxContents) -QML_DEFINE_TYPE(QFxItem,Item) +QML_DEFINE_TYPE(Qt,4.6,Item,QFxItem) /*! \group group_animation diff --git a/src/declarative/fx/qfxkeyactions.cpp b/src/declarative/fx/qfxkeyactions.cpp index 5de1f0b..892b3ca 100644 --- a/src/declarative/fx/qfxkeyactions.cpp +++ b/src/declarative/fx/qfxkeyactions.cpp @@ -44,7 +44,7 @@ #include <QKeyEvent> QT_BEGIN_NAMESPACE -QML_DEFINE_TYPE(QFxKeyActions,KeyActions) +QML_DEFINE_TYPE(Qt,4.6,KeyActions,QFxKeyActions) class QFxKeyActionsPrivate { diff --git a/src/declarative/fx/qfxkeyproxy.cpp b/src/declarative/fx/qfxkeyproxy.cpp index e4b4269..714e979 100644 --- a/src/declarative/fx/qfxkeyproxy.cpp +++ b/src/declarative/fx/qfxkeyproxy.cpp @@ -45,7 +45,7 @@ QT_BEGIN_NAMESPACE -QML_DEFINE_TYPE(QFxKeyProxy,KeyProxy) +QML_DEFINE_TYPE(Qt,4.6,KeyProxy,QFxKeyProxy) /*! \qmlclass KeyProxy diff --git a/src/declarative/fx/qfxlayouts.cpp b/src/declarative/fx/qfxlayouts.cpp index f71b35a..c098dfc 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(QFxVerticalLayout, VerticalLayout) +QML_DEFINE_TYPE(Qt,4.6,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(QFxHorizontalLayout,HorizontalLayout) +QML_DEFINE_TYPE(Qt,4.6,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(QFxGridLayout,GridLayout) +QML_DEFINE_TYPE(Qt,4.6,GridLayout,QFxGridLayout) /*! \qmlclass GridLayout QFxGridLayout diff --git a/src/declarative/fx/qfxlineedit.cpp b/src/declarative/fx/qfxlineedit.cpp index bafd782..4e2a56e 100644 --- a/src/declarative/fx/qfxlineedit.cpp +++ b/src/declarative/fx/qfxlineedit.cpp @@ -47,8 +47,8 @@ #include <QPainter> QT_BEGIN_NAMESPACE -QML_DEFINE_TYPE(QFxLineEdit,LineEdit); -QML_DEFINE_TYPE(QIntValidator,QIntValidator); +QML_DEFINE_TYPE(Qt,4.6,LineEdit,QFxLineEdit); +QML_DEFINE_TYPE(Qt,4.6,QIntValidator,QIntValidator); QFxLineEdit::QFxLineEdit(QFxItem* parent) : QFxPaintedItem(*(new QFxLineEditPrivate), parent) diff --git a/src/declarative/fx/qfxlistview.cpp b/src/declarative/fx/qfxlistview.cpp index 50564fb..9c07d6f 100644 --- a/src/declarative/fx/qfxlistview.cpp +++ b/src/declarative/fx/qfxlistview.cpp @@ -1643,7 +1643,7 @@ QObject *QFxListView::qmlAttachedProperties(QObject *obj) return QFxListViewAttached::properties(obj); } -QML_DEFINE_TYPE(QFxListView,ListView) +QML_DEFINE_TYPE(Qt,4.6,ListView,QFxListView) QT_END_NAMESPACE #include "qfxlistview.moc" diff --git a/src/declarative/fx/qfxmouseregion.cpp b/src/declarative/fx/qfxmouseregion.cpp index af16d4d..c476994a 100644 --- a/src/declarative/fx/qfxmouseregion.cpp +++ b/src/declarative/fx/qfxmouseregion.cpp @@ -49,7 +49,7 @@ QT_BEGIN_NAMESPACE static const int DragThreshold = 5; static const int PressAndHoldDelay = 800; -QML_DEFINE_TYPE(QFxDrag,Drag) +QML_DEFINE_TYPE(Qt,4.6,Drag,QFxDrag) QFxDrag::QFxDrag(QObject *parent) : QObject(parent), _target(0), _xmin(0), _xmax(0), _ymin(0), _ymax(0) { @@ -233,7 +233,7 @@ void QFxDrag::setYmax(int m) position of the release of the click, and whether the click wasHeld. */ -QML_DEFINE_TYPE(QFxMouseRegion,MouseRegion) +QML_DEFINE_TYPE(Qt,4.6,MouseRegion,QFxMouseRegion) /*! \internal diff --git a/src/declarative/fx/qfxpath.cpp b/src/declarative/fx/qfxpath.cpp index a1b6032..b4376a1 100644 --- a/src/declarative/fx/qfxpath.cpp +++ b/src/declarative/fx/qfxpath.cpp @@ -47,14 +47,14 @@ QT_BEGIN_NAMESPACE -QML_DEFINE_TYPE(QFxPath,Path) +QML_DEFINE_TYPE(Qt,4.6,Path,QFxPath) QML_DEFINE_NOCREATE_TYPE(QFxPathElement) QML_DEFINE_NOCREATE_TYPE(QFxCurve) -QML_DEFINE_TYPE(QFxPathAttribute,PathAttribute) -QML_DEFINE_TYPE(QFxPathPercent,PathPercent) -QML_DEFINE_TYPE(QFxPathLine,PathLine) -QML_DEFINE_TYPE(QFxPathQuad,PathQuad) -QML_DEFINE_TYPE(QFxPathCubic,PathCubic) +QML_DEFINE_TYPE(Qt,4.6,PathAttribute,QFxPathAttribute) +QML_DEFINE_TYPE(Qt,4.6,PathPercent,QFxPathPercent) +QML_DEFINE_TYPE(Qt,4.6,PathLine,QFxPathLine) +QML_DEFINE_TYPE(Qt,4.6,PathQuad,QFxPathQuad) +QML_DEFINE_TYPE(Qt,4.6,PathCubic,QFxPathCubic) /*! \qmlclass PathElement diff --git a/src/declarative/fx/qfxpathview.cpp b/src/declarative/fx/qfxpathview.cpp index 47364d0..396aed3 100644 --- a/src/declarative/fx/qfxpathview.cpp +++ b/src/declarative/fx/qfxpathview.cpp @@ -54,7 +54,7 @@ static const int FlickThreshold = 5; QT_BEGIN_NAMESPACE -QML_DEFINE_TYPE(QFxPathView,PathView) +QML_DEFINE_TYPE(Qt,4.6,PathView,QFxPathView) class QFxPathViewAttached : public QObject { diff --git a/src/declarative/fx/qfxrect.cpp b/src/declarative/fx/qfxrect.cpp index 32d3eb4..fb22c98 100644 --- a/src/declarative/fx/qfxrect.cpp +++ b/src/declarative/fx/qfxrect.cpp @@ -45,9 +45,9 @@ #include <QPainter> QT_BEGIN_NAMESPACE -QML_DEFINE_TYPE(QFxPen,Pen) -QML_DEFINE_TYPE(QFxGradientStop,GradientStop) -QML_DEFINE_TYPE(QFxGradient,Gradient) +QML_DEFINE_TYPE(Qt,4.6,Pen,QFxPen) +QML_DEFINE_TYPE(Qt,4.6,GradientStop,QFxGradientStop) +QML_DEFINE_TYPE(Qt,4.6,Gradient,QFxGradient) /*! \internal @@ -185,7 +185,7 @@ void QFxGradient::doUpdate() emit updated(); } -QML_DEFINE_TYPE(QFxRect,Rect) +QML_DEFINE_TYPE(Qt,4.6,Rect,QFxRect) /*! \qmlclass Rect QFxRect diff --git a/src/declarative/fx/qfxrepeater.cpp b/src/declarative/fx/qfxrepeater.cpp index a4dc809..97683eb 100644 --- a/src/declarative/fx/qfxrepeater.cpp +++ b/src/declarative/fx/qfxrepeater.cpp @@ -72,7 +72,7 @@ QFxItem *QFxRepeaterPrivate::addItem(QmlContext *ctxt, QFxItem *lastItem) return item; } -QML_DEFINE_TYPE(QFxRepeater,Repeater) +QML_DEFINE_TYPE(Qt,4.6,Repeater,QFxRepeater) /*! \qmlclass Repeater diff --git a/src/declarative/fx/qfxtext.cpp b/src/declarative/fx/qfxtext.cpp index 3d36bf3..4215e27 100644 --- a/src/declarative/fx/qfxtext.cpp +++ b/src/declarative/fx/qfxtext.cpp @@ -52,7 +52,7 @@ #include <QPainter> QT_BEGIN_NAMESPACE -QML_DEFINE_TYPE(QFxText,Text) +QML_DEFINE_TYPE(Qt,4.6,Text,QFxText) /*! \qmlclass Text QFxText diff --git a/src/declarative/fx/qfxtextedit.cpp b/src/declarative/fx/qfxtextedit.cpp index 4a8085b..8ff753e 100644 --- a/src/declarative/fx/qfxtextedit.cpp +++ b/src/declarative/fx/qfxtextedit.cpp @@ -53,7 +53,7 @@ #include <QPainter> QT_BEGIN_NAMESPACE -QML_DEFINE_TYPE(QFxTextEdit, TextEdit) +QML_DEFINE_TYPE(Qt,4.6,TextEdit,QFxTextEdit) /*! \qmlclass TextEdit diff --git a/src/declarative/fx/qfxtransform.cpp b/src/declarative/fx/qfxtransform.cpp index f08d830..7bdd5c1 100644 --- a/src/declarative/fx/qfxtransform.cpp +++ b/src/declarative/fx/qfxtransform.cpp @@ -199,7 +199,7 @@ void QFxScale::update() QFxTransform::update(); } -QML_DEFINE_TYPE(QFxScale, Scale) +QML_DEFINE_TYPE(Qt,4.6,Scale,QFxScale) /*! @@ -218,7 +218,7 @@ QML_DEFINE_TYPE(QFxScale, Scale) \endqml */ -QML_DEFINE_TYPE(QFxAxis, Axis) +QML_DEFINE_TYPE(Qt,4.6,Axis,QFxAxis) QFxAxis::QFxAxis(QObject *parent) : QObject(parent), _startX(0), _startY(0), _endX(0), _endY(0), _endZ(0) @@ -391,7 +391,7 @@ void QFxRotation::update() QFxTransform::update(); } -QML_DEFINE_TYPE(QFxRotation, Rotation) +QML_DEFINE_TYPE(Qt,4.6,Rotation,QFxRotation) /*! \qmlclass Rotation3D @@ -403,7 +403,7 @@ QML_DEFINE_TYPE(QFxRotation, Rotation) \image axisrotation.png */ -QML_DEFINE_TYPE(QFxRotation3D,Rotation3D) +QML_DEFINE_TYPE(Qt,4.6,Rotation3D,QFxRotation3D) QFxRotation3D::QFxRotation3D(QObject *parent) : QFxTransform(parent), _angle(0), _dirty(true) @@ -529,7 +529,7 @@ Image { \endqml */ -QML_DEFINE_TYPE(QFxTranslation3D,Translation3D) +QML_DEFINE_TYPE(Qt,4.6,Translation3D,QFxTranslation3D) QFxTranslation3D::QFxTranslation3D(QObject *parent) : QFxTransform(parent), _distance(0), _dirty(true) @@ -627,7 +627,7 @@ void QFxTranslation3D::update() OpenGL. When running under software rasterization it has no effect. */ -QML_DEFINE_TYPE(QFxPerspective,Perspective) +QML_DEFINE_TYPE(Qt,4.6,Perspective,QFxPerspective) QFxPerspective::QFxPerspective(QObject *parent) : QFxTransform(parent) @@ -724,7 +724,7 @@ QFxPerspective::~QFxPerspective() \image squish.png */ -QML_DEFINE_TYPE(QFxSquish,Squish) +QML_DEFINE_TYPE(Qt,4.6,Squish,QFxSquish) QFxSquish::QFxSquish(QObject *parent) : QFxTransform(parent) diff --git a/src/declarative/fx/qfxvisualitemmodel.cpp b/src/declarative/fx/qfxvisualitemmodel.cpp index 3d336c5..ee94831 100644 --- a/src/declarative/fx/qfxvisualitemmodel.cpp +++ b/src/declarative/fx/qfxvisualitemmodel.cpp @@ -767,7 +767,7 @@ void QFxVisualItemModel::_q_destroyingPackage(QmlPackage *package) emit destroyingItem(qobject_cast<QFxItem*>(package->part(d->m_part))); } -QML_DEFINE_TYPE(QFxVisualItemModel,VisualModel) +QML_DEFINE_TYPE(Qt,4.6,VisualModel,QFxVisualItemModel) QT_END_NAMESPACE #include "qfxvisualitemmodel.moc" diff --git a/src/declarative/fx/qfxwebview.cpp b/src/declarative/fx/qfxwebview.cpp index 6c23198..667dc7b 100644 --- a/src/declarative/fx/qfxwebview.cpp +++ b/src/declarative/fx/qfxwebview.cpp @@ -63,7 +63,7 @@ #include <private/qfxpainteditem_p.h> QT_BEGIN_NAMESPACE -QML_DEFINE_TYPE(QFxWebView,WebView) +QML_DEFINE_TYPE(Qt,4.6,WebView,QFxWebView) static const int MAX_DOUBLECLICK_TIME=500; // XXX need better gesture system diff --git a/src/declarative/qml/qml.h b/src/declarative/qml/qml.h index d43e693..5dd57bc 100644 --- a/src/declarative/qml/qml.h +++ b/src/declarative/qml/qml.h @@ -73,17 +73,14 @@ QT_MODULE(Declarative) QT_BEGIN_NAMESPACE -//#define QML_FORCE_NAMESPACE "Qt/4.6/" -#define QML_FORCE_NAMESPACE - #define QML_DEFINE_INTERFACE(INTERFACE) \ template<> QmlPrivate::InstanceType QmlPrivate::Define<INTERFACE *>::instance(qmlRegisterInterface<INTERFACE>(#INTERFACE)); -#define QML_DEFINE_EXTENDED_TYPE(TYPE, NAME, EXTENSION) \ - template<> QmlPrivate::InstanceType QmlPrivate::Define<TYPE *>::instance(qmlRegisterExtendedType<TYPE,EXTENSION>(QML_FORCE_NAMESPACE #NAME, #TYPE)); +#define QML_DEFINE_EXTENDED_TYPE(URI, VERSION, NAME, TYPE, EXTENSION) \ + template<> QmlPrivate::InstanceType QmlPrivate::Define<TYPE *>::instance(qmlRegisterExtendedType<TYPE,EXTENSION>(#URI, #VERSION, #NAME, #TYPE)); -#define QML_DEFINE_TYPE(TYPE, NAME) \ - template<> QmlPrivate::InstanceType QmlPrivate::Define<TYPE *>::instance(qmlRegisterType<TYPE>(QML_FORCE_NAMESPACE #NAME, #TYPE)); +#define QML_DEFINE_TYPE(URI, VERSION, NAME, TYPE) \ + template<> QmlPrivate::InstanceType QmlPrivate::Define<TYPE *>::instance(qmlRegisterType<TYPE>(#URI, #VERSION, #NAME, #TYPE)); #define QML_DEFINE_EXTENDED_NOCREATE_TYPE(TYPE, EXTENSION) \ template<> QmlPrivate::InstanceType QmlPrivate::Define<TYPE *>::instance(qmlRegisterExtendedType<TYPE,EXTENSION>(#TYPE)); diff --git a/src/declarative/qml/qmlcomponent.cpp b/src/declarative/qml/qmlcomponent.cpp index 0fdba64..4de114d 100644 --- a/src/declarative/qml/qmlcomponent.cpp +++ b/src/declarative/qml/qmlcomponent.cpp @@ -95,7 +95,7 @@ Item { } \endqml */ -QML_DEFINE_TYPE(QmlComponent,Component); +QML_DEFINE_TYPE(Qt,4.6,Component,QmlComponent); /*! \enum QmlComponent::Status diff --git a/src/declarative/qml/qmlcustomparser_p.h b/src/declarative/qml/qmlcustomparser_p.h index 914ddbd..63144d6 100644 --- a/src/declarative/qml/qmlcustomparser_p.h +++ b/src/declarative/qml/qmlcustomparser_p.h @@ -112,8 +112,8 @@ public: virtual QByteArray compile(const QList<QmlCustomParserProperty> &, bool *ok); virtual void setCustomData(QObject *, const QByteArray &); }; -#define QML_DEFINE_CUSTOM_TYPE(TYPE, NAME, CUSTOMTYPE) \ - template<> QmlPrivate::InstanceType QmlPrivate::Define<TYPE *>::instance(qmlRegisterCustomType<TYPE>(#NAME, #TYPE, new CUSTOMTYPE)); +#define QML_DEFINE_CUSTOM_TYPE(URI, VERSION, NAME, TYPE, CUSTOMTYPE) \ + template<> QmlPrivate::InstanceType QmlPrivate::Define<TYPE *>::instance(qmlRegisterCustomType<TYPE>(#URI, #VERSION, #NAME, #TYPE, new CUSTOMTYPE)); QT_END_NAMESPACE diff --git a/src/declarative/qml/qmlengine.cpp b/src/declarative/qml/qmlengine.cpp index c4b3c0d..492be3b 100644 --- a/src/declarative/qml/qmlengine.cpp +++ b/src/declarative/qml/qmlengine.cpp @@ -85,7 +85,7 @@ QT_BEGIN_NAMESPACE DEFINE_BOOL_CONFIG_OPTION(qmlDebugger, QML_DEBUGGER) DEFINE_BOOL_CONFIG_OPTION(qmlImportTrace, QML_IMPORT_TRACE) -QML_DEFINE_TYPE(QObject,Object) +QML_DEFINE_TYPE(Qt,4.6,Object,QObject) struct StaticQtMetaObject : public QObject { diff --git a/src/declarative/qml/qmlmetatype.cpp b/src/declarative/qml/qmlmetatype.cpp index 16baf08..bb05ebd 100644 --- a/src/declarative/qml/qmlmetatype.cpp +++ b/src/declarative/qml/qmlmetatype.cpp @@ -56,6 +56,7 @@ #include <qstringlist.h> #include <qvector.h> #include <qlocale.h> +//#include <ctypes.h> #include <QtCore/qcryptographichash.h> #include <private/qmlcustomparser_p.h> @@ -416,26 +417,35 @@ int QmlMetaType::registerInterface(const QmlPrivate::MetaTypeIds &id, return index; } -int QmlMetaType::registerType(const QmlPrivate::MetaTypeIds &id, QmlPrivate::Func func, const char *cname, const QMetaObject *mo, QmlAttachedPropertiesFunc attach, const QMetaObject *attachMo, int pStatus, int object, QmlPrivate::CreateFunc extFunc, const QMetaObject *extmo, QmlCustomParser *parser) +int QmlMetaType::registerType(const QmlPrivate::MetaTypeIds &id, QmlPrivate::Func func, const char *uri, const char *version, const char *cname, const QMetaObject *mo, QmlAttachedPropertiesFunc attach, const QMetaObject *attachMo, int pStatus, int object, QmlPrivate::CreateFunc extFunc, const QMetaObject *extmo, QmlCustomParser *parser) { Q_UNUSED(object); QWriteLocker lock(metaTypeDataLock()); QmlMetaTypeData *data = metaTypeData(); - QString name = QLatin1String(cname); + QByteArray name = cname; for (int ii = 0; ii < name.count(); ++ii) { - QChar ch = name.at(ii); - if (!ch.isLetterOrNumber() && ch != QChar::fromLatin1('/') && ch != QChar::fromLatin1('.')) { + if (!isalnum(name.at(ii))) { qWarning("QmlMetaType: Invalid QML name %s", cname); return -1; } } + // XXX Only adding specified version. Need all relevant versions! + if (uri) { + if (version) + name = QByteArray(uri) + '/' + version + '/' + name; + else + name = QByteArray(uri) + '/' + name; + } else { + Q_ASSERT(!version); + } + int index = data->types.count(); QmlType *type = new QmlType(id.typeId, id.listId, id.qmlListId, - func, cname, mo, attach, attachMo, pStatus, extFunc, + func, name, mo, attach, attachMo, pStatus, extFunc, extmo, index, parser); data->types.append(type); diff --git a/src/declarative/qml/qmlmetatype.h b/src/declarative/qml/qmlmetatype.h index d10a0f0..d83b83e 100644 --- a/src/declarative/qml/qmlmetatype.h +++ b/src/declarative/qml/qmlmetatype.h @@ -59,7 +59,7 @@ class QmlCustomParser; class Q_DECLARATIVE_EXPORT QmlMetaType { public: - static int registerType(const QmlPrivate::MetaTypeIds &, QmlPrivate::Func, const char *, const QMetaObject *, QmlAttachedPropertiesFunc, const QMetaObject *, int pStatus, int object, QmlPrivate::CreateFunc extFunc, const QMetaObject *extmo, QmlCustomParser *); + static int registerType(const QmlPrivate::MetaTypeIds &, QmlPrivate::Func, const char *, const char *, const char *, const QMetaObject *, QmlAttachedPropertiesFunc, const QMetaObject *, int pStatus, int object, QmlPrivate::CreateFunc extFunc, const QMetaObject *extmo, QmlCustomParser *); static int registerInterface(const QmlPrivate::MetaTypeIds &, QmlPrivate::Func, const char *); static bool copy(int type, void *data, const void *copy = 0); @@ -163,7 +163,7 @@ int qmlRegisterType(const char *typeName) qRegisterMetaType<T *>(QByteArray("QmlList<" + name + "*>*").constData()) }; - return QmlMetaType::registerType(ids, QmlPrivate::list_nocreate_op<T>, 0, + return QmlMetaType::registerType(ids, QmlPrivate::list_nocreate_op<T>, 0, 0, 0, &T::staticMetaObject, QmlPrivate::attachedPropertiesFunc<T>(), QmlPrivate::attachedPropertiesMetaObject<T>(), @@ -173,7 +173,7 @@ int qmlRegisterType(const char *typeName) } template<typename T> -int qmlRegisterType(const char *qmlName, const char *typeName) +int qmlRegisterType(const char *uri, const char *version, const char *qmlName, const char *typeName) { QByteArray name(typeName); QmlPrivate::MetaTypeIds ids = { @@ -182,7 +182,7 @@ int qmlRegisterType(const char *qmlName, const char *typeName) qRegisterMetaType<T *>(QByteArray("QmlList<" + name + "*>*").constData()) }; - return QmlMetaType::registerType(ids, QmlPrivate::list_op<T>, qmlName, + return QmlMetaType::registerType(ids, QmlPrivate::list_op<T>, uri, version, qmlName, &T::staticMetaObject, QmlPrivate::attachedPropertiesFunc<T>(), QmlPrivate::attachedPropertiesMetaObject<T>(), @@ -210,7 +210,7 @@ int qmlRegisterExtendedType(const char *typeName) attachedMo = QmlPrivate::attachedPropertiesMetaObject<T>(); } - return QmlMetaType::registerType(ids, QmlPrivate::list_nocreate_op<T>, 0, + return QmlMetaType::registerType(ids, QmlPrivate::list_nocreate_op<T>, 0, 0, 0, &T::staticMetaObject, attached, attachedMo, QmlPrivate::StaticCastSelector<T,QmlParserStatus>::cast(), QmlPrivate::StaticCastSelector<T,QObject>::cast(), @@ -218,7 +218,7 @@ int qmlRegisterExtendedType(const char *typeName) } template<typename T, typename E> -int qmlRegisterExtendedType(const char *qmlName, const char *typeName) +int qmlRegisterExtendedType(const char *uri, const char *version, const char *qmlName, const char *typeName) { QByteArray name(typeName); QmlPrivate::MetaTypeIds ids = { @@ -237,7 +237,7 @@ int qmlRegisterExtendedType(const char *qmlName, const char *typeName) } return QmlMetaType::registerType(ids, QmlPrivate::list_op<T>, - qmlName, + uri, version, qmlName, &T::staticMetaObject, attached, attachedMo, QmlPrivate::StaticCastSelector<T,QmlParserStatus>::cast(), @@ -262,7 +262,7 @@ int qmlRegisterInterface(const char *typeName) } template<typename T> -int qmlRegisterCustomType(const char *qmlName, const char *typeName, QmlCustomParser *parser) +int qmlRegisterCustomType(const char *uri, const char *version, const char *qmlName, const char *typeName, QmlCustomParser *parser) { QByteArray name(typeName); QmlPrivate::MetaTypeIds ids = { @@ -271,7 +271,7 @@ int qmlRegisterCustomType(const char *qmlName, const char *typeName, QmlCustomPa qRegisterMetaType<T *>(QByteArray("QmlList<" + name + "*>*").constData()) }; - return QmlMetaType::registerType(ids, QmlPrivate::list_op<T>, qmlName, + return QmlMetaType::registerType(ids, QmlPrivate::list_op<T>, uri, version, qmlName, &T::staticMetaObject, QmlPrivate::attachedPropertiesFunc<T>(), QmlPrivate::attachedPropertiesMetaObject<T>(), diff --git a/src/declarative/util/qmlanimation.cpp b/src/declarative/util/qmlanimation.cpp index 7d9e30f..1055387 100644 --- a/src/declarative/util/qmlanimation.cpp +++ b/src/declarative/util/qmlanimation.cpp @@ -639,7 +639,7 @@ void QmlAbstractAnimation::timelineComplete() \l{xmlPauseAnimation} {<PauseAnimation>}. */ -QML_DEFINE_TYPE(QmlPauseAnimation,PauseAnimation) +QML_DEFINE_TYPE(Qt,4.6,PauseAnimation,QmlPauseAnimation) QmlPauseAnimation::QmlPauseAnimation(QObject *parent) : QmlAbstractAnimation(*(new QmlPauseAnimationPrivate), parent) { @@ -771,7 +771,7 @@ void QmlColorAnimation::setTo(const QColor &t) QmlPropertyAnimation::setTo(t); } -QML_DEFINE_TYPE(QmlColorAnimation,ColorAnimation) +QML_DEFINE_TYPE(Qt,4.6,ColorAnimation,QmlColorAnimation) /*! \qmlclass RunScriptAction QmlRunScriptAction @@ -865,7 +865,7 @@ QAbstractAnimation *QmlRunScriptAction::qtAnimation() return d->rsa; } -QML_DEFINE_TYPE(QmlRunScriptAction, RunScriptAction) +QML_DEFINE_TYPE(Qt,4.6,RunScriptAction,QmlRunScriptAction) /*! \qmlclass SetPropertyAction QmlSetPropertyAction @@ -1073,7 +1073,7 @@ void QmlSetPropertyAction::transition(QmlStateActions &actions, } } -QML_DEFINE_TYPE(QmlSetPropertyAction,SetPropertyAction) +QML_DEFINE_TYPE(Qt,4.6,SetPropertyAction,QmlSetPropertyAction) /*! \qmlclass ParentChangeAction QmlParentChangeAction @@ -1168,7 +1168,7 @@ void QmlParentChangeAction::transition(QmlStateActions &actions, } } -QML_DEFINE_TYPE(QmlParentChangeAction,ParentChangeAction) +QML_DEFINE_TYPE(Qt,4.6,ParentChangeAction,QmlParentChangeAction) /*! \qmlclass NumberAnimation QmlNumberAnimation @@ -1246,7 +1246,7 @@ void QmlNumberAnimation::setTo(qreal t) QmlPropertyAnimation::setTo(t); } -QML_DEFINE_TYPE(QmlNumberAnimation,NumberAnimation) +QML_DEFINE_TYPE(Qt,4.6,NumberAnimation,QmlNumberAnimation) QmlAnimationGroup::QmlAnimationGroup(QObject *parent) : QmlAbstractAnimation(*(new QmlAnimationGroupPrivate), parent) @@ -1336,7 +1336,7 @@ void QmlSequentialAnimation::transition(QmlStateActions &actions, } } -QML_DEFINE_TYPE(QmlSequentialAnimation,SequentialAnimation) +QML_DEFINE_TYPE(Qt,4.6,SequentialAnimation,QmlSequentialAnimation) /*! \qmlclass ParallelAnimation QmlParallelAnimation @@ -1418,7 +1418,7 @@ void QmlParallelAnimation::transition(QmlStateActions &actions, } } -QML_DEFINE_TYPE(QmlParallelAnimation,ParallelAnimation) +QML_DEFINE_TYPE(Qt,4.6,ParallelAnimation,QmlParallelAnimation) //convert a variant from string type to another animatable type void QmlPropertyAnimationPrivate::convertVariant(QVariant &variant, int type) @@ -1881,6 +1881,6 @@ void QmlPropertyAnimation::transition(QmlStateActions &actions, } } -QML_DEFINE_TYPE(QmlPropertyAnimation,PropertyAnimation) +QML_DEFINE_TYPE(Qt,4.6,PropertyAnimation,QmlPropertyAnimation) QT_END_NAMESPACE diff --git a/src/declarative/util/qmlbind.cpp b/src/declarative/util/qmlbind.cpp index 7493b12..271be81 100644 --- a/src/declarative/util/qmlbind.cpp +++ b/src/declarative/util/qmlbind.cpp @@ -63,7 +63,7 @@ public: QmlNullableValue<QVariant> value; }; -QML_DEFINE_TYPE(QmlBind,Bind) +QML_DEFINE_TYPE(Qt,4.6,Bind,QmlBind) /*! \qmlclass Bind QmlBind \brief The Bind element allows arbitrary property bindings to be created. diff --git a/src/declarative/util/qmlconnection.cpp b/src/declarative/util/qmlconnection.cpp index 95f4573..e8879f6 100644 --- a/src/declarative/util/qmlconnection.cpp +++ b/src/declarative/util/qmlconnection.cpp @@ -294,6 +294,6 @@ void QmlConnection::setSignal(const QString& sig) connectIfValid(); } -QML_DEFINE_TYPE(QmlConnection,Connection) +QML_DEFINE_TYPE(Qt,4.6,Connection,QmlConnection) QT_END_NAMESPACE diff --git a/src/declarative/util/qmlfollow.cpp b/src/declarative/util/qmlfollow.cpp index 63b6307..82e8f0e 100644 --- a/src/declarative/util/qmlfollow.cpp +++ b/src/declarative/util/qmlfollow.cpp @@ -48,7 +48,7 @@ QT_BEGIN_NAMESPACE -QML_DEFINE_TYPE(QmlFollow,Follow) +QML_DEFINE_TYPE(Qt,4.6,Follow,QmlFollow) class QmlFollowPrivate : public QObjectPrivate { diff --git a/src/declarative/util/qmlfont.cpp b/src/declarative/util/qmlfont.cpp index 3075b82..6e4557f 100644 --- a/src/declarative/util/qmlfont.cpp +++ b/src/declarative/util/qmlfont.cpp @@ -51,7 +51,7 @@ public: QFont font; }; -QML_DEFINE_TYPE(QmlFont,Font) +QML_DEFINE_TYPE(Qt,4.6,Font,QmlFont) /*! \internal diff --git a/src/declarative/util/qmllistmodel.cpp b/src/declarative/util/qmllistmodel.cpp index 0c167c0..aa6cc2c 100644 --- a/src/declarative/util/qmllistmodel.cpp +++ b/src/declarative/util/qmllistmodel.cpp @@ -500,14 +500,14 @@ void QmlListModelParser::setCustomData(QObject *obj, const QByteArray &d) } } -QML_DEFINE_CUSTOM_TYPE(QmlListModel, ListModel, QmlListModelParser) +QML_DEFINE_CUSTOM_TYPE(Qt, 4.6, ListModel, QmlListModel, QmlListModelParser) // ### FIXME class QmlListElement : public QObject { Q_OBJECT }; -QML_DEFINE_TYPE(QmlListElement,ListElement) +QML_DEFINE_TYPE(Qt,4.6,ListElement,QmlListElement) static void dump(ModelNode *node, int ind) { diff --git a/src/declarative/util/qmlpackage.cpp b/src/declarative/util/qmlpackage.cpp index eec769e..d4bf0f9 100644 --- a/src/declarative/util/qmlpackage.cpp +++ b/src/declarative/util/qmlpackage.cpp @@ -147,7 +147,7 @@ QmlPackageAttached *QmlPackage::qmlAttachedProperties(QObject *o) return new QmlPackageAttached(o); } -QML_DEFINE_TYPE(QmlPackage, Package) +QML_DEFINE_TYPE(Qt,4.6,Package,QmlPackage) QT_END_NAMESPACE diff --git a/src/declarative/util/qmlpalette.cpp b/src/declarative/util/qmlpalette.cpp index 40cfa71..507568d 100644 --- a/src/declarative/util/qmlpalette.cpp +++ b/src/declarative/util/qmlpalette.cpp @@ -52,7 +52,7 @@ public: QPalette::ColorGroup group; }; -QML_DEFINE_TYPE(QmlPalette,Palette) +QML_DEFINE_TYPE(Qt,4.6,Palette,QmlPalette) /*! \internal diff --git a/src/declarative/util/qmlscript.cpp b/src/declarative/util/qmlscript.cpp index 7199341..5aa87d7 100644 --- a/src/declarative/util/qmlscript.cpp +++ b/src/declarative/util/qmlscript.cpp @@ -99,7 +99,7 @@ public: avoided. */ -QML_DEFINE_TYPE(QmlScript,Script) +QML_DEFINE_TYPE(Qt,4.6,Script,QmlScript) QmlScript::QmlScript(QObject *parent) : QObject(*(new QmlScriptPrivate), parent) { } diff --git a/src/declarative/util/qmlsetproperties.cpp b/src/declarative/util/qmlsetproperties.cpp index ffd1e6a..b067fcf 100644 --- a/src/declarative/util/qmlsetproperties.cpp +++ b/src/declarative/util/qmlsetproperties.cpp @@ -357,6 +357,6 @@ void QmlSetProperties::setIsExplicit(bool e) d->isExplicit = e; } -QML_DEFINE_CUSTOM_TYPE(QmlSetProperties,SetProperties,QmlSetPropertiesParser) +QML_DEFINE_CUSTOM_TYPE(Qt, 4.6, SetProperties, QmlSetProperties, QmlSetPropertiesParser) QT_END_NAMESPACE diff --git a/src/declarative/util/qmlstate.cpp b/src/declarative/util/qmlstate.cpp index 2c44c86..351325f 100644 --- a/src/declarative/util/qmlstate.cpp +++ b/src/declarative/util/qmlstate.cpp @@ -126,7 +126,7 @@ QmlStateOperation::QmlStateOperation(QObjectPrivate &dd, QObject *parent) \sa {states-transitions}{States and Transitions} */ -QML_DEFINE_TYPE(QmlState,State) +QML_DEFINE_TYPE(Qt,4.6,State,QmlState) QmlState::QmlState(QObject *parent) : QObject(*(new QmlStatePrivate), parent) { diff --git a/src/declarative/util/qmlstategroup.cpp b/src/declarative/util/qmlstategroup.cpp index 946569c..8977642 100644 --- a/src/declarative/util/qmlstategroup.cpp +++ b/src/declarative/util/qmlstategroup.cpp @@ -49,7 +49,7 @@ QT_BEGIN_NAMESPACE DEFINE_BOOL_CONFIG_OPTION(stateChangeDebug, STATECHANGE_DEBUG); -QML_DEFINE_TYPE(QmlStateGroup,StateGroup) +QML_DEFINE_TYPE(Qt,4.6,StateGroup,QmlStateGroup) class QmlStateGroupPrivate : public QObjectPrivate { diff --git a/src/declarative/util/qmlstateoperations.cpp b/src/declarative/util/qmlstateoperations.cpp index dc7fef6..4b1b63f 100644 --- a/src/declarative/util/qmlstateoperations.cpp +++ b/src/declarative/util/qmlstateoperations.cpp @@ -122,7 +122,7 @@ void QmlParentChangePrivate::doChange(QFxItem *targetParent) \brief The ParentChange element allows you to reparent an object in a state. */ -QML_DEFINE_TYPE(QmlParentChange,ParentChange) +QML_DEFINE_TYPE(Qt,4.6,ParentChange,QmlParentChange) QmlParentChange::QmlParentChange(QObject *parent) : QmlStateOperation(*(new QmlParentChangePrivate), parent) { @@ -209,7 +209,7 @@ public: \qmlclass RunScript QmlRunScript \brief The RunScript element allows you to run a script in a state. */ -QML_DEFINE_TYPE(QmlRunScript,RunScript) +QML_DEFINE_TYPE(Qt,4.6,RunScript,QmlRunScript) QmlRunScript::QmlRunScript(QObject *parent) : QmlStateOperation(*(new QmlRunScriptPrivate), parent) { diff --git a/src/declarative/util/qmltimer.cpp b/src/declarative/util/qmltimer.cpp index 4af83d3..caf316a 100644 --- a/src/declarative/util/qmltimer.cpp +++ b/src/declarative/util/qmltimer.cpp @@ -47,7 +47,7 @@ QT_BEGIN_NAMESPACE -QML_DEFINE_TYPE(QmlTimer,Timer) +QML_DEFINE_TYPE(Qt,4.6,Timer,QmlTimer) class QmlTimerPrivate : public QObjectPrivate { diff --git a/src/declarative/util/qmltransition.cpp b/src/declarative/util/qmltransition.cpp index dffa6b5..431059f 100644 --- a/src/declarative/util/qmltransition.cpp +++ b/src/declarative/util/qmltransition.cpp @@ -135,7 +135,7 @@ void ParallelAnimationWrapper::updateState(QAbstractAnimation::State oldState, Q } -QML_DEFINE_TYPE(QmlTransition,Transition) +QML_DEFINE_TYPE(Qt,4.6,Transition,QmlTransition) QmlTransition::QmlTransition(QObject *parent) : QObject(*(new QmlTransitionPrivate), parent) { diff --git a/src/declarative/widgets/graphicslayouts.cpp b/src/declarative/widgets/graphicslayouts.cpp index f2d8dbc..217ecf7 100644 --- a/src/declarative/widgets/graphicslayouts.cpp +++ b/src/declarative/widgets/graphicslayouts.cpp @@ -89,7 +89,7 @@ private: Qt::Alignment _alignment; }; -QML_DEFINE_TYPE(QGraphicsLinearLayoutStretchItemObject,QGraphicsLinearLayoutStretchItem) +QML_DEFINE_TYPE(Qt,4.6,QGraphicsLinearLayoutStretchItem,QGraphicsLinearLayoutStretchItemObject) QGraphicsLinearLayoutStretchItemObject::QGraphicsLinearLayoutStretchItemObject(QObject *parent) : QObject(parent) @@ -103,7 +103,7 @@ QSizeF QGraphicsLinearLayoutStretchItemObject::sizeHint(Qt::SizeHint which, cons return QSizeF(); } -QML_DEFINE_TYPE(QGraphicsLinearLayoutObject,QGraphicsLinearLayout) +QML_DEFINE_TYPE(Qt,4.6,QGraphicsLinearLayout,QGraphicsLinearLayoutObject) QGraphicsLinearLayoutObject::QGraphicsLinearLayoutObject(QObject *parent) : QObject(parent), _children(this) @@ -246,7 +246,7 @@ private: Qt::Alignment _alignment; }; -QML_DEFINE_TYPE(QGraphicsGridLayoutObject,QGraphicsGridLayout) +QML_DEFINE_TYPE(Qt,4.6,QGraphicsGridLayout,QGraphicsGridLayoutObject) QGraphicsGridLayoutObject::QGraphicsGridLayoutObject(QObject *parent) diff --git a/src/declarative/widgets/graphicswidgets.cpp b/src/declarative/widgets/graphicswidgets.cpp index e7d01e3..782ffba 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(QGraphicsView,QGraphicsView,QGraphicsViewDeclarativeUI) +QML_DEFINE_EXTENDED_TYPE(Qt,4.6,QGraphicsView,QGraphicsView,QGraphicsViewDeclarativeUI) class QGraphicsSceneDeclarativeUI : public QObject { @@ -111,7 +111,7 @@ private: }; Children _children; }; -QML_DEFINE_EXTENDED_TYPE(QGraphicsScene,QGraphicsScene,QGraphicsSceneDeclarativeUI) +QML_DEFINE_EXTENDED_TYPE(Qt,4.6,QGraphicsScene,QGraphicsScene,QGraphicsSceneDeclarativeUI) class QGraphicsWidgetDeclarativeUI : public QObject { @@ -164,7 +164,7 @@ private: QmlConcreteList<QObject *> _data; }; -QML_DEFINE_EXTENDED_TYPE(QGraphicsWidget,QGraphicsWidget,QGraphicsWidgetDeclarativeUI) +QML_DEFINE_EXTENDED_TYPE(Qt,4.6,QGraphicsWidget,QGraphicsWidget,QGraphicsWidgetDeclarativeUI) QML_DEFINE_INTERFACE(QGraphicsItem) |