|
|
@ -27,6 +27,7 @@ |
|
|
|
#include <QRegularExpression> |
|
|
|
#include <QRegularExpression> |
|
|
|
#include <QFontDatabase> |
|
|
|
#include <QFontDatabase> |
|
|
|
#include <QQuickWindow> |
|
|
|
#include <QQuickWindow> |
|
|
|
|
|
|
|
#include <QQuickImageProvider> |
|
|
|
|
|
|
|
|
|
|
|
#ifdef QGC_ENABLE_BLUETOOTH |
|
|
|
#ifdef QGC_ENABLE_BLUETOOTH |
|
|
|
#include <QBluetoothLocalDevice> |
|
|
|
#include <QBluetoothLocalDevice> |
|
|
@ -98,6 +99,7 @@ |
|
|
|
#include "LogReplayLink.h" |
|
|
|
#include "LogReplayLink.h" |
|
|
|
#include "VehicleObjectAvoidance.h" |
|
|
|
#include "VehicleObjectAvoidance.h" |
|
|
|
#include "TrajectoryPoints.h" |
|
|
|
#include "TrajectoryPoints.h" |
|
|
|
|
|
|
|
#include "QGCImageProvider.h" |
|
|
|
|
|
|
|
|
|
|
|
#if defined(QGC_ENABLE_PAIRING) |
|
|
|
#if defined(QGC_ENABLE_PAIRING) |
|
|
|
#include "PairingManager.h" |
|
|
|
#include "PairingManager.h" |
|
|
@ -561,6 +563,10 @@ bool QGCApplication::_initForNormalAppBoot() |
|
|
|
|
|
|
|
|
|
|
|
_qmlAppEngine = toolbox()->corePlugin()->createRootWindow(this); |
|
|
|
_qmlAppEngine = toolbox()->corePlugin()->createRootWindow(this); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// Image provider for PX4 Flow
|
|
|
|
|
|
|
|
QQuickImageProvider* pImgProvider = dynamic_cast<QQuickImageProvider*>(qgcApp()->toolbox()->imageProvider()); |
|
|
|
|
|
|
|
_qmlAppEngine->addImageProvider(QStringLiteral("QGCImages"), pImgProvider); |
|
|
|
|
|
|
|
|
|
|
|
QQuickWindow* rootWindow = (QQuickWindow*)qgcApp()->mainRootWindow(); |
|
|
|
QQuickWindow* rootWindow = (QQuickWindow*)qgcApp()->mainRootWindow(); |
|
|
|
|
|
|
|
|
|
|
|
if (rootWindow) { |
|
|
|
if (rootWindow) { |
|
|
|