Merge pull request #8214 from mavlink/pr-cleanup

Cleanup
5 years ago · 35deed1545
3 changed files with 3 additions and 4 deletions
--- a/src/FlightDisplay/FlightDisplayView.qml
+++ b/src/FlightDisplay/FlightDisplayView.qml
@ -440,7 +440,7 @@ Item {
				@@ -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") : ""
            }
        }

--- a/src/FlightDisplay/MultiVehicleList.qml
+++ b/src/FlightDisplay/MultiVehicleList.qml
@ -67,7 +67,7 @@ Item {
				@@ -67,7 +67,7 @@ Item {
                }

                QGCButton {
-                    text:       "Start Mision"
+                    text:       "Start Mission"
                    onClicked:  guidedActionsController.confirmAction(guidedActionsController.actionMVStartMission)
                }
            }
--- a/src/QmlControls/QGCLabel.qml
+++ b/src/QmlControls/QGCLabel.qml
@ -6,9 +6,8 @@ import QGroundControl.Palette 1.0
				@@ -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
 }