diff options
author | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-07-26 21:52:31 +0200 |
---|---|---|
committer | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-07-26 21:52:31 +0200 |
commit | a477928c43d7207cbc77a1d233ecb41ef4f5fe51 (patch) | |
tree | 0c6a0faa7ec43386d7faaa9d6d4af1753a6dc795 | |
parent | 708b8ba9a2b7cdcda958b2c3cac8344f0ec3f3d0 (diff) | |
parent | 0e86de52c22cef74a6d0536d985a2a047051c0d8 (diff) |
Merge remote-tracking branch 'origin/release' into stable
Change-Id: I02b963a3905fd55b1fc8e1d2204ffaee584eaa56
-rw-r--r-- | dist/changes-5.1.1 | 25 | ||||
-rw-r--r-- | src/imports/sensors/qmlproximitysensor.h | 4 |
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; |