diff options
| author | Andy Shaw <andy.shaw@digia.com> | 2013-07-23 09:27:57 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-07-23 11:31:08 +0200 |
| commit | 43373f86d29dcff79f76fb728518f4ad7010a543 (patch) | |
| tree | b1a3f706bd95da630fae5bc001a1369876c2242a /src | |
| parent | 0862901b142f36e91b98dbdcb2c36585020bb33d (diff) | |
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>
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; |