Changeset 846 for trunk/src/gui/kernel/qgesturerecognizer.cpp

Timestamp:

May 5, 2011, 5:36:53 AM (14 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/qgesturerecognizer.cpp (modified) (6 diffs)

trunk/src/gui/kernel/qgesturerecognizer.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
@@ -45 +45 @@
 #include "private/qgesturemanager_p.h"
 
+#ifndef QT_NO_GESTURES
+
 QT_BEGIN_NAMESPACE
 
@@ -60 +62 @@
    need to use this class directly. Instances will be created behind the scenes by the
    framework.
+
+   For an overview of gesture handling in Qt and information on using gestures
+   in your applications, see the \l{Gestures Programming} document.
 
    \section1 Recognizing Gestures
@@ -162 +167 @@
     Reimplement this function to create a custom QGesture-derived gesture
     object if necessary.
+
+    The application takes ownership of the created gesture object.
 */
 QGesture *QGestureRecognizer::create(QObject *target)
@@ -182 +189 @@
         d->state = Qt::NoGesture;
         d->hotSpot = QPointF();
+        d->sceneHotSpot = QPointF();
         d->isHotSpotSet = false;
     }
@@ -229 +237 @@
 
 QT_END_NAMESPACE
+
+#endif // QT_NO_GESTURES