diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-12-04 03:03:52 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-12-04 03:03:52 +0100 |
| commit | 80bc1ba061dd0ac2138085176fed3af8b8027f46 (patch) | |
| tree | 89543eb94481c28ca363587354ee099948e6afbb | |
| parent | 9d7810aac08beeb73aa968ed6426ee5cdcda4b35 (diff) | |
| parent | f0c13a29a023c3ab42e4a514eea52585896c1c9e (diff) | |
Merge remote-tracking branch 'origin/5.12' into dev
Change-Id: Ibfc32051293768600890a744df4b41a8a56558f3
| -rw-r--r-- | src/sensors/qirproximitysensor.cpp | 3 | ||||
| -rw-r--r-- | src/sensors/qsensorplugin.cpp | 4 |
2 files changed, 7 insertions, 0 deletions
diff --git a/src/sensors/qirproximitysensor.cpp b/src/sensors/qirproximitysensor.cpp index cb257351..2be5a43a 100644 --- a/src/sensors/qirproximitysensor.cpp +++ b/src/sensors/qirproximitysensor.cpp @@ -40,6 +40,8 @@ #include <qirproximitysensor.h> #include "qirproximitysensor_p.h" +QT_BEGIN_NAMESPACE + IMPLEMENT_READING(QIRProximityReading) /*! @@ -166,4 +168,5 @@ QIRProximityReading *QIRProximitySensor::reading() const return static_cast<QIRProximityReading*>(QSensor::reading()); } +QT_END_NAMESPACE #include "moc_qirproximitysensor.cpp" diff --git a/src/sensors/qsensorplugin.cpp b/src/sensors/qsensorplugin.cpp index e7ed785b..186539b7 100644 --- a/src/sensors/qsensorplugin.cpp +++ b/src/sensors/qsensorplugin.cpp @@ -39,6 +39,8 @@ #include "qsensorplugin.h" +QT_BEGIN_NAMESPACE + /*! \class QSensorPluginInterface \ingroup sensors_backend @@ -99,3 +101,5 @@ QSensorChangesInterface::~QSensorChangesInterface() \sa {Creating a sensor plugin} */ + +QT_END_NAMESPACE |