Merge branch 'master' into podman

Author: igoutta

custom-example/res/Custom/Widgets/CustomAttitudeWidget.qml

@@ -13,10 +13,9 @@ import QtQuick
 
 import QGroundControl
 import QGroundControl.Controls
-
-
 import QGroundControl.FlightMap
 import Qt5Compat.GraphicalEffects
+
 Item {
     id: root
 

custom-example/res/Custom/Widgets/CustomIconButton.qml

@@ -15,8 +15,6 @@ import QtQuick.Controls
 import QGroundControl
 import QGroundControl.Controls
 
-
-
 Button {
     id:                             _rootButton
     width:                          parent.height * 1.25

custom-example/res/Custom/Widgets/CustomQuickButton.qml

@@ -15,8 +15,6 @@ import QtQuick.Controls
 import QGroundControl
 import QGroundControl.Controls
 
-
-
 Button {
     id:                         control
     autoExclusive:              true

custom-example/res/Custom/Widgets/CustomSignalStrength.qml

@@ -15,8 +15,6 @@ import QtQuick.Controls
 import QGroundControl
 import QGroundControl.Controls
 
-
-
 Item {
     width:  size
     height: size

custom-example/res/Custom/Widgets/CustomToolBarButton.qml

@@ -14,8 +14,6 @@ import QtQuick.Controls
 
 import QGroundControl.Controls
 
-
-
 Button {
     id:                             button
     autoExclusive:                  true

custom-example/res/Custom/Widgets/CustomVehicleButton.qml

@@ -14,8 +14,6 @@ import QtQuick.Controls
 
 import QGroundControl.Controls
 
-
-
 Button {
     id:                             button
     height:                         _infoCol.height * 1.25

custom-example/src/FlyViewCustomLayer.qml

@@ -13,9 +13,6 @@ import QtQuick.Layouts
 
 import QGroundControl
 import QGroundControl.Controls
-
-
-
 import Custom.Widgets
 
 Item {

docs/en/qgc-user-guide/setup_view/joystick.md

@@ -76,32 +76,6 @@
         <file alias="accel_right.png">resources/calibration/accel_right.png</file>
         <file alias="accel_up.png">resources/calibration/accel_up.png</file>
     </qresource>
-    <qresource prefix="/qml/QGroundControl/AutoPilotPlugins/Common/calibration/mode1">
-        <file alias="radioCenter.png">resources/calibration/mode1/radioCenter.png</file>
-        <file alias="radioHome.png">resources/calibration/mode1/radioHome.png</file>
-        <file alias="radioPitchDown.png">resources/calibration/mode1/radioPitchDown.png</file>
-        <file alias="radioPitchUp.png">resources/calibration/mode1/radioPitchUp.png</file>
-        <file alias="radioRollLeft.png">resources/calibration/mode1/radioRollLeft.png</file>
-        <file alias="radioRollRight.png">resources/calibration/mode1/radioRollRight.png</file>
-        <file alias="radioSwitchMinMax.png">resources/calibration/mode1/radioSwitchMinMax.png</file>
-        <file alias="radioThrottleDown.png">resources/calibration/mode1/radioThrottleDown.png</file>
-        <file alias="radioThrottleUp.png">resources/calibration/mode1/radioThrottleUp.png</file>
-        <file alias="radioYawLeft.png">resources/calibration/mode1/radioYawLeft.png</file>
-        <file alias="radioYawRight.png">resources/calibration/mode1/radioYawRight.png</file>
-    </qresource>
-    <qresource prefix="/qml/QGroundControl/AutoPilotPlugins/Common/calibration/mode2">
-        <file alias="radioCenter.png">resources/calibration/mode2/radioCenter.png</file>
-        <file alias="radioHome.png">resources/calibration/mode2/radioHome.png</file>
-        <file alias="radioPitchDown.png">resources/calibration/mode2/radioPitchDown.png</file>
-        <file alias="radioPitchUp.png">resources/calibration/mode2/radioPitchUp.png</file>
-        <file alias="radioRollLeft.png">resources/calibration/mode2/radioRollLeft.png</file>
-        <file alias="radioRollRight.png">resources/calibration/mode2/radioRollRight.png</file>
-        <file alias="radioSwitchMinMax.png">resources/calibration/mode2/radioSwitchMinMax.png</file>
-        <file alias="radioThrottleDown.png">resources/calibration/mode2/radioThrottleDown.png</file>
-        <file alias="radioThrottleUp.png">resources/calibration/mode2/radioThrottleUp.png</file>
-        <file alias="radioYawLeft.png">resources/calibration/mode2/radioYawLeft.png</file>
-        <file alias="radioYawRight.png">resources/calibration/mode2/radioYawRight.png</file>
-    </qresource>
     <qresource prefix="/res/audio">
         <file alias="Alert">resources/audio/alert.wav</file>
     </qresource>