Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Q
qgroundcontrol
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Valentin Platzgummer
qgroundcontrol
Commits
a5ee3e26
Unverified
Commit
a5ee3e26
authored
5 years ago
by
Don Gagne
Committed by
GitHub
5 years ago
Browse files
Options
Downloads
Plain Diff
Merge pull request #8660 from mavlink/PX4Flow
Fix PX4 Flow image provider
parents
2ae9350d
4d4a6490
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
ChangeLog.md
+1
-0
1 addition, 0 deletions
ChangeLog.md
src/QGCApplication.cc
+6
-0
6 additions, 0 deletions
src/QGCApplication.cc
with
7 additions
and
0 deletions
ChangeLog.md
+
1
−
0
View file @
a5ee3e26
...
...
@@ -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
...
...
This diff is collapsed.
Click to expand it.
src/QGCApplication.cc
+
6
−
0
View file @
a5ee3e26
...
...
@@ -27,6 +27,7 @@
#include
<QRegularExpression>
#include
<QFontDatabase>
#include
<QQuickWindow>
#include
<QQuickImageProvider>
#ifdef QGC_ENABLE_BLUETOOTH
#include
<QBluetoothLocalDevice>
...
...
@@ -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
<
QQuickImageProvider
*>
(
qgcApp
()
->
toolbox
()
->
imageProvider
());
_qmlAppEngine
->
addImageProvider
(
QStringLiteral
(
"QGCImages"
),
pImgProvider
);
QQuickWindow
*
rootWindow
=
(
QQuickWindow
*
)
qgcApp
()
->
mainRootWindow
();
if
(
rootWindow
)
{
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment