From f1ed8748b18537beb6160f8f97ae3dcca0274309 Mon Sep 17 00:00:00 2001 From: "Lubomir I. Ivanov" Date: Fri, 13 Jul 2018 01:33:20 +0300 Subject: map-widget: fix chronology of QML class registration The QML types needs to be registered before the MainWindow instance is created on the desktop version, otherwise the MapWidget instance will be created and it will fail with a missing QML namespace. In subsurface-helper.cpp, move register_qml_types() from run_ui() to init_ui(), as later in init_ui(), MainWindow is instantiated for the first time in the desktop version. Ref #1500 Signed-off-by: Lubomir I. Ivanov --- subsurface-helper.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'subsurface-helper.cpp') diff --git a/subsurface-helper.cpp b/subsurface-helper.cpp index b58f8b4aa..b533e7e91 100644 --- a/subsurface-helper.cpp +++ b/subsurface-helper.cpp @@ -33,6 +33,7 @@ QObject *qqWindowObject = NULL; void init_ui() { init_qt_late(); + register_qml_types(); #ifndef SUBSURFACE_MOBILE PluginManager::instance().loadPlugins(); @@ -97,7 +98,6 @@ void register_qml_types() void run_ui() { - register_qml_types(); #ifdef SUBSURFACE_MOBILE QQmlApplicationEngine engine; -- cgit v1.2.3-70-g09d2