Changeset 846 for trunk/src/gui/kernel/qgesture.h

Timestamp:

May 5, 2011, 5:36:53 AM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.7.2 sources from branches/vendor/nokia/qt.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/gui/kernel/qgesture.h (modified) (8 diffs)

trunk/src/gui/kernel/qgesture.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])
@@ -50 +50 @@
 #include <QtCore/qmetatype.h>
 
+
+
 QT_BEGIN_HEADER
 
 Q_DECLARE_METATYPE(Qt::GestureState)
+
 
 QT_BEGIN_NAMESPACE
@@ -111 +114 @@
     Q_PROPERTY(QPointF delta READ delta STORED false)
     Q_PROPERTY(qreal acceleration READ acceleration WRITE setAcceleration)
+
+
 
 public:
@@ -133 +138 @@
     Q_OBJECT
     Q_DECLARE_PRIVATE(QPinchGesture)
+
 
 public:
@@ -190 +196 @@
 };
 
+
+
 QT_END_NAMESPACE
 
@@ -206 +214 @@
     Q_PROPERTY(SwipeDirection verticalDirection READ verticalDirection STORED false)
     Q_PROPERTY(qreal swipeAngle READ swipeAngle WRITE setSwipeAngle)
+
 
 public:
@@ -251 +260 @@
     void setPosition(const QPointF &pos);
 
+
+
+
     friend class QTapAndHoldGestureRecognizer;
 };
@@ -259 +271 @@
 QT_END_HEADER
 
+
+
 #endif // QGESTURE_H