Merging with upstream

.appveyor.yml

@@ -7,10 +7,10 @@ environment:
   matrix:
 #  - BUILD: 'Debug'
 #    CONFIG: debug
-#    SHADOW_BUILD_DIR: $(APPVEYOR_BUILD_FOLDER)\build_windows_debug
+#    SHADOW_BUILD_DIR: C:\projects\qgroundcontrol\build_windows_debug
   - BUILD: 'Release'
     CONFIG: installer
-    SHADOW_BUILD_DIR: $(APPVEYOR_BUILD_FOLDER)\build_windows_install
+    SHADOW_BUILD_DIR: C:\projects\qgroundcontrol\build_windows_install
 
 install:
   - git submodule update --init --recursive
@@ -25,20 +25,48 @@ install:
       Write-Host "Installing..."
       cmd /c start /wait $exePath /S
       Write-Host "Installed" -ForegroundColor Green
+  - ps: |
+      Write-Host "Installing GStreamer..." -ForegroundColor Cyan
+      $msiPath = "$($env:USERPROFILE)\gstreamer-1.0-x86-1.5.2.msi"
+      Write-Host "Downloading..."
+      (New-Object Net.WebClient).DownloadFile('https://s3-us-west-2.amazonaws.com/qgroundcontrol/dependencies/gstreamer-1.0-x86-1.5.2.msi', $msiPath)
+      Write-Host "Installing..."
+      cmd /c start /wait msiexec /package $msiPath /passive ADDLOCAL=ALL
+      Write-Host "Installed" -ForegroundColor Green
+  - ps: |
+      Write-Host "Installing GStreamer dev..." -ForegroundColor Cyan
+      $msiPath = "$($env:USERPROFILE)\gstreamer-1.0-devel-x86-1.5.2.msi"
+      Write-Host "Downloading..."
+      (New-Object Net.WebClient).DownloadFile('https://s3-us-west-2.amazonaws.com/qgroundcontrol/dependencies/gstreamer-1.0-devel-x86-1.5.2.msi', $msiPath)
+      Write-Host "Installing..."
+      cmd /c start /wait msiexec /package $msiPath /passive ADDLOCAL=ALL
+      Write-Host "Installed" -ForegroundColor Green
 
 build_script:
   - mkdir %SHADOW_BUILD_DIR% && cd %SHADOW_BUILD_DIR% && C:\Qt\5.5\msvc2013\bin\qmake -r CONFIG-=debug_and_release CONFIG+=%CONFIG% CONFIG+=WarningsAsErrorsOn %APPVEYOR_BUILD_FOLDER%\qgroundcontrol.pro
   - cd %SHADOW_BUILD_DIR% && jom
-  - if "%CONFIG%" EQU "installer" ( copy %SHADOW_BUILD_DIR%\release\qgroundcontrol-installer.exe %APPVEYOR_BUILD_FOLDER%\qgroundcontrol-installer.exe )
+  - if "%CONFIG%" EQU "installer" ( copy %SHADOW_BUILD_DIR%\release\QGroundControl-installer.exe %APPVEYOR_BUILD_FOLDER%\QGroundControl-installer.exe )
+# Generate the source server information to embed in the PDB
+  - '"C:\Program Files (x86)\Windows Kits\8.1\Debuggers\x64\srcsrv\srctool.exe" -r -u "%SHADOW_BUILD_DIR%\release\qgroundcontrol.pdb" | grep qgroundcontrol | grep -v moc_ | grep -v libs\\mavlink | grep -v build_windows_install | python %APPVEYOR_BUILD_FOLDER%\deploy\genPDBsrcsrv.py > %SHADOW_BUILD_DIR%\release\qgroundcontrol.pdb.srcsrv'
+# write the source server info
+  - '"C:\Program Files (x86)\Windows Kits\8.1\Debuggers\x64\srcsrv\pdbstr.exe" -w -i:%SHADOW_BUILD_DIR%\release\qgroundcontrol.pdb.srcsrv -p:%SHADOW_BUILD_DIR%\release\qgroundcontrol.pdb -s:srcsrv'
+# build the symbol / PE store
+  - 'cd %APPVEYOR_BUILD_FOLDER% && "C:\Program Files (x86)\Windows Kits\8.1\Debuggers\x64\symstore.exe" add /compress /s symbols /f %SHADOW_BUILD_DIR%\release\qgroundcontrol.pdb /t qgroundcontrol'
+  - 'cd %APPVEYOR_BUILD_FOLDER% && "C:\Program Files (x86)\Windows Kits\8.1\Debuggers\x64\symstore.exe" add /compress /s symbols /f %SHADOW_BUILD_DIR%\release\qgroundcontrol.exe /t qgroundcontrol'
+  - ps: 'cd $env:appveyor_build_folder; .\deploy\lowercaseify_symbolstore.ps1'
 
 test_script:
   - if "%CONFIG%" EQU "debug" ( %SHADOW_BUILD_DIR%\debug\qgroundcontrol --unittest )
 
 artifacts:
