From 43373f86d29dcff79f76fb728518f4ad7010a543 Mon Sep 17 00:00:00 2001 From: Andy Shaw Date: Tue, 23 Jul 2013 09:27:57 +0200 Subject: Undefine near if it is already defined to prevent a build issue In some Windows Embedded 7 SDKs near is still defined, so we need to undefine it in those cases. Task-number: QTBUG-32571 Change-Id: I0d48b9dafa2af31f88f48746bfcf4df9fe824554 Reviewed-by: Lorn Potter --- src/imports/sensors/qmlproximitysensor.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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; -- cgit v1.2.3 From 0e86de52c22cef74a6d0536d985a2a047051c0d8 Mon Sep 17 00:00:00 2001 From: Sergio Ahumada Date: Mon, 22 Jul 2013 13:35:37 +0200 Subject: Add changes-5.1.1 file Change-Id: I6bcc56af5bd19e1e6a9c15719e310461bc8dc1fd Reviewed-by: Lorn Potter --- dist/changes-5.1.1 | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 dist/changes-5.1.1 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 -- cgit v1.2.3