Martchus
8bcbcdde52
Further versions broke the build system,
see 18443d861e.
With 5.15.1 it basically works again but deployment with androiddeployqt
does not produce runnable APKs. Qt now has gained support for invoking
androiddeployqt within CMake. Using their official support instead of my
own helper might have worked but it could not cope with the fact that I
had multiple targets in my CMake project and was therefore useless in my
case.
So let's ditch Qt 5 on Android and give Qt 6 another chance at some
point.
30 lines
1.1 KiB
Diff
30 lines
1.1 KiB
Diff
From dbe68d96e7da8ba5e5484e6ad0bbd78c9b0a8eec Mon Sep 17 00:00:00 2001
|
|
From: Martchus <martchus@gmx.net>
|
|
Date: Sun, 9 Dec 2018 14:29:59 +0100
|
|
Subject: [PATCH] Disable mapboxgl
|
|
|
|
---
|
|
src/plugins/geoservices/geoservices.pro | 9 ---------
|
|
1 file changed, 9 deletions(-)
|
|
|
|
diff --git a/src/plugins/geoservices/geoservices.pro b/src/plugins/geoservices/geoservices.pro
|
|
index b81ad34a..98308c97 100644
|
|
--- a/src/plugins/geoservices/geoservices.pro
|
|
+++ b/src/plugins/geoservices/geoservices.pro
|
|
@@ -7,12 +7,3 @@ qtConfig(geoservices_mapbox): SUBDIRS += mapbox
|
|
qtConfig(geoservices_esri): SUBDIRS += esri
|
|
qtConfig(geoservices_itemsoverlay): SUBDIRS += itemsoverlay
|
|
qtConfig(geoservices_osm): SUBDIRS += osm
|
|
-
|
|
-qtConfig(geoservices_mapboxgl) {
|
|
- !exists(../../3rdparty/mapbox-gl-native/mapbox-gl-native.pro) {
|
|
- warning("Submodule mapbox-gl-native does not exist. Run 'git submodule update --init' on qtlocation.")
|
|
- } else {
|
|
- SUBDIRS += mapboxgl ../../3rdparty/mapbox-gl-native
|
|
- mapboxgl.depends = ../../3rdparty/mapbox-gl-native
|
|
- }
|
|
-}
|
|
--
|
|
2.23.0
|
|
|