Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml

1 files changed, 0 insertions, 37 deletions

diff --git a/src/declarative/graphicsitems/qmlgraphicsflickable.cpp b/src/declarative/graphicsitems/qmlgraphicsflickable.cpp
index 2ff3b30..5143251 100644
--- a/src/declarative/graphicsitems/qmlgraphicsflickable.cpp
+++ b/src/declarative/graphicsitems/qmlgraphicsflickable.cpp
@@ -56,36 +56,6 @@ static const int FlickThreshold = 20;
 // Really slow flicks can be annoying.
 static const int minimumFlickVelocity = 200;
 
-class QmlGraphicsFlickableVisibleArea : public QObject
-{
-    Q_OBJECT
-
-    Q_PROPERTY(qreal xPosition READ xPosition NOTIFY pageChanged)
-    Q_PROPERTY(qreal yPosition READ yPosition NOTIFY pageChanged)
-    Q_PROPERTY(qreal widthRatio READ widthRatio NOTIFY pageChanged)
-    Q_PROPERTY(qreal heightRatio READ heightRatio NOTIFY pageChanged)
-
-public:
-    QmlGraphicsFlickableVisibleArea(QmlGraphicsFlickable *parent=0);
-
-    qreal xPosition() const;
-    qreal widthRatio() const;
-    qreal yPosition() const;
-    qreal heightRatio() const;
-
-    void updateVisible();
-
-signals:
-    void pageChanged();
-
-private:
-    QmlGraphicsFlickable *flickable;
-    qreal m_xPosition;
-    qreal m_widthRatio;
-    qreal m_yPosition;
-    qreal m_heightRatio;
-};
-
 QmlGraphicsFlickableVisibleArea::QmlGraphicsFlickableVisibleArea(QmlGraphicsFlickable *parent)
     : QObject(parent), flickable(parent), m_xPosition(0.), m_widthRatio(0.)
     , m_yPosition(0.), m_heightRatio(0.)
@@ -356,8 +326,6 @@ void QmlGraphicsFlickablePrivate::updateBeginningEnd()
         visibleArea->updateVisible();
 }
 
-QML_DEFINE_TYPE(Qt,4,6,Flickable,QmlGraphicsFlickable)
-
 /*!
     \qmlclass Flickable QmlGraphicsFlickable
     \brief The Flickable item provides a surface that can be "flicked".
@@ -1367,8 +1335,3 @@ void QmlGraphicsFlickablePrivate::updateVelocity()
 }
 
 QT_END_NAMESPACE
-
-QML_DECLARE_TYPE(QmlGraphicsFlickableVisibleArea)
-QML_DEFINE_TYPE(Qt,4,6,VisibleArea,QmlGraphicsFlickableVisibleArea)
-
-#include <qmlgraphicsflickable.moc>