diff --git a/qgroundcontrol.pro b/qgroundcontrol.pro index b88bdbd01f7a5e5e4a36074c3ada522bb4a142fb..7842c0bce38638dd14a2de3d5bacb2e83bb1b0d7 100644 --- a/qgroundcontrol.pro +++ b/qgroundcontrol.pro @@ -53,6 +53,11 @@ contains (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 +} else:LinuxBuild { + contains(QT_VERSION, 5.5.1) { + message("Skipping support for UVC devices (conflict with Qt 5.5.1 on Ubuntu)") + DEFINES += QGC_DISABLE_UVC + } } LinuxBuild { diff --git a/src/VideoStreaming/VideoStreaming.pri b/src/VideoStreaming/VideoStreaming.pri index cd78836ff1b8f2ad30c9f64288ff180dee111f08..762a608f599074314d2f94ac2fced008e6e5f395 100644 --- a/src/VideoStreaming/VideoStreaming.pri +++ b/src/VideoStreaming/VideoStreaming.pri @@ -186,7 +186,7 @@ VideoEnabled { } LinuxBuild { message(" You can install it using apt-get") - message(" sudo apt-get install libgstreamer-plugins-base1.0-dev libgstreamer1.0-0:amd64 libgstreamer1.0-dev") + message(" sudo apt-get install gstreamer1.0*") } WindowsBuild { message(" You can download it from http://gstreamer.freedesktop.org/data/pkg/windows/")