From a7d6736665e64c2cc08188ead0086f16d92a9a0d Mon Sep 17 00:00:00 2001 From: Dirk Hohndel Date: Fri, 27 Nov 2020 22:08:17 +0000 Subject: [PATCH] build-system/Android: handle resource issues It appears that the Kirigami shaders aren't bundled with the app. They should be part of the plugin, but somehow they aren't. This way things at least 'mostly work'. We also need the icons. And to make this a bit more structured, move those resource declarations into the Android part of the qmake file until we know how all this works out on iOS. The Android app is still fairly unusable with all kinds of weird font problems and many other issues, but at least it once again starts. Signed-off-by: Dirk Hohndel --- Subsurface-mobile.pro | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/Subsurface-mobile.pro b/Subsurface-mobile.pro index cd0c19db9..66763448f 100644 --- a/Subsurface-mobile.pro +++ b/Subsurface-mobile.pro @@ -305,8 +305,14 @@ RESOURCES += mobile-widgets/qml/mobile-resources.qrc \ android { SOURCES += core/android.cpp \ core/serial_usb_android.cpp - RESOURCES += packaging/android/translations.qrc - RESOURCES += android-mobile/font.qrc + + # ironically, we appear to need to include the Kirigami shaders here + # as they aren't found when we assume that they are part of the + # libkirigami library + RESOURCES += packaging/android/translations.qrc \ + android-mobile/font.qrc \ + mobile-widgets/3rdparty/icons.qrc \ + mobile-widgets/3rdparty/kirigami/src/scenegraph/shaders/shaders.qrc QT += androidextras ANDROID_PACKAGE_SOURCE_DIR = $$PWD/android-mobile ANDROID_VERSION_CODE = $$BUILD_NR