From 2a05e3206af01b7edc05e154a71dfd7e6c44c6f0 Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@qt.io>
Date: Tue, 7 Mar 2023 13:25:26 +0100
Subject: Examples: Fix qmake build

Fix the resources and remove C++ 11.

Pick-to: 6.5 6.5.0
Change-Id: I1141594eae239b32b3c00663f2e0d78ec00421fd
Reviewed-by: Matthias Rauter <matthias.rauter@qt.io>
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
---
 examples/location/geojson_viewer/geojson_viewer.pro             | 1 -
 examples/location/geojson_viewer/qml.qrc                        | 4 ++++
 examples/location/itemview_transitions/itemview_transitions.pro | 2 --
 examples/location/mapviewer/mapviewer.pro                       | 1 -
 examples/location/mapviewer/mapviewer.qrc                       | 1 -
 5 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/examples/location/geojson_viewer/geojson_viewer.pro b/examples/location/geojson_viewer/geojson_viewer.pro
index 78a877a9..7327d25e 100644
--- a/examples/location/geojson_viewer/geojson_viewer.pro
+++ b/examples/location/geojson_viewer/geojson_viewer.pro
@@ -5,7 +5,6 @@ QT += core qml network quick positioning location-private
 android: QT += core-private
 
 SOURCES += main.cpp
-CONFIG += c++11
 CONFIG += install_ok
 
 QT_FOR_CONFIG += location-private
diff --git a/examples/location/geojson_viewer/qml.qrc b/examples/location/geojson_viewer/qml.qrc
index ea443bb0..189327d2 100644
--- a/examples/location/geojson_viewer/qml.qrc
+++ b/examples/location/geojson_viewer/qml.qrc
@@ -2,5 +2,9 @@
     <qresource prefix="/">
         <file>main.qml</file>
         <file>GeoJsonDelegate.qml</file>
+        <file>mapitems/CircleItem.qml</file>
+        <file>mapitems/PolygonItem.qml</file>
+        <file>mapitems/PolylineItem.qml</file>
+        <file>mapitems/RectangleItem.qml</file>
     </qresource>
 </RCC>
diff --git a/examples/location/itemview_transitions/itemview_transitions.pro b/examples/location/itemview_transitions/itemview_transitions.pro
index 15f52076..80a6800b 100644
--- a/examples/location/itemview_transitions/itemview_transitions.pro
+++ b/examples/location/itemview_transitions/itemview_transitions.pro
@@ -2,8 +2,6 @@ TEMPLATE = app
 
 QT += qml quick location
 
-CONFIG += c++11
-
 SOURCES += main.cpp
 
 qmlfiles.files = $$files($$PWD/*.qml)
diff --git a/examples/location/mapviewer/mapviewer.pro b/examples/location/mapviewer/mapviewer.pro
index 1013eee9..4118aa87 100644
--- a/examples/location/mapviewer/mapviewer.pro
+++ b/examples/location/mapviewer/mapviewer.pro
@@ -6,7 +6,6 @@ SOURCES += main.cpp
 
 # Workaround for QTBUG-38735
 QT_FOR_CONFIG += location-private
-QT += concurrent sql
 
 RESOURCES += \
     mapviewer.qrc
diff --git a/examples/location/mapviewer/mapviewer.qrc b/examples/location/mapviewer/mapviewer.qrc
index 4e30c660..42c0d5b3 100644
--- a/examples/location/mapviewer/mapviewer.qrc
+++ b/examples/location/mapviewer/mapviewer.qrc
@@ -29,6 +29,5 @@
         <file>resources/scale.png</file>
         <file>resources/marker.png</file>
         <file>resources/marker_blue.png</file>
-        <file>resources/icon.png</file>
     </qresource>
 </RCC>
-- 
cgit v1.2.3