diff options
| author | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-08-05 10:32:11 +0200 |
|---|---|---|
| committer | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-08-05 10:32:11 +0200 |
| commit | 82b88416950c5d7cae82eeca44068fad47567e32 (patch) | |
| tree | d8497021c807c4145af76bacff5177947ce8aaa4 /src/imports | |
| parent | 26c192e6df519db3c8adfd86c41a6768e78aa323 (diff) | |
| parent | 4afdb9965bf4a12e657be202c46cc19c65c8f49d (diff) | |
Merge branch 'stable' into dev
Conflicts:
.qmake.conf
Change-Id: Ifed287670b09398ef659b9420c3e513a699a0944
Diffstat (limited to 'src/imports')
| -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; |