Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Valentin Platzgummer
qgroundcontrol
Commits
5f3bb056
Commit
5f3bb056
authored
Sep 16, 2016
by
dogmaphobic
Browse files
Video updates for Ubuntu.
parent
4b4ece63
Changes
2
Hide whitespace changes
Inline
Side-by-side
qgroundcontrol.pro
View file @
5f3bb056
...
...
@@ -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
{
...
...
src/VideoStreaming/VideoStreaming.pri
View file @
5f3bb056
...
...
@@ -186,7 +186,7 @@ VideoEnabled {
}
LinuxBuild {
message(" You can install it using apt-get")
message(" sudo apt-get install
lib
gstreamer
-plugins-base1.0-dev libgstreamer1.0-0:amd64 libgstreamer1.0-dev
")
message(" sudo apt-get install gstreamer
1.0*
")
}
WindowsBuild {
message(" You can download it from http://gstreamer.freedesktop.org/data/pkg/windows/")
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment