Commit cf045b71 authored by Gus Grubba's avatar Gus Grubba

Remove weird property in JoystickConfig

Adjust fly overlay height
Change minimum Qt version to 5.11+
parent bb7bd77a
...@@ -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, 11) { !equals(QT_MAJOR_VERSION, 5) | !greaterThan(QT_MINOR_VERSION, 10) {
error("Unsupported Qt version, 5.12+ is required") error("Unsupported Qt version, 5.12+ is required")
} }
......
...@@ -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
......
...@@ -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 {
......
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