From 9f21699cd1ab3094d13b88a8ae64c147a572f2f6 Mon Sep 17 00:00:00 2001 From: Dirk Hohndel Date: Tue, 24 Nov 2020 10:50:26 -0800 Subject: mobile: use 3rdparty build of Kirigami This should allow us to use the kirigami version that was built as 3rdparty component. Signed-off-by: Dirk Hohndel --- subsurface-helper.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/subsurface-helper.cpp b/subsurface-helper.cpp index f22afec4c..befe89559 100644 --- a/subsurface-helper.cpp +++ b/subsurface-helper.cpp @@ -23,7 +23,7 @@ #include "core/downloadfromdcthread.h" #include "core/subsurfacestartup.h" // for testqml #include "qt-models/diveimportedmodel.h" -#include "mobile-widgets/qml/kirigami/src/kirigamiplugin.h" +#include "kirigamiplugin.h" #else #include "desktop-widgets/mainwindow.h" #endif @@ -40,6 +40,8 @@ QObject *qqWindowObject = NULL; static void register_qml_types(QQmlEngine *); static void register_meta_types(); +Q_IMPORT_PLUGIN(KirigamiPlugin) + void init_ui() { init_qt_late(); @@ -101,6 +103,7 @@ void run_ui() if (importPath.contains("MacOS")) engine.addImportPath(importPath.replace("MacOS", "Frameworks")); } + engine.addImportPath("qrc://"); qDebug() << "QML import path" << engine.importPathList(); #endif // __APPLE__ not Q_OS_IOS engine.addImportPath("qrc://imports"); -- cgit v1.2.3-70-g09d2