diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-10-05 15:20:21 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-10-05 18:09:05 +0000 |
| commit | 00e6ddfccec25bfb6dd3f39e8897cf9baf453b99 (patch) | |
| tree | 0cd374f074b49238aa1de9437b97bdb2a59cc982 /src | |
| parent | d3bfcfaa9ac53885066689d540590035b3bc7976 (diff) | |
| download | qtlocation-00e6ddfccec25bfb6dd3f39e8897cf9baf453b99.tar.gz | |
Fix namespaced build
It is not allowed to include files within Qt namespace.
See 5b99f3a3 in qtbase dev.
Change-Id: Ic86986ebe5d6beafa32c7634ffb1d4631c411bf9
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
Diffstat (limited to 'src')
| -rw-r--r-- | src/imports/location/location.cpp | 4 | ||||
| -rw-r--r-- | src/imports/locationlabs/locationlabs.cpp | 4 | ||||
| -rw-r--r-- | src/imports/positioning/positioning.cpp | 4 | ||||
| -rw-r--r-- | src/location/maps/qgeotilerequestmanager.cpp | 4 | ||||
| -rw-r--r-- | src/plugins/position/corelocation/qgeopositioninfosource_cl.mm | 4 | ||||
| -rw-r--r-- | src/positioning/qgeoshape.cpp | 4 |
6 files changed, 12 insertions, 12 deletions
diff --git a/src/imports/location/location.cpp b/src/imports/location/location.cpp index 2c2331bf..dbedd1de 100644 --- a/src/imports/location/location.cpp +++ b/src/imports/location/location.cpp @@ -212,6 +212,6 @@ public: } }; -#include "location.moc" - QT_END_NAMESPACE + +#include "location.moc" diff --git a/src/imports/locationlabs/locationlabs.cpp b/src/imports/locationlabs/locationlabs.cpp index 6f3b6dd1..fe5ed156 100644 --- a/src/imports/locationlabs/locationlabs.cpp +++ b/src/imports/locationlabs/locationlabs.cpp @@ -83,6 +83,6 @@ public: } }; -#include "locationlabs.moc" - QT_END_NAMESPACE + +#include "locationlabs.moc" diff --git a/src/imports/positioning/positioning.cpp b/src/imports/positioning/positioning.cpp index 08ce384b..21972a5b 100644 --- a/src/imports/positioning/positioning.cpp +++ b/src/imports/positioning/positioning.cpp @@ -621,6 +621,6 @@ public: } }; -#include "positioning.moc" - QT_END_NAMESPACE + +#include "positioning.moc" diff --git a/src/location/maps/qgeotilerequestmanager.cpp b/src/location/maps/qgeotilerequestmanager.cpp index d4d94ad0..aa6de94d 100644 --- a/src/location/maps/qgeotilerequestmanager.cpp +++ b/src/location/maps/qgeotilerequestmanager.cpp @@ -240,6 +240,6 @@ void QGeoTileRequestManagerPrivate::tileError(const QGeoTileSpec &tile, const QS } } -#include "qgeotilerequestmanager.moc" - QT_END_NAMESPACE + +#include "qgeotilerequestmanager.moc" diff --git a/src/plugins/position/corelocation/qgeopositioninfosource_cl.mm b/src/plugins/position/corelocation/qgeopositioninfosource_cl.mm index 993e7501..976ecf0f 100644 --- a/src/plugins/position/corelocation/qgeopositioninfosource_cl.mm +++ b/src/plugins/position/corelocation/qgeopositioninfosource_cl.mm @@ -314,6 +314,6 @@ void QGeoPositionInfoSourceCL::setError(QGeoPositionInfoSource::Error positionEr emit QGeoPositionInfoSource::error(positionError); } -#include "moc_qgeopositioninfosource_cl_p.cpp" - QT_END_NAMESPACE + +#include "moc_qgeopositioninfosource_cl_p.cpp" diff --git a/src/positioning/qgeoshape.cpp b/src/positioning/qgeoshape.cpp index d17f9eea..b1d310af 100644 --- a/src/positioning/qgeoshape.cpp +++ b/src/positioning/qgeoshape.cpp @@ -449,6 +449,6 @@ QDataStream &operator>>(QDataStream &stream, QGeoShape &shape) } #endif -#include "moc_qgeoshape.cpp" - QT_END_NAMESPACE + +#include "moc_qgeoshape.cpp" |