diff options
| author | Aaron McCarthy <aaron.mccarthy@nokia.com> | 2011-07-13 15:47:08 +1000 |
|---|---|---|
| committer | Aaron McCarthy <aaron.mccarthy@nokia.com> | 2011-07-13 16:34:34 +1000 |
| commit | bebaf4b6411b0729f73ed977798e4024bdb562ac (patch) | |
| tree | a04686679cf5f63892d610d66b8e35a5e4d5200e /src/location/maps/qgeoserviceproviderfactory.cpp | |
| parent | 31b9ab4141bfc5b2c548e8385d91c90944c91f63 (diff) | |
| parent | 47db4be971b687c74d40b798c400c8ca99147aed (diff) | |
| download | qtlocation-bebaf4b6411b0729f73ed977798e4024bdb562ac.tar.gz | |
Merge remote branch 'origin/master' into places-base
Conflicts:
examples/declarative/mapviewer/mapviewer.qml
src/location/maps/qgeosearchmanager.h
src/location/maps/qgeosearchmanager_p.h
Change-Id: I7ae2e6b1b748cd8eee3a5cc7520a956a1fcde0cd
Diffstat (limited to 'src/location/maps/qgeoserviceproviderfactory.cpp')
| -rw-r--r-- | src/location/maps/qgeoserviceproviderfactory.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/location/maps/qgeoserviceproviderfactory.cpp b/src/location/maps/qgeoserviceproviderfactory.cpp index a2e7f03b..6c8fe013 100644 --- a/src/location/maps/qgeoserviceproviderfactory.cpp +++ b/src/location/maps/qgeoserviceproviderfactory.cpp @@ -41,7 +41,7 @@ #include "qgeoserviceproviderfactory.h" -QTM_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE /*! \class QGeoServiceProviderFactory @@ -160,4 +160,4 @@ QGeoRoutingManagerEngine* QGeoServiceProviderFactory::createRoutingManagerEngine return 0; } -QTM_END_NAMESPACE +QT_END_NAMESPACE |