# Conflicts:
#	src/FlightDisplay/FlightDisplayViewWidgets.qml
#	src/PlanView/MissionItemEditor.qml
#	src/PlanView/RallyPointItemEditor.qml
#	src/QmlControls/QGCButton.qml
#	src/api/QGCOptions.h

Firmware Upgrade Fixes

Add support for VTOL transition from joystick buttons

Stable merge

Switch Windows to Qt 5.9.4

Set focus on button and checkbox click

Stable merge

This forces a commit on any uncommitted TextFields

Add ParameterManagerDebugCacheFailureLog support

Used to debug cache CRC misses.

Custom, single firmware upgrades were fixed to "stable", even if the user selected "custom".
The code, when selecting the firmware type was using the combo box model index instead of the actual type defined by the list model.

Allow setting MAVLINK dialect in user_config.pri

It builds clean but the resources still get messed up (loads true qml files instead of dummy ones, and it crashes...)

Flight Widget

Allow plugins to define a left placement for its custom flight widget.
When placed on the left, the action tool strip is placed on the right side.

Update localization strings [ci skip]

added additional packages needed to build QGC

Mobile Log Download

For mobile, save log downloads next to where everything else is saved instead of straight into the home directory (which is anybody's guess when it comes to mobile platforms).

Missing file extension for QGCFileDialog when loading KML files.

Add message asking user confirmation to end a flight

Remove delete flights and add "End" active flight instead
Work on flight geometry (flight list)