Merge pull request #8314 from andrewvoznytsa/pr-DISABLE_VIDEOSTREAMING-fix

Fix DISABLE_VIDEOSTREAMING handling

Merge pull request #8314 from andrewvoznytsa/pr-DISABLE_VIDEOSTREAMING-fix
Fix DISABLE_VIDEOSTREAMING handling
7894165a · Don Gagne · GitHub · 5c30eb07 · 0e3422af · 7894165a
Unverified Commit 7894165a authored Feb 12, 2020 by Don Gagne Committed by GitHub Feb 12, 2020
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 6 deletions

qgroundcontrol.pro qgroundcontrol.pro +7 -0

VideoStreaming.pri src/VideoStreaming/VideoStreaming.pri +0 -6

No files found.
--- a/qgroundcontrol.pro
+++ b/qgroundcontrol.pro
@@ -1392,6 +1392,13 @@ contains (CONFIG, DISABLE_VIDEOSTREAMING) {
    include(src/VideoStreaming/VideoStreaming.pri)
 }

+!VideoEnabled {
+    HEADERS += \
+       src/VideoStreaming/GLVideoItemStub.h
+    SOURCES += \
+        src/VideoStreaming/GLVideoItemStub.cc
+}
+
 #-------------------------------------------------------------------------------------
 # Android


--- a/src/VideoStreaming/VideoStreaming.pri
+++ b/src/VideoStreaming/VideoStreaming.pri
@@ -135,10 +135,4 @@ VideoEnabled {
    } else {
        message("Skipping support for video streaming (Unsupported platform)")
    }
-
-    SOURCES += \
-        $$PWD/GLVideoItemStub.cc
-
-    HEADERS += \
-        $$PWD/GLVideoItemStub.h
 }