Skip to content

Commit 277a601

Browse files
authored
Merge branch 'master' into podman
2 parents 4ed1c25 + 72517ef commit 277a601

File tree

346 files changed

+540
-1099
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

346 files changed

+540
-1099
lines changed

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,9 @@ import QtQuick
1313

1414
import QGroundControl
1515
import QGroundControl.Controls
16-
17-
1816
import QGroundControl.FlightMap
1917
import Qt5Compat.GraphicalEffects
18+
2019
Item {
2120
id: root
2221

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,6 @@ import QtQuick.Controls
1515
import QGroundControl
1616
import QGroundControl.Controls
1717

18-
19-
2018
Button {
2119
id: _rootButton
2220
width: parent.height * 1.25

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,6 @@ import QtQuick.Controls
1515
import QGroundControl
1616
import QGroundControl.Controls
1717

18-
19-
2018
Button {
2119
id: control
2220
autoExclusive: true

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,6 @@ import QtQuick.Controls
1515
import QGroundControl
1616
import QGroundControl.Controls
1717

18-
19-
2018
Item {
2119
width: size
2220
height: size

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,6 @@ import QtQuick.Controls
1414

1515
import QGroundControl.Controls
1616

17-
18-
1917
Button {
2018
id: button
2119
autoExclusive: true

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,6 @@ import QtQuick.Controls
1414

1515
import QGroundControl.Controls
1616

17-
18-
1917
Button {
2018
id: button
2119
height: _infoCol.height * 1.25

custom-example/src/FlyViewCustomLayer.qml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,6 @@ import QtQuick.Layouts
1313

1414
import QGroundControl
1515
import QGroundControl.Controls
16-
17-
18-
1916
import Custom.Widgets
2017

2118
Item {

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

Lines changed: 21 additions & 0 deletions

qgcresources.qrc

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -76,32 +76,6 @@
7676
<file alias="accel_right.png">resources/calibration/accel_right.png</file>
7777
<file alias="accel_up.png">resources/calibration/accel_up.png</file>
7878
</qresource>
79-
<qresource prefix="/qml/QGroundControl/AutoPilotPlugins/Common/calibration/mode1">
80-
<file alias="radioCenter.png">resources/calibration/mode1/radioCenter.png</file>
81-
<file alias="radioHome.png">resources/calibration/mode1/radioHome.png</file>
82-
<file alias="radioPitchDown.png">resources/calibration/mode1/radioPitchDown.png</file>
83-
<file alias="radioPitchUp.png">resources/calibration/mode1/radioPitchUp.png</file>
84-
<file alias="radioRollLeft.png">resources/calibration/mode1/radioRollLeft.png</file>
85-
<file alias="radioRollRight.png">resources/calibration/mode1/radioRollRight.png</file>
86-
<file alias="radioSwitchMinMax.png">resources/calibration/mode1/radioSwitchMinMax.png</file>
87-
<file alias="radioThrottleDown.png">resources/calibration/mode1/radioThrottleDown.png</file>
88-
<file alias="radioThrottleUp.png">resources/calibration/mode1/radioThrottleUp.png</file>
89-
<file alias="radioYawLeft.png">resources/calibration/mode1/radioYawLeft.png</file>
90-
<file alias="radioYawRight.png">resources/calibration/mode1/radioYawRight.png</file>
91-
</qresource>
92-
<qresource prefix="/qml/QGroundControl/AutoPilotPlugins/Common/calibration/mode2">
93-
<file alias="radioCenter.png">resources/calibration/mode2/radioCenter.png</file>
94-
<file alias="radioHome.png">resources/calibration/mode2/radioHome.png</file>
95-
<file alias="radioPitchDown.png">resources/calibration/mode2/radioPitchDown.png</file>
96-
<file alias="radioPitchUp.png">resources/calibration/mode2/radioPitchUp.png</file>
97-
<file alias="radioRollLeft.png">resources/calibration/mode2/radioRollLeft.png</file>
98-
<file alias="radioRollRight.png">resources/calibration/mode2/radioRollRight.png</file>
99-
<file alias="radioSwitchMinMax.png">resources/calibration/mode2/radioSwitchMinMax.png</file>
100-
<file alias="radioThrottleDown.png">resources/calibration/mode2/radioThrottleDown.png</file>
101-
<file alias="radioThrottleUp.png">resources/calibration/mode2/radioThrottleUp.png</file>
102-
<file alias="radioYawLeft.png">resources/calibration/mode2/radioYawLeft.png</file>
103-
<file alias="radioYawRight.png">resources/calibration/mode2/radioYawRight.png</file>
104-
</qresource>
10579
<qresource prefix="/res/audio">
10680
<file alias="Alert">resources/audio/alert.wav</file>
10781
</qresource>
-21.8 KB
Binary file not shown.

0 commit comments

Comments
 (0)