aboutsummaryrefslogtreecommitdiffstats
path: root/src/quick/items/qquickpincharea_p.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/quick/items/qquickpincharea_p.h')
-rw-r--r--src/quick/items/qquickpincharea_p.h39
1 files changed, 17 insertions, 22 deletions
diff --git a/src/quick/items/qquickpincharea_p.h b/src/quick/items/qquickpincharea_p.h
index 5e08aa3eeb..9ea16f3ea4 100644
--- a/src/quick/items/qquickpincharea_p.h
+++ b/src/quick/items/qquickpincharea_p.h
@@ -21,7 +21,7 @@
QT_BEGIN_NAMESPACE
-class Q_QUICK_PRIVATE_EXPORT QQuickPinch : public QObject
+class Q_QUICK_EXPORT QQuickPinch : public QObject
{
Q_OBJECT
@@ -160,24 +160,24 @@ private:
bool m_active;
};
-class Q_QUICK_PRIVATE_EXPORT QQuickPinchEvent : public QObject
+class Q_QUICK_EXPORT QQuickPinchEvent : public QObject
{
Q_OBJECT
- Q_PROPERTY(QPointF center READ center)
- Q_PROPERTY(QPointF startCenter READ startCenter)
- Q_PROPERTY(QPointF previousCenter READ previousCenter)
- Q_PROPERTY(qreal scale READ scale)
- Q_PROPERTY(qreal previousScale READ previousScale)
- Q_PROPERTY(qreal angle READ angle)
- Q_PROPERTY(qreal previousAngle READ previousAngle)
- Q_PROPERTY(qreal rotation READ rotation)
- Q_PROPERTY(QPointF point1 READ point1)
- Q_PROPERTY(QPointF startPoint1 READ startPoint1)
- Q_PROPERTY(QPointF point2 READ point2)
- Q_PROPERTY(QPointF startPoint2 READ startPoint2)
- Q_PROPERTY(int pointCount READ pointCount)
- Q_PROPERTY(bool accepted READ accepted WRITE setAccepted)
+ Q_PROPERTY(QPointF center READ center FINAL)
+ Q_PROPERTY(QPointF startCenter READ startCenter FINAL)
+ Q_PROPERTY(QPointF previousCenter READ previousCenter FINAL)
+ Q_PROPERTY(qreal scale READ scale FINAL)
+ Q_PROPERTY(qreal previousScale READ previousScale FINAL)
+ Q_PROPERTY(qreal angle READ angle FINAL)
+ Q_PROPERTY(qreal previousAngle READ previousAngle FINAL)
+ Q_PROPERTY(qreal rotation READ rotation FINAL)
+ Q_PROPERTY(QPointF point1 READ point1 FINAL)
+ Q_PROPERTY(QPointF startPoint1 READ startPoint1 FINAL)
+ Q_PROPERTY(QPointF point2 READ point2 FINAL)
+ Q_PROPERTY(QPointF startPoint2 READ startPoint2 FINAL)
+ Q_PROPERTY(int pointCount READ pointCount FINAL)
+ Q_PROPERTY(bool accepted READ accepted WRITE setAccepted FINAL)
QML_ANONYMOUS
QML_ADDED_IN_VERSION(2, 0)
@@ -230,9 +230,8 @@ private:
};
-class QQuickMouseEvent;
class QQuickPinchAreaPrivate;
-class Q_QUICK_PRIVATE_EXPORT QQuickPinchArea : public QQuickItem
+class Q_QUICK_EXPORT QQuickPinchArea : public QQuickItem
{
Q_OBJECT
@@ -278,9 +277,5 @@ private:
QT_END_NAMESPACE
-QML_DECLARE_TYPE(QQuickPinch)
-QML_DECLARE_TYPE(QQuickPinchEvent)
-QML_DECLARE_TYPE(QQuickPinchArea)
-
#endif // QQUICKPINCHAREA_H