diff --git a/src/FlightDisplay/FlightDisplayView.qml b/src/FlightDisplay/FlightDisplayView.qml index 2d581d1c6bab15fddb44d5ce253c1cd4e1e39683..45f5297055c579bf2c0e7a07aaac14d2e8ec7345 100644 --- a/src/FlightDisplay/FlightDisplayView.qml +++ b/src/FlightDisplay/FlightDisplayView.qml @@ -440,7 +440,7 @@ Item { id: cameraLoader anchors.fill: parent visible: !QGroundControl.videoManager.isGStreamer - source: QGroundControl.videoManager.uvcEnabled ? "qrc:/qml/FlightDisplayViewUVC.qml" : "qrc:/qml/FlightDisplayViewDummy.qml" + source: visible ? (QGroundControl.videoManager.uvcEnabled ? "qrc:/qml/FlightDisplayViewUVC.qml" : "qrc:/qml/FlightDisplayViewDummy.qml") : "" } } diff --git a/src/FlightDisplay/MultiVehicleList.qml b/src/FlightDisplay/MultiVehicleList.qml index f8a7890a6f1e79d1a33b73ac0a16402e489002d3..3b5db44a24cc42576255feb1cde3f21503544429 100644 --- a/src/FlightDisplay/MultiVehicleList.qml +++ b/src/FlightDisplay/MultiVehicleList.qml @@ -67,7 +67,7 @@ Item { } QGCButton { - text: "Start Mision" + text: "Start Mission" onClicked: guidedActionsController.confirmAction(guidedActionsController.actionMVStartMission) } } diff --git a/src/QmlControls/QGCLabel.qml b/src/QmlControls/QGCLabel.qml index ec55e354369ed18deedc6c5f466d9e318a7c0ac1..ef0bdede88e897efe335d8cee4811bda804e1b7f 100644 --- a/src/QmlControls/QGCLabel.qml +++ b/src/QmlControls/QGCLabel.qml @@ -6,9 +6,8 @@ import QGroundControl.Palette 1.0 import QGroundControl.ScreenTools 1.0 Text { - QGCPalette { id: __qgcPal; colorGroupEnabled: enabled } font.pointSize: ScreenTools.defaultFontPointSize font.family: ScreenTools.normalFontFamily - color: __qgcPal.text + color: qgcPal.text antialiasing: true }