summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Dirk Hohndel <dirk@hohndel.org>2020-11-24 16:01:55 -0800
committerGravatar Dirk Hohndel <dirk@hohndel.org>2020-12-17 09:17:54 -0800
commit9c208e88d6707fff008164fa9c335a93bd809a3f (patch)
treeef3f7090b0cf0568d2a50d021d9a1b5074a51026
parent9f21699cd1ab3094d13b88a8ae64c147a572f2f6 (diff)
downloadsubsurface-9c208e88d6707fff008164fa9c335a93bd809a3f.tar.gz
mobile/Android: register the Kirigami plugin
According to the Kirigami documentation, this is only required on Android. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
-rw-r--r--subsurface-helper.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/subsurface-helper.cpp b/subsurface-helper.cpp
index befe89559..d2eb6e01e 100644
--- a/subsurface-helper.cpp
+++ b/subsurface-helper.cpp
@@ -66,6 +66,9 @@ void run_ui()
{
#ifdef SUBSURFACE_MOBILE
#if defined(Q_OS_ANDROID)
+ // according to the documentation this is required on Android, but nowhere else
+ KirigamiPlugin::getInstance().registerTypes();
+ // work around an odd interaction between the OnePlus flavor of Android and Qt font handling
if (getAndroidHWInfo().contains("/OnePlus/")) {
QFontDatabase db;
int id = QFontDatabase::addApplicationFont(":/fonts/Roboto-Regular.ttf");
@@ -91,7 +94,6 @@ void run_ui()
// Register qml interface classes
QMLInterface::setup(ctxt);
register_qml_types(&engine);
- KirigamiPlugin::getInstance().registerTypes();
#if defined(__APPLE__) && !defined(Q_OS_IOS)
// when running the QML UI on a Mac the deployment of the QML Components seems
// to fail and the search path for the components is rather odd - simply the