diff --git a/libs/mavlink/include/mavlink/v1.0 b/libs/mavlink/include/mavlink/v1.0
index b6d21f1226857ff6ad710524d2b6956687011e64..28ea42ccb6ab1d764cacf3f0f55358dc3c66faa9 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 1e35f1e6df8a0135b3053771e15c32f5cdebc0c4..e30e28236c677bbb43db65d449353a4b45a733a8 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)")