linux package always include libQt5Multimedia (#4122)

- fixes #4105

linux package always include libQt5Multimedia (#4122)
- fixes #4105
8861c1f7 · Daniel Agar · GitHub · 24596a5c · 8861c1f7
Commit 8861c1f7 authored Oct 12, 2016 by Daniel Agar Committed by GitHub Oct 12, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 6 deletions

QGCSetup.pri QGCSetup.pri +2 -6

No files found.
--- a/QGCSetup.pri
+++ b/QGCSetup.pri
@@ -105,6 +105,8 @@ LinuxBuild {
            libQt5DBus.so.5 \
            libQt5Gui.so.5 \
            libQt5Location.so.5 \
+            libQt5Multimedia.so.5 \
+            libQt5MultimediaQuick_p.so.5 \
            libQt5Network.so.5 \
            libQt5OpenGL.so.5 \
            libQt5Positioning.so.5 \
@@ -119,12 +121,6 @@ LinuxBuild {
            libQt5Widgets.so.5 \
            libQt5XcbQpa.so.5

-        !contains (DEFINES, QGC_DISABLE_UVC) {
-            QT_LIB_LIST += \
-                libQt5Multimedia.so.5 \
-                libQt5MultimediaQuick_p.so.5
-        }
-
        !contains(DEFINES, __rasp_pi2__) {
            QT_LIB_LIST += \
                libicudata.so.54 \