Clean up: move QGeoRouteParserOsrmV4 into OSM plugin

It's only used there. Need to privately export QGeoRouteParserPrivate
for this.

Change-Id: I0342dc31836a9db731f495434b9d4c7dd5973af2
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Ivan Solovev <ivan.solovev@qt.io>

6 files changed, 5 insertions, 5 deletions

diff --git a/src/location/CMakeLists.txt b/src/location/CMakeLists.txt
index 9e3aad36..70a707c4 100644
--- a/src/location/CMakeLists.txt
+++ b/src/location/CMakeLists.txt
@@ -31,7 +31,6 @@ qt_internal_add_module(Location
         maps/qgeoroute.h maps/qgeoroute_p.h maps/qgeoroute.cpp
         maps/qgeoroutesegment.h maps/qgeoroutesegment_p.h maps/qgeoroutesegment.cpp
         maps/qgeorouteparser_p.h maps/qgeorouteparser_p_p.h maps/qgeorouteparser.cpp
-        maps/qgeorouteparserosrmv4_p.h maps/qgeorouteparserosrmv4.cpp
         maps/qgeorouteparserosrmv5_p.h maps/qgeorouteparserosrmv5.cpp
         maps/qgeomaneuver.h maps/qgeomaneuver_p.h maps/qgeomaneuver.cpp
         maps/qgeomappingmanager_p.h maps/qgeomappingmanager_p_p.h maps/qgeomappingmanager.cpp
diff --git a/src/location/maps/qgeorouteparser_p_p.h b/src/location/maps/qgeorouteparser_p_p.h
index f1c9c207..d63cc33f 100644
--- a/src/location/maps/qgeorouteparser_p_p.h
+++ b/src/location/maps/qgeorouteparser_p_p.h
@@ -58,7 +58,7 @@
 
 QT_BEGIN_NAMESPACE
 
-class QGeoRouteParserPrivate :  public QObjectPrivate
+class Q_LOCATION_PRIVATE_EXPORT QGeoRouteParserPrivate :  public QObjectPrivate
 {
     Q_DECLARE_PUBLIC(QGeoRouteParser)
 public:
diff --git a/src/plugins/geoservices/osm/CMakeLists.txt b/src/plugins/geoservices/osm/CMakeLists.txt
index f7f54c78..c35f4480 100644
--- a/src/plugins/geoservices/osm/CMakeLists.txt
+++ b/src/plugins/geoservices/osm/CMakeLists.txt
@@ -17,6 +17,7 @@ qt_internal_add_plugin(QGeoServiceProviderFactoryOsmPlugin
         qgeotiledmaposm.h qgeotiledmaposm.cpp
         qgeofiletilecacheosm.h qgeofiletilecacheosm.cpp
         qgeotileproviderosm.h qgeotileproviderosm.cpp
+        qgeorouteparserosrmv4_p.h qgeorouteparserosrmv4.cpp
     LIBRARIES
         Qt::Core
         Qt::Network
diff --git a/src/location/maps/qgeorouteparserosrmv4.cpp b/src/plugins/geoservices/osm/qgeorouteparserosrmv4.cpp
index a69920aa..d8e162ae 100644
--- a/src/location/maps/qgeorouteparserosrmv4.cpp
+++ b/src/plugins/geoservices/osm/qgeorouteparserosrmv4.cpp
@@ -38,10 +38,10 @@
 ****************************************************************************/
 
 #include "qgeorouteparserosrmv4_p.h"
-#include "qgeorouteparser_p_p.h"
 #include "qgeoroutesegment.h"
 #include "qgeomaneuver.h"
 
+#include <QtLocation/private/qgeorouteparser_p_p.h>
 #include <QtCore/private/qobject_p.h>
 #include <QtCore/QJsonDocument>
 #include <QtCore/QJsonObject>
diff --git a/src/location/maps/qgeorouteparserosrmv4_p.h b/src/plugins/geoservices/osm/qgeorouteparserosrmv4_p.h
index 918766b2..fde2e759 100644
--- a/src/location/maps/qgeorouteparserosrmv4_p.h
+++ b/src/plugins/geoservices/osm/qgeorouteparserosrmv4_p.h
@@ -57,7 +57,7 @@
 QT_BEGIN_NAMESPACE
 
 class QGeoRouteParserOsrmV4Private;
-class Q_LOCATION_PRIVATE_EXPORT QGeoRouteParserOsrmV4 : public QGeoRouteParser
+class QGeoRouteParserOsrmV4 : public QGeoRouteParser
 {
     Q_OBJECT
     Q_DECLARE_PRIVATE(QGeoRouteParserOsrmV4)
diff --git a/src/plugins/geoservices/osm/qgeoroutingmanagerengineosm.cpp b/src/plugins/geoservices/osm/qgeoroutingmanagerengineosm.cpp
index 3bbe6576..680a2b72 100644
--- a/src/plugins/geoservices/osm/qgeoroutingmanagerengineosm.cpp
+++ b/src/plugins/geoservices/osm/qgeoroutingmanagerengineosm.cpp
@@ -39,7 +39,7 @@
 
 #include "qgeoroutingmanagerengineosm.h"
 #include "qgeoroutereplyosm.h"
-#include "QtLocation/private/qgeorouteparserosrmv4_p.h"
+#include "qgeorouteparserosrmv4_p.h"
 #include "QtLocation/private/qgeorouteparserosrmv5_p.h"
 
 #include <QtCore/QUrlQuery>