From 24358c1d05a24472a8600b6ac24dc54f8372a8c6 Mon Sep 17 00:00:00 2001
From: dogmaphobic <mavlink@grubba.com>
Date: Tue, 30 Aug 2016 15:20:32 -0400
Subject: [PATCH] Fix inverted logic when disabling UVC.

---
 QGCSetup.pri                      |  5 +++++
 qgroundcontrol.pro                | 13 +++++++++----
 src/FlightDisplay/VideoManager.cc |  3 +++
 3 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/QGCSetup.pri b/QGCSetup.pri
index 8b08abae9..8c50d4b23 100644
--- a/QGCSetup.pri
+++ b/QGCSetup.pri
@@ -119,6 +119,11 @@ LinuxBuild {
             libQt5Widgets.so.5 \
             libQt5XcbQpa.so.5
 
+        !contains (DEFINES, QGC_DISABLE_UVC) {
+            QT_LIB_LIST += \
+                libQt5Multimedia.so.5
+        }
+
         !contains(DEFINES, __rasp_pi2__) {
             QT_LIB_LIST += \
                 libicudata.so.54 \
diff --git a/qgroundcontrol.pro b/qgroundcontrol.pro
index d26fbb217..3a78fc0a3 100644
--- a/qgroundcontrol.pro
+++ b/qgroundcontrol.pro
@@ -49,10 +49,10 @@ contains (DEFINES, QGC_DISABLE_BLUETOOTH) {
 # USB Camera and UVC Video Sources
 contains (DEFINES, QGC_DISABLE_UVC) {
     message("Skipping support for UVC devices (manual override from command line)")
-    DEFINES -= QGC_DISABLE_UVC
+    DEFINES += QGC_DISABLE_UVC
 } else:exists(user_config.pri):infile(user_config.pri, DEFINES, QGC_DISABLE_UVC) {
     message("Skipping support for UVC devices (manual override from user_config.pri)")
-    DEFINES -= QGC_DISABLE_UVC
+    DEFINES += QGC_DISABLE_UVC
 }
 
 LinuxBuild {
@@ -87,8 +87,13 @@ QT += \
     sql \
     svg \
     widgets \
-    xml \
-    multimedia
+    xml
+
+# Multimedia only used if QVC is enabled
+!contains (DEFINES, QGC_DISABLE_UVC) {
+    QT += \
+        multimedia
+}
 
 !MobileBuild {
 QT += \
diff --git a/src/FlightDisplay/VideoManager.cc b/src/FlightDisplay/VideoManager.cc
index b8a1f7c81..02c325fab 100644
--- a/src/FlightDisplay/VideoManager.cc
+++ b/src/FlightDisplay/VideoManager.cc
@@ -11,7 +11,10 @@
 #include <QQmlContext>
 #include <QQmlEngine>
 #include <QSettings>
+
+#ifndef QGC_DISABLE_UVC
 #include <QCameraInfo>
+#endif
 
 #include <VideoItem.h>
 
-- 
2.22.0