Add svg to allow app display svg graphics. Add test section for android to try and get icons working.

This commit is contained in:
2020-06-18 14:34:53 -04:00
parent ef21bd2284
commit 898d9c144b
3 changed files with 7 additions and 4 deletions

View File

@@ -28,7 +28,7 @@ include(KDECompilerSettings NO_POLICY_SCOPE)
################# Find dependencies ################# ################# 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(KF5Kirigami2 ${KF5_MIN_VERSION} REQUIRED)
find_package(KF5CoreAddons ${KF5_MIN_VERSION} REQUIRED) find_package(KF5CoreAddons ${KF5_MIN_VERSION} REQUIRED)

View File

@@ -1,6 +1,5 @@
#!/bin/sh #!/bin/sh
mkdir -p `dirname "$0"`/android-build mkdir -p `dirname "$0"`/android-build
cd `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 .. 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
make create-apk-vehiclevoyage make create-apk-vehiclevoyage

View File

@@ -7,5 +7,9 @@ set(vehiclevoyage_SRCS
qt5_add_resources(RESOURCES resources.qrc) qt5_add_resources(RESOURCES resources.qrc)
add_executable(vehiclevoyage ${vehiclevoyage_SRCS} ${RESOURCES}) 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}) 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()