Reorganize code for map items into separate folder

Splitting the code that only provides declarative wrappers around types
from the implementations of the map and item rendering makes it easier
to work with the code base and identify dependencies.

Change-Id: I00064f928043dfa77f22e68b1efe54f414cb62f7
Reviewed-by: Ivan Solovev <ivan.solovev@qt.io>

43 files changed, 43 insertions, 43 deletions

diff --git a/src/location/CMakeLists.txt b/src/location/CMakeLists.txt
index 886a804f..1e0a20cd 100644
--- a/src/location/CMakeLists.txt
+++ b/src/location/CMakeLists.txt
@@ -71,47 +71,46 @@ qt_internal_add_module(Location
         places/qplaceratings.h places/qplaceratings_p.h places/qplaceratings.cpp
         places/qplacecontactdetail.h places/qplacecontactdetail_p.h places/qplacecontactdetail.cpp
         places/qplacecontent.h places/qplacecontent_p.h places/qplacecontent.cpp
-        declarativemaps/qdeclarativegeomapitembase_p.h
-        declarativemaps/qdeclarativegeomapitembase.cpp
-        declarativemaps/qdeclarativegeomap_p.h declarativemaps/qdeclarativegeomap.cpp
-        declarativemaps/qdeclarativegeomapitemtransitionmanager_p.h
-        declarativemaps/qdeclarativegeomapitemtransitionmanager.cpp
-        declarativemaps/qquickgeomapgesturearea_p.h declarativemaps/qquickgeomapgesturearea.cpp
-        declarativemaps/qdeclarativegeomapitemgroup_p.h
-        declarativemaps/qdeclarativegeomapitemgroup.cpp
-        declarativemaps/qdeclarativegeomapquickitem_p.h
-        declarativemaps/qdeclarativegeomapquickitem.cpp
-        declarativemaps/qdeclarativegeomapcopyrightsnotice_p.h
-        declarativemaps/qdeclarativegeomapcopyrightsnotice.cpp
         declarativemaps/qdeclarativegeoserviceprovider_p.h
         declarativemaps/qdeclarativegeoserviceprovider.cpp
         declarativemaps/qdeclarativegeomapparameter_p.h
         declarativemaps/qdeclarativegeomapparameter.cpp
-        declarativemaps/qdeclarativegeomapitemview_p.h
-        declarativemaps/qdeclarativegeomapitemview.cpp
         declarativemaps/qgeomapobject_p.h declarativemaps/qgeomapobject_p_p.h
         declarativemaps/qgeomapobject.cpp
         declarativemaps/qparameterizableobject_p.h declarativemaps/qparameterizableobject.cpp
-        declarativemaps/qdeclarativegeomapitemutils.cpp
-        declarativemaps/qdeclarativegeomapitemutils_p.h
-        declarativemaps/qdeclarativepolylinemapitem.cpp
-        declarativemaps/qdeclarativepolylinemapitem_p.h
-        declarativemaps/qdeclarativepolylinemapitem_p_p.h
         declarativemaps/error_messages.cpp declarativemaps/error_messages_p.h
-        declarativemaps/qdeclarativerectanglemapitem.cpp
-        declarativemaps/qdeclarativerectanglemapitem_p.h
-        declarativemaps/qdeclarativerectanglemapitem_p_p.h
-        declarativemaps/qdeclarativecirclemapitem.cpp declarativemaps/qdeclarativecirclemapitem_p.h
-        declarativemaps/qdeclarativecirclemapitem_p_p.h
-        declarativemaps/qdeclarativeroutemapitem.cpp declarativemaps/qdeclarativeroutemapitem_p.h
         declarativemaps/qdeclarativegeocodemodel.cpp declarativemaps/qdeclarativegeocodemodel_p.h
-        declarativemaps/qgeomapitemgeometry.cpp declarativemaps/qgeomapitemgeometry_p.h
-        declarativemaps/qdeclarativepolygonmapitem.cpp
-        declarativemaps/qdeclarativepolygonmapitem_p.h
-        declarativemaps/qdeclarativepolygonmapitem_p_p.h
         declarativemaps/qdeclarativegeoroute.cpp declarativemaps/qdeclarativegeoroute_p.h
         declarativemaps/qdeclarativegeoroutemodel.cpp declarativemaps/qdeclarativegeoroutemodel_p.h
-        declarativemaps/qgeosimplify.cpp declarativemaps/qgeosimplify_p.h
+        quickmapitems/qgeomapitemgeometry.cpp quickmapitems/qgeomapitemgeometry_p.h
+        quickmapitems/qdeclarativegeomap_p.h quickmapitems/qdeclarativegeomap.cpp
+        quickmapitems/qdeclarativegeomapitembase_p.h
+        quickmapitems/qdeclarativegeomapitembase.cpp
+        quickmapitems/qdeclarativegeomapitemview_p.h
+        quickmapitems/qdeclarativegeomapitemview.cpp
+        quickmapitems/qgeosimplify.cpp quickmapitems/qgeosimplify_p.h
+        quickmapitems/qdeclarativegeomapitemutils.cpp quickmapitems/qdeclarativegeomapitemutils_p.h
+        quickmapitems/qdeclarativegeomapquickitem_p.h
+        quickmapitems/qdeclarativegeomapquickitem.cpp
+        quickmapitems/qdeclarativegeomapitemgroup_p.h
+        quickmapitems/qdeclarativegeomapitemgroup.cpp
+        quickmapitems/qdeclarativepolygonmapitem.cpp
+        quickmapitems/qdeclarativepolygonmapitem_p.h
+        quickmapitems/qdeclarativepolygonmapitem_p_p.h
+        quickmapitems/qdeclarativepolylinemapitem.cpp
+        quickmapitems/qdeclarativepolylinemapitem_p.h
+        quickmapitems/qdeclarativepolylinemapitem_p_p.h
+        quickmapitems/qdeclarativerectanglemapitem.cpp
+        quickmapitems/qdeclarativerectanglemapitem_p.h
+        quickmapitems/qdeclarativerectanglemapitem_p_p.h
+        quickmapitems/qdeclarativecirclemapitem.cpp quickmapitems/qdeclarativecirclemapitem_p.h
+        quickmapitems/qdeclarativecirclemapitem_p_p.h
+        quickmapitems/qdeclarativeroutemapitem.cpp quickmapitems/qdeclarativeroutemapitem_p.h
+        quickmapitems/qquickgeomapgesturearea_p.h quickmapitems/qquickgeomapgesturearea.cpp
+        quickmapitems/qdeclarativegeomapcopyrightsnotice_p.h
+        quickmapitems/qdeclarativegeomapcopyrightsnotice.cpp
+        quickmapitems/qdeclarativegeomapitemtransitionmanager_p.h
+        quickmapitems/qdeclarativegeomapitemtransitionmanager.cpp
         declarativeplaces/qdeclarativecategory.cpp
         declarativeplaces/qdeclarativecategory_p.h
         declarativeplaces/qdeclarativecontactdetails.cpp
@@ -133,6 +132,7 @@ qt_internal_add_module(Location
         places
         declarativemaps
         declarativeplaces
+        quickmapitems
         ../3rdparty/earcut
     LIBRARIES
         Qt::CorePrivate
@@ -183,14 +183,14 @@ qt_internal_add_shaders(Location "declarative_location_shaders"
     PRECOMPILE
     OPTIMIZED
     PREFIX
-        "/location/declarativemaps"
+        "/location"
     FILES
-        "declarativemaps/shaders/polyline_linestrip.vert"
-        "declarativemaps/shaders/polyline_linestrip.frag"
-        "declarativemaps/shaders/polyline_extruded.vert"
-        "declarativemaps/shaders/polyline_extruded.frag"
-        "declarativemaps/shaders/polygon.vert"
-        "declarativemaps/shaders/polygon.frag"
+        "quickmapitems/shaders/polyline_linestrip.vert"
+        "quickmapitems/shaders/polyline_linestrip.frag"
+        "quickmapitems/shaders/polyline_extruded.vert"
+        "quickmapitems/shaders/polyline_extruded.frag"
+        "quickmapitems/shaders/polygon.vert"
+        "quickmapitems/shaders/polygon.frag"
 )
 
 qt_internal_add_docs(Location
diff --git a/src/location/declarativemaps/qdeclarativecirclemapitem.cpp b/src/location/quickmapitems/qdeclarativecirclemapitem.cpp
index 2bec3455..2bec3455 100644
--- a/src/location/declarativemaps/qdeclarativecirclemapitem.cpp
+++ b/src/location/quickmapitems/qdeclarativecirclemapitem.cpp
diff --git a/src/location/declarativemaps/qdeclarativecirclemapitem_p.h b/src/location/quickmapitems/qdeclarativecirclemapitem_p.h
index fbbe39a7..fbbe39a7 100644
--- a/src/location/declarativemaps/qdeclarativecirclemapitem_p.h
+++ b/src/location/quickmapitems/qdeclarativecirclemapitem_p.h
diff --git a/src/location/declarativemaps/qdeclarativecirclemapitem_p_p.h b/src/location/quickmapitems/qdeclarativecirclemapitem_p_p.h
index 2810eb5d..2810eb5d 100644
--- a/src/location/declarativemaps/qdeclarativecirclemapitem_p_p.h
+++ b/src/location/quickmapitems/qdeclarativecirclemapitem_p_p.h
diff --git a/src/location/declarativemaps/qdeclarativegeomap.cpp b/src/location/quickmapitems/qdeclarativegeomap.cpp
index 0823772c..0823772c 100644
--- a/src/location/declarativemaps/qdeclarativegeomap.cpp
+++ b/src/location/quickmapitems/qdeclarativegeomap.cpp
diff --git a/src/location/declarativemaps/qdeclarativegeomap_p.h b/src/location/quickmapitems/qdeclarativegeomap_p.h
index 03ca7194..03ca7194 100644
--- a/src/location/declarativemaps/qdeclarativegeomap_p.h
+++ b/src/location/quickmapitems/qdeclarativegeomap_p.h
diff --git a/src/location/declarativemaps/qdeclarativegeomapcopyrightsnotice.cpp b/src/location/quickmapitems/qdeclarativegeomapcopyrightsnotice.cpp
index 725ff20d..725ff20d 100644
--- a/src/location/declarativemaps/qdeclarativegeomapcopyrightsnotice.cpp
+++ b/src/location/quickmapitems/qdeclarativegeomapcopyrightsnotice.cpp
diff --git a/src/location/declarativemaps/qdeclarativegeomapcopyrightsnotice_p.h b/src/location/quickmapitems/qdeclarativegeomapcopyrightsnotice_p.h
index 7e4c9957..7e4c9957 100644
--- a/src/location/declarativemaps/qdeclarativegeomapcopyrightsnotice_p.h
+++ b/src/location/quickmapitems/qdeclarativegeomapcopyrightsnotice_p.h
diff --git a/src/location/declarativemaps/qdeclarativegeomapitembase.cpp b/src/location/quickmapitems/qdeclarativegeomapitembase.cpp
index 3767351c..3767351c 100644
--- a/src/location/declarativemaps/qdeclarativegeomapitembase.cpp
+++ b/src/location/quickmapitems/qdeclarativegeomapitembase.cpp
diff --git a/src/location/declarativemaps/qdeclarativegeomapitembase_p.h b/src/location/quickmapitems/qdeclarativegeomapitembase_p.h
index 8031a204..8031a204 100644
--- a/src/location/declarativemaps/qdeclarativegeomapitembase_p.h
+++ b/src/location/quickmapitems/qdeclarativegeomapitembase_p.h
diff --git a/src/location/declarativemaps/qdeclarativegeomapitemgroup.cpp b/src/location/quickmapitems/qdeclarativegeomapitemgroup.cpp
index fde79f85..fde79f85 100644
--- a/src/location/declarativemaps/qdeclarativegeomapitemgroup.cpp
+++ b/src/location/quickmapitems/qdeclarativegeomapitemgroup.cpp
diff --git a/src/location/declarativemaps/qdeclarativegeomapitemgroup_p.h b/src/location/quickmapitems/qdeclarativegeomapitemgroup_p.h
index c3e997ad..c3e997ad 100644
--- a/src/location/declarativemaps/qdeclarativegeomapitemgroup_p.h
+++ b/src/location/quickmapitems/qdeclarativegeomapitemgroup_p.h
diff --git a/src/location/declarativemaps/qdeclarativegeomapitemtransitionmanager.cpp b/src/location/quickmapitems/qdeclarativegeomapitemtransitionmanager.cpp
index 5b307e87..5b307e87 100644
--- a/src/location/declarativemaps/qdeclarativegeomapitemtransitionmanager.cpp
+++ b/src/location/quickmapitems/qdeclarativegeomapitemtransitionmanager.cpp
diff --git a/src/location/declarativemaps/qdeclarativegeomapitemtransitionmanager_p.h b/src/location/quickmapitems/qdeclarativegeomapitemtransitionmanager_p.h
index 53eec2b2..53eec2b2 100644
--- a/src/location/declarativemaps/qdeclarativegeomapitemtransitionmanager_p.h
+++ b/src/location/quickmapitems/qdeclarativegeomapitemtransitionmanager_p.h
diff --git a/src/location/declarativemaps/qdeclarativegeomapitemutils.cpp b/src/location/quickmapitems/qdeclarativegeomapitemutils.cpp
index db5189ee..db5189ee 100644
--- a/src/location/declarativemaps/qdeclarativegeomapitemutils.cpp
+++ b/src/location/quickmapitems/qdeclarativegeomapitemutils.cpp
diff --git a/src/location/declarativemaps/qdeclarativegeomapitemutils_p.h b/src/location/quickmapitems/qdeclarativegeomapitemutils_p.h
index 8b636ff7..8b636ff7 100644
--- a/src/location/declarativemaps/qdeclarativegeomapitemutils_p.h
+++ b/src/location/quickmapitems/qdeclarativegeomapitemutils_p.h
diff --git a/src/location/declarativemaps/qdeclarativegeomapitemview.cpp b/src/location/quickmapitems/qdeclarativegeomapitemview.cpp
index 27527d35..27527d35 100644
--- a/src/location/declarativemaps/qdeclarativegeomapitemview.cpp
+++ b/src/location/quickmapitems/qdeclarativegeomapitemview.cpp
diff --git a/src/location/declarativemaps/qdeclarativegeomapitemview_p.h b/src/location/quickmapitems/qdeclarativegeomapitemview_p.h
index 25c54d48..25c54d48 100644
--- a/src/location/declarativemaps/qdeclarativegeomapitemview_p.h
+++ b/src/location/quickmapitems/qdeclarativegeomapitemview_p.h
diff --git a/src/location/declarativemaps/qdeclarativegeomapquickitem.cpp b/src/location/quickmapitems/qdeclarativegeomapquickitem.cpp
index 59c770d5..59c770d5 100644
--- a/src/location/declarativemaps/qdeclarativegeomapquickitem.cpp
+++ b/src/location/quickmapitems/qdeclarativegeomapquickitem.cpp
diff --git a/src/location/declarativemaps/qdeclarativegeomapquickitem_p.h b/src/location/quickmapitems/qdeclarativegeomapquickitem_p.h
index b8e093af..b8e093af 100644
--- a/src/location/declarativemaps/qdeclarativegeomapquickitem_p.h
+++ b/src/location/quickmapitems/qdeclarativegeomapquickitem_p.h
diff --git a/src/location/declarativemaps/qdeclarativepolygonmapitem.cpp b/src/location/quickmapitems/qdeclarativepolygonmapitem.cpp
index dabd9714..62e8ac6f 100644
--- a/src/location/declarativemaps/qdeclarativepolygonmapitem.cpp
+++ b/src/location/quickmapitems/qdeclarativepolygonmapitem.cpp
@@ -1004,8 +1004,8 @@ void MapPolygonNodeGL::update(const QColor &fillColor,
 
 MapPolygonShader::MapPolygonShader() : QSGMaterialShader(*new QSGMaterialShaderPrivate(this))
 {
-    setShaderFileName(VertexStage, QLatin1String(":/location/declarativemaps/declarativemaps/shaders/polygon.vert.qsb"));
-    setShaderFileName(FragmentStage, QLatin1String(":/location/declarativemaps/declarativemaps/shaders/polygon.frag.qsb"));
+    setShaderFileName(VertexStage, QLatin1String(":/location/quickmapitems/shaders/polygon.vert.qsb"));
+    setShaderFileName(FragmentStage, QLatin1String(":/location/quickmapitems/shaders/polygon.frag.qsb"));
 }
 
 bool MapPolygonShader::updateUniformData(RenderState &state, QSGMaterial *newEffect, QSGMaterial *oldEffect)
diff --git a/src/location/declarativemaps/qdeclarativepolygonmapitem_p.h b/src/location/quickmapitems/qdeclarativepolygonmapitem_p.h
index d388c007..d388c007 100644
--- a/src/location/declarativemaps/qdeclarativepolygonmapitem_p.h
+++ b/src/location/quickmapitems/qdeclarativepolygonmapitem_p.h
diff --git a/src/location/declarativemaps/qdeclarativepolygonmapitem_p_p.h b/src/location/quickmapitems/qdeclarativepolygonmapitem_p_p.h
index cbea7971..cbea7971 100644
--- a/src/location/declarativemaps/qdeclarativepolygonmapitem_p_p.h
+++ b/src/location/quickmapitems/qdeclarativepolygonmapitem_p_p.h
diff --git a/src/location/declarativemaps/qdeclarativepolylinemapitem.cpp b/src/location/quickmapitems/qdeclarativepolylinemapitem.cpp
index 784e0146..3e1f89f4 100644
--- a/src/location/declarativemaps/qdeclarativepolylinemapitem.cpp
+++ b/src/location/quickmapitems/qdeclarativepolylinemapitem.cpp
@@ -1497,8 +1497,8 @@ void MapPolylineNodeOpenGLLineStrip::update(const QColor &fillColor,
 
 MapPolylineShaderLineStrip::MapPolylineShaderLineStrip() : QSGMaterialShader(*new QSGMaterialShaderPrivate(this))
 {
-    setShaderFileName(VertexStage, QLatin1String(":/location/declarativemaps/declarativemaps/shaders/polyline_linestrip.vert.qsb"));
-    setShaderFileName(FragmentStage, QLatin1String(":/location/declarativemaps/declarativemaps/shaders/polyline_linestrip.frag.qsb"));
+    setShaderFileName(VertexStage, QLatin1String(":/location/quickmapitems/shaders/polyline_linestrip.vert.qsb"));
+    setShaderFileName(FragmentStage, QLatin1String(":/location/quickmapitems/shaders/polyline_linestrip.frag.qsb"));
 }
 
 bool MapPolylineShaderLineStrip::updateUniformData(QSGMaterialShader::RenderState &state, QSGMaterial *newEffect, QSGMaterial *oldEffect)
@@ -1731,8 +1731,8 @@ MapPolylineShaderExtruded::MapPolylineShaderExtruded() : QSGMaterialShader(*new
 {
     // Heavily adapted from https://github.com/mattdesl/webgl-lines/blob/master/projected/vert.glsl,
     // that is (c) Matt DesLauriers, and released under the MIT license.
-    setShaderFileName(VertexStage, QLatin1String(":/location/declarativemaps/declarativemaps/shaders/polyline_extruded.vert.qsb"));
-    setShaderFileName(FragmentStage, QLatin1String(":/location/declarativemaps/declarativemaps/shaders/polyline_extruded.frag.qsb"));
+    setShaderFileName(VertexStage, QLatin1String(":/location/quickmapitems/shaders/polyline_extruded.vert.qsb"));
+    setShaderFileName(FragmentStage, QLatin1String(":/location/quickmapitems/shaders/polyline_extruded.frag.qsb"));
 }
 
 bool MapPolylineShaderExtruded::updateUniformData(QSGMaterialShader::RenderState &state, QSGMaterial *newEffect, QSGMaterial *oldEffect)
diff --git a/src/location/declarativemaps/qdeclarativepolylinemapitem_p.h b/src/location/quickmapitems/qdeclarativepolylinemapitem_p.h
index 0f52aaaa..0f52aaaa 100644
--- a/src/location/declarativemaps/qdeclarativepolylinemapitem_p.h
+++ b/src/location/quickmapitems/qdeclarativepolylinemapitem_p.h
diff --git a/src/location/declarativemaps/qdeclarativepolylinemapitem_p_p.h b/src/location/quickmapitems/qdeclarativepolylinemapitem_p_p.h
index 50a1561b..50a1561b 100644
--- a/src/location/declarativemaps/qdeclarativepolylinemapitem_p_p.h
+++ b/src/location/quickmapitems/qdeclarativepolylinemapitem_p_p.h
diff --git a/src/location/declarativemaps/qdeclarativerectanglemapitem.cpp b/src/location/quickmapitems/qdeclarativerectanglemapitem.cpp
index b7d01150..b7d01150 100644
--- a/src/location/declarativemaps/qdeclarativerectanglemapitem.cpp
+++ b/src/location/quickmapitems/qdeclarativerectanglemapitem.cpp
diff --git a/src/location/declarativemaps/qdeclarativerectanglemapitem_p.h b/src/location/quickmapitems/qdeclarativerectanglemapitem_p.h
index 968b9f21..968b9f21 100644
--- a/src/location/declarativemaps/qdeclarativerectanglemapitem_p.h
+++ b/src/location/quickmapitems/qdeclarativerectanglemapitem_p.h
diff --git a/src/location/declarativemaps/qdeclarativerectanglemapitem_p_p.h b/src/location/quickmapitems/qdeclarativerectanglemapitem_p_p.h
index 09d8b3d2..09d8b3d2 100644
--- a/src/location/declarativemaps/qdeclarativerectanglemapitem_p_p.h
+++ b/src/location/quickmapitems/qdeclarativerectanglemapitem_p_p.h
diff --git a/src/location/declarativemaps/qdeclarativeroutemapitem.cpp b/src/location/quickmapitems/qdeclarativeroutemapitem.cpp
index 2d013e1a..2d013e1a 100644
--- a/src/location/declarativemaps/qdeclarativeroutemapitem.cpp
+++ b/src/location/quickmapitems/qdeclarativeroutemapitem.cpp
diff --git a/src/location/declarativemaps/qdeclarativeroutemapitem_p.h b/src/location/quickmapitems/qdeclarativeroutemapitem_p.h
index 94cc844a..94cc844a 100644
--- a/src/location/declarativemaps/qdeclarativeroutemapitem_p.h
+++ b/src/location/quickmapitems/qdeclarativeroutemapitem_p.h
diff --git a/src/location/declarativemaps/qgeomapitemgeometry.cpp b/src/location/quickmapitems/qgeomapitemgeometry.cpp
index 60ff4eec..60ff4eec 100644
--- a/src/location/declarativemaps/qgeomapitemgeometry.cpp
+++ b/src/location/quickmapitems/qgeomapitemgeometry.cpp
diff --git a/src/location/declarativemaps/qgeomapitemgeometry_p.h b/src/location/quickmapitems/qgeomapitemgeometry_p.h
index b6c4a515..b6c4a515 100644
--- a/src/location/declarativemaps/qgeomapitemgeometry_p.h
+++ b/src/location/quickmapitems/qgeomapitemgeometry_p.h
diff --git a/src/location/declarativemaps/qgeosimplify.cpp b/src/location/quickmapitems/qgeosimplify.cpp
index ad5a3c5d..ad5a3c5d 100644
--- a/src/location/declarativemaps/qgeosimplify.cpp
+++ b/src/location/quickmapitems/qgeosimplify.cpp
diff --git a/src/location/declarativemaps/qgeosimplify_p.h b/src/location/quickmapitems/qgeosimplify_p.h
index 1f5c9783..1f5c9783 100644
--- a/src/location/declarativemaps/qgeosimplify_p.h
+++ b/src/location/quickmapitems/qgeosimplify_p.h
diff --git a/src/location/declarativemaps/qquickgeomapgesturearea.cpp b/src/location/quickmapitems/qquickgeomapgesturearea.cpp
index c5547278..c5547278 100644
--- a/src/location/declarativemaps/qquickgeomapgesturearea.cpp
+++ b/src/location/quickmapitems/qquickgeomapgesturearea.cpp
diff --git a/src/location/declarativemaps/qquickgeomapgesturearea_p.h b/src/location/quickmapitems/qquickgeomapgesturearea_p.h
index e8735761..e8735761 100644
--- a/src/location/declarativemaps/qquickgeomapgesturearea_p.h
+++ b/src/location/quickmapitems/qquickgeomapgesturearea_p.h
diff --git a/src/location/declarativemaps/shaders/polygon.frag b/src/location/quickmapitems/shaders/polygon.frag
index 9b9727b6..9b9727b6 100644
--- a/src/location/declarativemaps/shaders/polygon.frag
+++ b/src/location/quickmapitems/shaders/polygon.frag
diff --git a/src/location/declarativemaps/shaders/polygon.vert b/src/location/quickmapitems/shaders/polygon.vert
index 06dab03e..06dab03e 100644
--- a/src/location/declarativemaps/shaders/polygon.vert
+++ b/src/location/quickmapitems/shaders/polygon.vert
diff --git a/src/location/declarativemaps/shaders/polyline_extruded.frag b/src/location/quickmapitems/shaders/polyline_extruded.frag
index 3530f093..3530f093 100644
--- a/src/location/declarativemaps/shaders/polyline_extruded.frag
+++ b/src/location/quickmapitems/shaders/polyline_extruded.frag
diff --git a/src/location/declarativemaps/shaders/polyline_extruded.vert b/src/location/quickmapitems/shaders/polyline_extruded.vert
index 27b69b60..27b69b60 100644
--- a/src/location/declarativemaps/shaders/polyline_extruded.vert
+++ b/src/location/quickmapitems/shaders/polyline_extruded.vert
diff --git a/src/location/declarativemaps/shaders/polyline_linestrip.frag b/src/location/quickmapitems/shaders/polyline_linestrip.frag
index e9124d27..e9124d27 100644
--- a/src/location/declarativemaps/shaders/polyline_linestrip.frag
+++ b/src/location/quickmapitems/shaders/polyline_linestrip.frag
diff --git a/src/location/declarativemaps/shaders/polyline_linestrip.vert b/src/location/quickmapitems/shaders/polyline_linestrip.vert
index 86b4f3a3..86b4f3a3 100644
--- a/src/location/declarativemaps/shaders/polyline_linestrip.vert
+++ b/src/location/quickmapitems/shaders/polyline_linestrip.vert