-  - path: qgroundcontrol-installer.exe
+  - path: QGroundControl-installer.exe
     name: qgcinstaller
 
+  - path: symbols\**\*.*_
+    name: symbols
+
 deploy:
+# deploy continuous builds to s3
   - provider: S3
     access_key_id:
       secure: IGAojLMqokL+76DbdulmWDA3MTsxEBBi3ReVVSqTy9c=
@@ -46,10 +74,40 @@ deploy:
       secure: RiYqaR+3T2PMNz2j5ur8LCA6H/Zfd4jTX33CZE5iBxm+zaz4QLs25p0B7prpaoNN
     bucket: qgroundcontrol
     set_public: true
-    folder: $(APPVEYOR_REPO_BRANCH)
+    folder: builds/$(APPVEYOR_REPO_BRANCH)
     artifact: qgcinstaller
     on:
       CONFIG: installer
+
+# deploy daily build symbols to s3
+  - provider: S3
+    access_key_id:
+      secure: IGAojLMqokL+76DbdulmWDA3MTsxEBBi3ReVVSqTy9c=
+    secret_access_key:
+      secure: RiYqaR+3T2PMNz2j5ur8LCA6H/Zfd4jTX33CZE5iBxm+zaz4QLs25p0B7prpaoNN
+    bucket: qgroundcontrol
+    set_public: true
+    folder: cisyms
+    artifact: symbols
+    on:
+      CONFIG: installer
+      appveyor_repo_tag: false
+
+# deploy release symbols to s3
+  - provider: S3
+    access_key_id:
+      secure: IGAojLMqokL+76DbdulmWDA3MTsxEBBi3ReVVSqTy9c=
+    secret_access_key:
+      secure: RiYqaR+3T2PMNz2j5ur8LCA6H/Zfd4jTX33CZE5iBxm+zaz4QLs25p0B7prpaoNN
+    bucket: qgroundcontrol
+    set_public: true
+    folder: releasesyms
+    artifact: symbols
+    on:
+      CONFIG: installer
+      appveyor_repo_tag: true
+
+# deploy tagged releases to Github releases
   - provider: GitHub
     auth_token:
       secure: dzWLqd0eTKjrAWC5LgqVnwLemmrNdddGA2ZZn/OthAP37mwCLkP2C1zil7ivmEE8
@@ -59,3 +117,31 @@ deploy:
     on:
       CONFIG: installer
       appveyor_repo_tag: true
+
+# deploy tagged releases to s3 version folder
+  - provider: S3
+    access_key_id:
+      secure: IGAojLMqokL+76DbdulmWDA3MTsxEBBi3ReVVSqTy9c=
+    secret_access_key:
+      secure: RiYqaR+3T2PMNz2j5ur8LCA6H/Zfd4jTX33CZE5iBxm+zaz4QLs25p0B7prpaoNN
+    bucket: qgroundcontrol
+    set_public: true
+    folder: $(APPVEYOR_REPO_TAG_NAME)
+    artifact: qgcinstaller
+    on:
+      CONFIG: installer
+      appveyor_repo_tag: true
+
+# deploy tagged releases to s3 latest folder
+  - provider: S3
+    access_key_id:
+      secure: IGAojLMqokL+76DbdulmWDA3MTsxEBBi3ReVVSqTy9c=
+    secret_access_key:
+      secure: RiYqaR+3T2PMNz2j5ur8LCA6H/Zfd4jTX33CZE5iBxm+zaz4QLs25p0B7prpaoNN
+    bucket: qgroundcontrol
+    set_public: true
+    folder: latest
+    artifact: qgcinstaller
+    on:
+      CONFIG: installer
+      appveyor_repo_tag: true

.gitignore

@@ -60,6 +60,9 @@ gstreamer-1.0-android*
 *.autosave
 .settings/
 
+# iOS Generated files
+ios/iOSForAppStore-Info.plist
+
 # Generated files
 moc_*
 ui_*

