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>
This commit is contained in:
Dirk Hohndel 2020-11-24 16:01:55 -08:00
parent 9f21699cd1
commit 9c208e88d6

View file

@ -66,6 +66,9 @@ void run_ui()
{ {
#ifdef SUBSURFACE_MOBILE #ifdef SUBSURFACE_MOBILE
#if defined(Q_OS_ANDROID) #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/")) { if (getAndroidHWInfo().contains("/OnePlus/")) {
QFontDatabase db; QFontDatabase db;
int id = QFontDatabase::addApplicationFont(":/fonts/Roboto-Regular.ttf"); int id = QFontDatabase::addApplicationFont(":/fonts/Roboto-Regular.ttf");
@ -91,7 +94,6 @@ void run_ui()
// Register qml interface classes // Register qml interface classes
QMLInterface::setup(ctxt); QMLInterface::setup(ctxt);
register_qml_types(&engine); register_qml_types(&engine);
KirigamiPlugin::getInstance().registerTypes();
#if defined(__APPLE__) && !defined(Q_OS_IOS) #if defined(__APPLE__) && !defined(Q_OS_IOS)
// when running the QML UI on a Mac the deployment of the QML Components seems // 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 // to fail and the search path for the components is rather odd - simply the