* origin/master:
Fix meta data warnings
Reduce iOS default font size. Tweak toolbar height for mobile.
Token change to force a rebuild.
Adding TTS to iOS
Better UAVCAN instructions, better param meta
Conflicts:
QGCApplication.pro
QGCCommon.pri
The debug dialog is temporary and it only shows in debug builds. I was trying to collect data on screen size and density for various devices. I might leave it there a little longer (still only for debug builds) until we're comfortable with the UI across all devices.
Yes, we need to group these settings a little better. I think it's just a matter of shuffling things around. One *Root* setting window that branches off into *General*, *Vehicle*, *Joystick*, etc. I will wait for @DonLakeFlyer to be back so we can figure this out.
In the mean time, I will merge this in as is as it provides a service regardless.
* mavlink/master: (30 commits)
android lower minSdkVersion to 16
Update README.md
Fix G constant, emit updates more regularly
QGC: Fix excessive noise terms
check for new and old flightgear path
set correct path to flightgear executable on osx
fix android auto versionName update
travis-ci try installing PyOpenSSL with pip
travis-ci add python-openssl for google play publish
travis-ci run doxygen config last
travis-ci pip install --user
travis-ci install google-api-python-client
fix travis decrypt google play credentials
android auto version and deploy to google play
update android version
Remove Flightgear and JSBSim and only leave the option which actually works.
Wait after window close to prevent qml warnings
Restructure to prevent shutdown warnings
QT_FATAL_WARNINGS back on
Remove remaining singletons
...
Conflicts:
src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc
dogmaphobic
Don Gagne
Lorenz Meier
Daniel Agar
Lorenz Meier