Skip to content

Commit

Permalink
Add two phase init to QGCCorePlugin
Browse files Browse the repository at this point in the history
  • Loading branch information
DonLakeFlyer committed Dec 4, 2024
1 parent e208322 commit 99a7c6f
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 0 deletions.
2 changes: 2 additions & 0 deletions src/API/QGCCorePlugin.h
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,8 @@ class QGCCorePlugin : public QObject
static QGCCorePlugin *instance();
static void registerQmlTypes();

virtual void init() { };

Q_INVOKABLE bool guidedActionsControllerLogging() const;

/// The list of pages/buttons under the Analyze Menu
Expand Down
1 change: 1 addition & 0 deletions src/QGCApplication.cc
Original file line number Diff line number Diff line change
Expand Up @@ -335,6 +335,7 @@ void QGCApplication::_initForNormalAppBoot()
VideoManager::instance(); // GStreamer must be initialized before QmlEngine

QQuickStyle::setStyle("Basic");
QGCCorePlugin::instance()->init();
_qmlAppEngine = QGCCorePlugin::instance()->createQmlApplicationEngine(this);
QObject::connect(_qmlAppEngine, &QQmlApplicationEngine::objectCreationFailed, this, QCoreApplication::quit, Qt::QueuedConnection);
QGCCorePlugin::instance()->createRootWindow(_qmlAppEngine);
Expand Down

0 comments on commit 99a7c6f

Please sign in to comment.