mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

mobile: more build hackery

Browse source 
So while the documentation explicitly says that you need to have the
getInstance()registerTypes() call, that clearly is not supported if you
build kirigami as a library. Even the required include file doesn't
exist in the install-root.
So let's try some other way to make this work. Heck if I know what the
correct way of doing this might be.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2020-11-27 21:05:39 +00:00
parent 2fd464893b
commit 820fefb372
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
subsurface-helper.cpp
View file

@ -23,7 +23,6 @@
#include "core/downloadfromdcthread.h" #include "core/downloadfromdcthread.h"
#include "core/subsurfacestartup.h" // for testqml #include "core/subsurfacestartup.h" // for testqml
#include "qt-models/diveimportedmodel.h" #include "qt-models/diveimportedmodel.h"
#include "kirigamiplugin.h"
#else #else
#include "desktop-widgets/mainwindow.h" #include "desktop-widgets/mainwindow.h"
#endif #endif
@ -40,7 +39,10 @@ QObject *qqWindowObject = NULL;
static void register_qml_types(QQmlEngine *); static void register_qml_types(QQmlEngine *);
static void register_meta_types(); static void register_meta_types();
#ifdef SUBSURFACE_MOBILE
#include <QtPlugin>
Q_IMPORT_PLUGIN(KirigamiPlugin) Q_IMPORT_PLUGIN(KirigamiPlugin)
#endif
void init_ui() void init_ui()
{ {
@ -66,8 +68,6 @@ 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 // 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;