From 898d9c144b2a8c4c5f0c06375e678e9d26e2db94 Mon Sep 17 00:00:00 2001
From: Kevin Whitaker <eyecreate@eyecreate.org>
Date: Thu, 18 Jun 2020 14:34:53 -0400
Subject: [PATCH] Add svg to allow app display svg graphics. Add test section
 for android to try and get icons working.

---
 CMakeLists.txt     | 2 +-
 android-build.sh   | 3 +--
 src/CMakeLists.txt | 6 +++++-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 46d8ba1..c42f22a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -28,7 +28,7 @@ include(KDECompilerSettings NO_POLICY_SCOPE)
 
 ################# Find dependencies #################
 
-find_package(Qt5 ${QT_MIN_VERSION} REQUIRED NO_MODULE COMPONENTS Core Quick Test Gui Sql QuickControls2 Widgets)
+find_package(Qt5 ${QT_MIN_VERSION} REQUIRED NO_MODULE COMPONENTS Core Quick Test Gui Sql Svg QuickControls2 Widgets)
 find_package(KF5Kirigami2 ${KF5_MIN_VERSION} REQUIRED)
 find_package(KF5CoreAddons ${KF5_MIN_VERSION} REQUIRED)
 
diff --git a/android-build.sh b/android-build.sh
index b8c7d90..08d3e42 100644
--- a/android-build.sh
+++ b/android-build.sh
@@ -1,6 +1,5 @@
 #!/bin/sh
 mkdir -p `dirname "$0"`/android-build
 cd `dirname "$0"`/android-build
-cmake -DCMAKE_TOOLCHAIN_FILE=/opt/kdeandroid-arm/share/ECM/toolchain/Android.cmake -DECM_ADDITIONAL_FIND_ROOT_PATH="/opt/Qt;/opt/kdeandroid-arm/" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/output -DQTANDROID_EXPORTED_TARGET=vehiclevoyage -DANDROID_APK_DIR=../packaging/android ..
-make
+cmake -DCMAKE_TOOLCHAIN_FILE=/opt/kdeandroid-arm/share/ECM/toolchain/Android.cmake -DECM_DIR="/opt/kdeandroid-arm/share/EMC/cmake" -DECM_ADDITIONAL_FIND_ROOT_PATH="/opt/Qt;/opt/kdeandroid-arm/" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/output -DQTANDROID_EXPORTED_TARGET=vehiclevoyage -DANDROID_APK_DIR=../packaging/android ..
 make create-apk-vehiclevoyage
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 79a68fb..e689a18 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -7,5 +7,9 @@ set(vehiclevoyage_SRCS
     
 qt5_add_resources(RESOURCES resources.qrc)
 add_executable(vehiclevoyage ${vehiclevoyage_SRCS} ${RESOURCES})
-target_link_libraries(vehiclevoyage Qt5::Core Qt5::Qml Qt5::Quick Qt5::Sql Qt5::Widgets KF5::CoreAddons)
+target_link_libraries(vehiclevoyage Qt5::Core Qt5::Qml Qt5::Quick Qt5::Sql Qt5::Svg Qt5::Widgets KF5::CoreAddons)
 install(TARGETS vehiclevoyage ${KF5_INSTALL_TARGETS_DEFAULT_ARGS})
+
+if (CMAKE_SYSTEM_NAME STREQUAL "Android")
+    kirigami_package_breeze_icons(ICONS list-add application-javascript help-about edit-find edit-delete window-close)
+endif()
-- 
GitLab