Commit 4d4a6490 authored by DoinLakeFlyer's avatar DoinLakeFlyer

parent 6584be88
...@@ -8,6 +8,7 @@ Note: This file only contains high level features or important fixes. ...@@ -8,6 +8,7 @@ Note: This file only contains high level features or important fixes.
* Analyze/Log Download - Fix download on mobile versions of QGC * Analyze/Log Download - Fix download on mobile versions of QGC
* Fly: Fix problems where Continue Mission and Change Altitude were not available after a Mission Pause. * Fly: Fix problems where Continue Mission and Change Altitude were not available after a Mission Pause.
* PX4 Flow: Fix video display problem
### 4.0.5 - Stable ### 4.0.5 - Stable
......
...@@ -27,6 +27,7 @@ ...@@ -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 @@ ...@@ -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() ...@@ -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) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment