From 8861c1f7eb4fcffe0fb69fa671fd08181472d6fd Mon Sep 17 00:00:00 2001 From: Daniel Agar Date: Wed, 12 Oct 2016 11:59:15 -0400 Subject: [PATCH] linux package always include libQt5Multimedia (#4122) - fixes #4105 --- QGCSetup.pri | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/QGCSetup.pri b/QGCSetup.pri index 40cbb58bf..3cbfb7401 100644 --- 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 \ -- 2.22.0