From 3e51423c13983bd9bc8aa87aae3494cf30779f67 Mon Sep 17 00:00:00 2001
From: Nate Weibley <nate.weibley@prioria.com>
Date: Fri, 24 Jun 2016 16:06:41 -0400
Subject: [PATCH] Update to fixed mavlink and include mavlink in precompiled
 headers for good measure

---
 libs/mavlink/include/mavlink/v1.0 | 2 +-
 qgroundcontrol.pro                | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/libs/mavlink/include/mavlink/v1.0 b/libs/mavlink/include/mavlink/v1.0
index b6d21f122..28ea42ccb 160000
--- a/libs/mavlink/include/mavlink/v1.0
+++ b/libs/mavlink/include/mavlink/v1.0
@@ -1 +1 @@
-Subproject commit b6d21f1226857ff6ad710524d2b6956687011e64
+Subproject commit 28ea42ccb6ab1d764cacf3f0f55358dc3c66faa9
diff --git a/qgroundcontrol.pro b/qgroundcontrol.pro
index 1e35f1e6d..e30e28236 100644
--- a/qgroundcontrol.pro
+++ b/qgroundcontrol.pro
@@ -783,9 +783,8 @@ SOURCES += \
     src/VideoStreaming/VideoStreaming.cc \
     src/VideoStreaming/VideoSurface.cc \
 
-contains (DEFINES, DISABLE_VIDEOSTREAMING) {
+contains (CONFIG, DISABLE_VIDEOSTREAMING) {
     message("Skipping support for video streaming (manual override from command line)")
-    DEFINES -= DISABLE_VIDEOSTREAMING
 # Otherwise the user can still disable this feature in the user_config.pri file.
 } else:exists(user_config.pri):infile(user_config.pri, DEFINES, DISABLE_VIDEOSTREAMING) {
     message("Skipping support for video streaming (manual override from user_config.pri)")
-- 
2.22.0