Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Q
qgroundcontrol
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Valentin Platzgummer
qgroundcontrol
Commits
cf045b71
Commit
cf045b71
authored
Apr 23, 2019
by
Gus Grubba
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove weird property in JoystickConfig
Adjust fly overlay height Change minimum Qt version to 5.11+
parent
bb7bd77a
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
5 deletions
+4
-5
qgroundcontrol.pro
qgroundcontrol.pro
+1
-1
FlightDisplayView.qml
src/FlightDisplay/FlightDisplayView.qml
+1
-1
JoystickConfig.qml
src/VehicleSetup/JoystickConfig.qml
+2
-3
No files found.
qgroundcontrol.pro
View file @
cf045b71
...
@@ -15,7 +15,7 @@ exists($${OUT_PWD}/qgroundcontrol.pro) {
...
@@ -15,7 +15,7 @@ exists($${OUT_PWD}/qgroundcontrol.pro) {
message
(
Qt
version
$$
[
QT_VERSION
])
message
(
Qt
version
$$
[
QT_VERSION
])
!
equals
(
QT_MAJOR_VERSION
,
5
)
|
!
greaterThan
(
QT_MINOR_VERSION
,
1
1
)
{
!
equals
(
QT_MAJOR_VERSION
,
5
)
|
!
greaterThan
(
QT_MINOR_VERSION
,
1
0
)
{
error
(
"Unsupported Qt version, 5.12+ is required"
)
error
(
"Unsupported Qt version, 5.12+ is required"
)
}
}
...
...
src/FlightDisplay/FlightDisplayView.qml
View file @
cf045b71
...
@@ -523,7 +523,7 @@ Item {
...
@@ -523,7 +523,7 @@ Item {
id
:
flyViewOverlay
id
:
flyViewOverlay
z
:
flightDisplayViewWidgets
.
z
+
1
z
:
flightDisplayViewWidgets
.
z
+
1
visible
:
!
QGroundControl
.
videoManager
.
fullScreen
visible
:
!
QGroundControl
.
videoManager
.
fullScreen
height
:
mainWindow
.
height
height
:
mainWindow
.
height
-
mainWindow
.
header
.
height
anchors.left
:
parent
.
left
anchors.left
:
parent
.
left
anchors.right
:
altitudeSlider
.
visible
?
altitudeSlider
.
left
:
parent
.
right
anchors.right
:
altitudeSlider
.
visible
?
altitudeSlider
.
left
:
parent
.
right
anchors.bottom
:
parent
.
bottom
anchors.bottom
:
parent
.
bottom
...
...
src/VehicleSetup/JoystickConfig.qml
View file @
cf045b71
...
@@ -184,9 +184,8 @@ SetupPage {
...
@@ -184,9 +184,8 @@ SetupPage {
width
:
100
width
:
100
sourceComponent
:
axisMonitorDisplayComponent
sourceComponent
:
axisMonitorDisplayComponent
property
real
ScreenTools.defaultFontPixelWidth
:
ScreenTools
.
defaultFontPixelWidth
property
bool
mapped
:
controller
.
rollAxisMapped
property
bool
mapped
:
controller
.
rollAxisMapped
property
bool
reversed
:
controller
.
rollAxisReversed
property
bool
reversed
:
controller
.
rollAxisReversed
}
}
Connections
{
Connections
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment