From cf045b7188a59e83b7915e186d2371821d6bc0fd Mon Sep 17 00:00:00 2001 From: Gus Grubba Date: Tue, 23 Apr 2019 01:29:23 -0300 Subject: [PATCH] Remove weird property in JoystickConfig Adjust fly overlay height Change minimum Qt version to 5.11+ --- qgroundcontrol.pro | 2 +- src/FlightDisplay/FlightDisplayView.qml | 2 +- src/VehicleSetup/JoystickConfig.qml | 5 ++--- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/qgroundcontrol.pro b/qgroundcontrol.pro index a29fe3ab5..4d0af72f6 100644 --- a/qgroundcontrol.pro +++ b/qgroundcontrol.pro @@ -15,7 +15,7 @@ exists($${OUT_PWD}/qgroundcontrol.pro) { 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") } diff --git a/src/FlightDisplay/FlightDisplayView.qml b/src/FlightDisplay/FlightDisplayView.qml index e503b9162..0983c451a 100644 --- a/src/FlightDisplay/FlightDisplayView.qml +++ b/src/FlightDisplay/FlightDisplayView.qml @@ -523,7 +523,7 @@ Item { id: flyViewOverlay z: flightDisplayViewWidgets.z + 1 visible: !QGroundControl.videoManager.fullScreen - height: mainWindow.height + height: mainWindow.height - mainWindow.header.height anchors.left: parent.left anchors.right: altitudeSlider.visible ? altitudeSlider.left : parent.right anchors.bottom: parent.bottom diff --git a/src/VehicleSetup/JoystickConfig.qml b/src/VehicleSetup/JoystickConfig.qml index a981d501b..038e7e0fb 100644 --- a/src/VehicleSetup/JoystickConfig.qml +++ b/src/VehicleSetup/JoystickConfig.qml @@ -184,9 +184,8 @@ SetupPage { width: 100 sourceComponent: axisMonitorDisplayComponent - property real ScreenTools.defaultFontPixelWidth: ScreenTools.defaultFontPixelWidth - property bool mapped: controller.rollAxisMapped - property bool reversed: controller.rollAxisReversed + property bool mapped: controller.rollAxisMapped + property bool reversed: controller.rollAxisReversed } Connections { -- 2.22.0