From 4d4a64903a9d365b6eb0ca88c86348972dbfee93 Mon Sep 17 00:00:00 2001 From: DoinLakeFlyer Date: Wed, 15 Apr 2020 09:16:32 -0700 Subject: [PATCH] Fix PX4 Flow image provider --- ChangeLog.md | 1 + src/QGCApplication.cc | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/ChangeLog.md b/ChangeLog.md index 0bed17e55..b6ee8ec7e 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -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 * 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 diff --git a/src/QGCApplication.cc b/src/QGCApplication.cc index 88b6e74e8..d2efb921e 100644 --- a/src/QGCApplication.cc +++ b/src/QGCApplication.cc @@ -27,6 +27,7 @@ #include #include #include +#include #ifdef QGC_ENABLE_BLUETOOTH #include @@ -98,6 +99,7 @@ #include "LogReplayLink.h" #include "VehicleObjectAvoidance.h" #include "TrajectoryPoints.h" +#include "QGCImageProvider.h" #if defined(QGC_ENABLE_PAIRING) #include "PairingManager.h" @@ -561,6 +563,10 @@ bool QGCApplication::_initForNormalAppBoot() _qmlAppEngine = toolbox()->corePlugin()->createRootWindow(this); + // Image provider for PX4 Flow + QQuickImageProvider* pImgProvider = dynamic_cast(qgcApp()->toolbox()->imageProvider()); + _qmlAppEngine->addImageProvider(QStringLiteral("QGCImages"), pImgProvider); + QQuickWindow* rootWindow = (QQuickWindow*)qgcApp()->mainRootWindow(); if (rootWindow) { -- 2.22.0