Merge remote-tracking branch 'origin/release' into stable

Change-Id: I02b963a3905fd55b1fc8e1d2204ffaee584eaa56

2 files changed, 28 insertions, 1 deletions

diff --git a/dist/changes-5.1.1 b/dist/changes-5.1.1
new file mode 100644
index 00000000..dc0131cc
--- /dev/null
+++ b/dist/changes-5.1.1
@@ -0,0 +1,25 @@
+Qt 5.1.1 is a bug-fix release. It maintains both forward and backward
+compatibility (source and binary) with Qt 5.1.0.
+
+For more details, refer to the online documentation included in this
+distribution. The documentation is also available online:
+
+  http://qt-project.org/doc/qt-5.1/
+
+The Qt version 5.1 series is binary compatible with the 5.0.x series.
+Applications compiled for 5.0 will continue to run with 5.1.
+
+Some of the changes listed in this file include issue tracking numbers
+corresponding to tasks in the Qt Bug Tracker:
+
+  http://bugreports.qt-project.org/
+
+Each of these identifiers can be entered in the bug tracker to obtain more
+information about a particular change.
+
+
+****************************************************************************
+*                           General                                        *
+****************************************************************************
+
+ - [QTBUG-32108] Freefall gesture needs to be initialized into plugin to be usable
diff --git a/src/imports/sensors/qmlproximitysensor.h b/src/imports/sensors/qmlproximitysensor.h
index 17cb2f9a..78f171a4 100644
--- a/src/imports/sensors/qmlproximitysensor.h
+++ b/src/imports/sensors/qmlproximitysensor.h
@@ -43,7 +43,9 @@
 #define QMLPROXIMITYSENSOR_H
 
 #include "qmlsensor.h"
-
+#ifdef near
+#undef near
+#endif
 QT_BEGIN_NAMESPACE
 
 class QProximitySensor;