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 /src | |
| parent | 708b8ba9a2b7cdcda958b2c3cac8344f0ec3f3d0 (diff) | |
| parent | 0e86de52c22cef74a6d0536d985a2a047051c0d8 (diff) | |
Merge remote-tracking branch 'origin/release' into stable
Change-Id: I02b963a3905fd55b1fc8e1d2204ffaee584eaa56
Diffstat (limited to 'src')
| -rw-r--r-- | src/imports/sensors/qmlproximitysensor.h | 4 |
1 files changed, 3 insertions, 1 deletions
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; |