Browse Source

Merge pull request #8660 from mavlink/PX4Flow

Fix PX4 Flow image provider
QGC4.4
Don Gagne 5 years ago committed by GitHub
parent
commit
a5ee3e26d0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 1
      ChangeLog.md
  2. 6
      src/QGCApplication.cc

1
ChangeLog.md

@ -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
* 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

6
src/QGCApplication.cc

@ -27,6 +27,7 @@ @@ -27,6 +27,7 @@
#include <QRegularExpression>
#include <QFontDatabase>
#include <QQuickWindow>
#include <QQuickImageProvider>
#ifdef QGC_ENABLE_BLUETOOTH
#include <QBluetoothLocalDevice>
@ -98,6 +99,7 @@ @@ -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() @@ -561,6 +563,10 @@ bool QGCApplication::_initForNormalAppBoot()
_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();
if (rootWindow) {

Loading…
Cancel
Save