From 43373f86d29dcff79f76fb728518f4ad7010a543 Mon Sep 17 00:00:00 2001
From: Andy Shaw <andy.shaw@digia.com>
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 <lorn.potter@jollamobile.com>
---
 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