diff --git a/.gitignore b/.gitignore index 3184e1a..2baa774 100644 --- a/.gitignore +++ b/.gitignore @@ -20,7 +20,7 @@ qrc_*.cpp tmp debug release -qgroundcontrol +/qgroundcontrol mavlinkgen-build-desktop qgroundcontrol.xcodeproj/** doc/html @@ -49,4 +49,7 @@ user_config.pri *.suo *.uhf.txt *.opensdf -apmplanner2.xcodeproj/ + +thirdParty/qserialport-build-desktop/ +thirdParty/qserialport/bin/ +thirdParty/qserialport/lib/ diff --git a/qml/resources/qgroundcontrol/toolbar/connect.png b/qml/resources/qgroundcontrol/toolbar/connect.png new file mode 100644 index 0000000..8572674 Binary files /dev/null and b/qml/resources/qgroundcontrol/toolbar/connect.png differ diff --git a/qml/resources/qgroundcontrol/toolbar/disconnect.png b/qml/resources/qgroundcontrol/toolbar/disconnect.png new file mode 100644 index 0000000..57f2f50 Binary files /dev/null and b/qml/resources/qgroundcontrol/toolbar/disconnect.png differ diff --git a/qml/resources/qgroundcontrol/toolbar/donate.png b/qml/resources/qgroundcontrol/toolbar/donate.png new file mode 100644 index 0000000..80b1a14 Binary files /dev/null and b/qml/resources/qgroundcontrol/toolbar/donate.png differ diff --git a/qml/resources/qgroundcontrol/toolbar/flightdata.png b/qml/resources/qgroundcontrol/toolbar/flightdata.png new file mode 100644 index 0000000..aa8fb36 Binary files /dev/null and b/qml/resources/qgroundcontrol/toolbar/flightdata.png differ diff --git a/qml/resources/qgroundcontrol/toolbar/flightplanner.png b/qml/resources/qgroundcontrol/toolbar/flightplanner.png new file mode 100644 index 0000000..72e1b40 Binary files /dev/null and b/qml/resources/qgroundcontrol/toolbar/flightplanner.png differ diff --git a/qml/resources/qgroundcontrol/toolbar/hardwareconfig.png b/qml/resources/qgroundcontrol/toolbar/hardwareconfig.png new file mode 100644 index 0000000..56fb561 Binary files /dev/null and b/qml/resources/qgroundcontrol/toolbar/hardwareconfig.png differ diff --git a/qml/resources/qgroundcontrol/toolbar/helpwizard.png b/qml/resources/qgroundcontrol/toolbar/helpwizard.png new file mode 100644 index 0000000..ac5c20a Binary files /dev/null and b/qml/resources/qgroundcontrol/toolbar/helpwizard.png differ diff --git a/qml/resources/qgroundcontrol/toolbar/simulation.png b/qml/resources/qgroundcontrol/toolbar/simulation.png new file mode 100644 index 0000000..e8a1c31 Binary files /dev/null and b/qml/resources/qgroundcontrol/toolbar/simulation.png differ diff --git a/qml/resources/qgroundcontrol/toolbar/softwareconfig.png b/qml/resources/qgroundcontrol/toolbar/softwareconfig.png new file mode 100644 index 0000000..e2516db Binary files /dev/null and b/qml/resources/qgroundcontrol/toolbar/softwareconfig.png differ diff --git a/qml/resources/qgroundcontrol/toolbar/terminal.png b/qml/resources/qgroundcontrol/toolbar/terminal.png new file mode 100644 index 0000000..bb639d3 Binary files /dev/null and b/qml/resources/qgroundcontrol/toolbar/terminal.png differ