aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Dirk Hohndel <dirk@hohndel.org>2020-11-24 10:50:26 -0800
committerGravatar Dirk Hohndel <dirk@hohndel.org>2020-12-17 09:17:54 -0800
commit9f21699cd1ab3094d13b88a8ae64c147a572f2f6 (patch)
treee79d9b8be537795d49589d16af6387c203693bda
parent0851224b6c53d1023ea7b2d8642de77608475e44 (diff)
downloadsubsurface-9f21699cd1ab3094d13b88a8ae64c147a572f2f6.tar.gz
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 <dirk@hohndel.org>
-rw-r--r--subsurface-helper.cpp5
1 files changed, 4 insertions, 1 deletions
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");