mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2024-12-11 03:21:29 +00:00
Code Issues Projects Releases Packages Wiki Activity

build-system/Android: handle resource issues

Browse source 
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 <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2020-11-27 22:08:17 +00:00
parent 820fefb372
commit a7d6736665
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
Subsurface-mobile.pro
View file

@ -305,8 +305,14 @@ RESOURCES += mobile-widgets/qml/mobile-resources.qrc \
android { android {
SOURCES += core/android.cpp \ SOURCES += core/android.cpp \
core/serial_usb_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 QT += androidextras
ANDROID_PACKAGE_SOURCE_DIR = $$PWD/android-mobile ANDROID_PACKAGE_SOURCE_DIR = $$PWD/android-mobile
ANDROID_VERSION_CODE = $$BUILD_NR ANDROID_VERSION_CODE = $$BUILD_NR