From 397242ef4ff96921d5234555f09cd3ba4c40ab07 Mon Sep 17 00:00:00 2001
From: Tadej Novak <tadej@tano.si>
Date: Tue, 31 Oct 2023 11:10:07 +0100
Subject: [PATCH] Fix old Qt version support for usage in linux distributions
 (#58)

---
 README.md                           | 3 ++-
 src/location/CMakeLists.txt         | 6 +++---
 src/location/plugins/CMakeLists.txt | 6 +++---
 test/qml/CMakeLists.txt             | 2 +-
 test/widgets/CMakeLists.txt         | 2 +-
 vendor/maplibre-native              | 2 +-
 6 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/README.md b/README.md
index f9284d0..7adb884 100644
--- a/README.md
+++ b/README.md
@@ -11,7 +11,8 @@ releases in the upcoming version 3.0 of the Qt bindings and Qt Location plugin.
 ## Qt support
 
 This library fully supports Qt 6.5 and newer.
-Qt 5.15 is fully supported only on desktop platforms.
+Qt 5.15 is fully supported only on desktop platforms, previous Qt 5 versions
+down to 5.6 only support widgets but not Qt Location.
 
 ## How to build?
 
diff --git a/src/location/CMakeLists.txt b/src/location/CMakeLists.txt
index 4a7b281..99bfe67 100644
--- a/src/location/CMakeLists.txt
+++ b/src/location/CMakeLists.txt
@@ -52,9 +52,9 @@ target_link_libraries(
     Location
     PRIVATE
         Core
-        $<$<BOOL:${Qt6_FOUND}>:Qt::OpenGL>
-        Qt::Network
-        Qt::LocationPrivate
+        $<$<BOOL:${Qt6_FOUND}>:Qt${QT_VERSION_MAJOR}::OpenGL>
+        Qt${QT_VERSION_MAJOR}::Network
+        Qt${QT_VERSION_MAJOR}::LocationPrivate
 )
 
 # Apple specifics
diff --git a/src/location/plugins/CMakeLists.txt b/src/location/plugins/CMakeLists.txt
index 2512200..403c19c 100644
--- a/src/location/plugins/CMakeLists.txt
+++ b/src/location/plugins/CMakeLists.txt
@@ -33,8 +33,8 @@ target_link_libraries(
     ${MLN_QT_GEOSERVICES_PLUGIN}
     PRIVATE
         Location
-        Qt::Location
-        Qt::LocationPrivate)
+        Qt${QT_VERSION_MAJOR}::Location
+        Qt${QT_VERSION_MAJOR}::LocationPrivate)
 
 # QtLocation plugin installation
 install(
@@ -88,7 +88,7 @@ target_link_libraries(
     ${MLN_QT_QML_PLUGIN}
     PRIVATE
         Location
-        Qt::LocationPrivate
+        Qt${QT_VERSION_MAJOR}::LocationPrivate
 )
 
 # QtLocation QML extension plugin installation
diff --git a/test/qml/CMakeLists.txt b/test/qml/CMakeLists.txt
index 71d7c5f..5cd9fa8 100644
--- a/test/qml/CMakeLists.txt
+++ b/test/qml/CMakeLists.txt
@@ -5,7 +5,7 @@ else()
 endif()
 
 find_package(Qt${QT_VERSION_MAJOR} COMPONENTS QuickTest REQUIRED)
-target_link_libraries(test_mln_qml PRIVATE Qt::QuickTest)
+target_link_libraries(test_mln_qml PRIVATE Qt${QT_VERSION_MAJOR}::QuickTest)
 
 add_test(NAME test_mln_qml COMMAND $<TARGET_FILE:test_mln_qml> -input ${CMAKE_CURRENT_SOURCE_DIR}/qt${QT_VERSION_MAJOR})
 set_tests_properties(
diff --git a/test/widgets/CMakeLists.txt b/test/widgets/CMakeLists.txt
index 59063d6..2db01e8 100644
--- a/test/widgets/CMakeLists.txt
+++ b/test/widgets/CMakeLists.txt
@@ -23,7 +23,7 @@ find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Test REQUIRED)
 target_link_libraries(
     test_mln_widgets
     PRIVATE
-        Qt::Test
+        Qt${QT_VERSION_MAJOR}::Test
         Widgets
 )
 set_target_properties(test_mln_widgets PROPERTIES AUTOMOC ON)
diff --git a/vendor/maplibre-native b/vendor/maplibre-native
index ab8a88d..85c0ab7 160000
--- a/vendor/maplibre-native
+++ b/vendor/maplibre-native
@@ -1 +1 @@
-Subproject commit ab8a88dfdec7c7f3b989ae9d8f7b904d42e9de01
+Subproject commit 85c0ab7e5145213194b2a4b73997f10fab1d1cd8