.gitmodules

 [submodule "libs/mavlink/include/mavlink/v1.0"]
 	path = libs/mavlink/include/mavlink/v1.0
-	url = https://github.com/mavlink/c_library.git
+	url = https://github.com/mavlink/c_library_v1.git
 [submodule "src/GPS/Drivers"]
 	path = src/GPS/Drivers
 	url = https://github.com/PX4/GpsDrivers.git
+[submodule "libs/mavlink/include/mavlink/v2.0"]
+	path = libs/mavlink/include/mavlink/v2.0
+	url = git://github.com/mavlink/c_library_v2.git

.vagrantconfig.yml

 configs:
     dev:
-        'qt_deps_tarball': '/vagrant/Qt5.5.1-linux.tar.bz2'
+        'qt_deps_tarball': 'Qt5.5.1-linux.tar.bz2'
         'qt_deps_unpack_parent_dir': '/tmp'
 
         'qt_deps_unpack_dir': '/tmp/Qt'
@@ -9,6 +9,8 @@ configs:
         'qt_deps_plugins_unpack_dir': '/tmp/Qt/5.5/gcc_64/plugins'
         'qt_deps_qml_unpack_dir': '/tmp/Qt/5.5/gcc_64/qml'
 
+        'project_root_dir': '/vagrant'
+
         'qt_deps_dir': '/vagrant/shadow-build/release/Qt'
         'qt_deps_bin_dir': '/vagrant/shadow-build/release/Qt/bin'
         'qt_deps_lib_dir': '/vagrant/shadow-build/release/Qt/libs'
@@ -18,4 +20,4 @@ configs:
         'spec': 'linux-g++-64'
         'shadow_build_dir': '/vagrant/shadow-build'
         'pro': '/vagrant/qgroundcontrol.pro'
-        'deps_url': 'https://s3-us-west-2.amazonaws.com/qgroundcontrol/dependencies'
+        'deps_url': 'https://s3-us-west-2.amazonaws.com/qgroundcontrol/dependencies/Qt5.5.1-linux.tar.bz2'

COPYING.md

+# QGroundControl License
+
+QGroundControl (QGC) is dual-licensed as Apache 2.0 and GPLv3. All contributions have to be made under both licenses (see [CONTRIBUTING](CONTRIBUTING.md)).
+
+## Apache 2.0 License
+
+The [Apache 2.0](http://www.apache.org/licenses/LICENSE-2.0) License is a permissive license which allows QGC to be built and used in any environment, including proprietary applications. It allows QGC to be built for mobile app stores. When building with Apache 2.0 a commercial Qt license is required.
+
+## GPL v3 License
+
+The [GPL v3 License](http://www.gnu.org/licenses/gpl-3.0.en.html) is a strong copyleft license. When building QGC under this license the open source version of Qt can be used. Our licensing grants the permission to use a later version of the license, however, contributions have to be made under 3.0.
+
+## Contact
+
+If you have questions regarding the licensing, please contact the maintainer Lorenz Meier, [lm@groundcontrol.org].

CodingStyle.cc

-/*=====================================================================
- 
- QGroundControl Open Source Ground Control Station
- 
- (c) 2009 - 2015 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org>
- 
- This file is part of the QGROUNDCONTROL project
- 
- QGROUNDCONTROL is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
- 
- QGROUNDCONTROL is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
- 
- You should have received a copy of the GNU General Public License
- along with QGROUNDCONTROL. If not, see <http://www.gnu.org/licenses/>.
- 
- ======================================================================*/
+/****************************************************************************
+ *
+ *   (c) 2009-2016 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org>
+ *
+ * QGroundControl is licensed according to the terms in the file
+ * COPYING.md in the root of the source code directory.
+ *
+ ****************************************************************************/
 
 // This is an example class c++ file which is used to describe the QGroundControl
 // coding style. In general almost everything in here has some coding style meaning.
@@ -33,7 +19,7 @@
 
 #include <math.h>
 
-// Note how the Qt headers and the QGroundControl headers above are kept seperate
+// Note how the Qt headers and the QGroundControl headers above are kept separate
 
 Q_LOGGING_CATEGORY(CodingStyleLog, "CodingStyleLog")
 

CodingStyle.h

-/*=====================================================================
- 
- QGroundControl Open Source Ground Control Station
- 
- (c) 2009 - 2015 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org>
- 
- This file is part of the QGROUNDCONTROL project
- 
- QGROUNDCONTROL is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by