Merge branch 'dev' into stable

This starts Qt 5.1 release cycle

Change-Id: Idce0f9b94f9e585abfb6903f554500a06f4f8aaa

1 files changed, 11 insertions, 7 deletions

diff --git a/src/sensors/qtapsensor.h b/src/sensors/qtapsensor.h
index da71e96..74ca40c 100644
--- a/src/sensors/qtapsensor.h
+++ b/src/sensors/qtapsensor.h
@@ -44,11 +44,8 @@
 
 #include <QtSensors/qsensor.h>
 
-QT_BEGIN_HEADER
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(QtSensors)
-
 class QTapReadingPrivate;
 
 class Q_SENSORS_EXPORT QTapReading : public QSensorReading
@@ -90,24 +87,31 @@ private:
     bool filter(QSensorReading *reading) { return filter(static_cast<QTapReading*>(reading)); }
 };
 
+class QTapSensorPrivate;
+
 class Q_SENSORS_EXPORT QTapSensor : public QSensor
 {
     Q_OBJECT
-#ifdef Q_QDOC
-    Q_PROPERTY(bool returnDoubleTapEvents)
-#endif
+    Q_PROPERTY(bool returnDoubleTapEvents READ returnDoubleTapEvents WRITE setReturnDoubleTapEvents
+               NOTIFY returnDoubleTapEventsChanged)
 public:
     explicit QTapSensor(QObject *parent = 0);
     virtual ~QTapSensor();
     QTapReading *reading() const { return static_cast<QTapReading*>(QSensor::reading()); }
     static char const * const type;
 
+    bool returnDoubleTapEvents() const;
+    void setReturnDoubleTapEvents(bool returnDoubleTapEvents);
+
+Q_SIGNALS:
+    void returnDoubleTapEventsChanged(bool returnDoubleTapEvents);
+
 private:
+    Q_DECLARE_PRIVATE(QTapSensor);
     Q_DISABLE_COPY(QTapSensor)
 };
 
 QT_END_NAMESPACE
-QT_END_HEADER
 
 #endif