diff options
author | Liang Qi <liang.qi@qt.io> | 2016-12-12 09:48:13 +0100 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2016-12-12 10:27:59 +0100 |
commit | 533759ef333e4db8625cd02f763994788da01199 (patch) | |
tree | dcb4b4ec8882b42ce8213f4e309534dd8d234843 /src/plugins/gstreamer/common.pri | |
parent | 31ed506ea2c7a8be439d77e02ca0d67b6f9ce675 (diff) | |
parent | 7bc230386e0d8d6f3c4ad5a0a6a22a625c9a8327 (diff) |
Merge remote-tracking branch 'origin/5.8' into dev
Conflicts:
src/plugins/gstreamer/mediacapture/qgstreameraudioencode.cpp
Change-Id: I7c30c2d13fdd07ee07e4449d5d3e256e988d3793
Diffstat (limited to 'src/plugins/gstreamer/common.pri')
-rw-r--r-- | src/plugins/gstreamer/common.pri | 26 |
1 files changed, 5 insertions, 21 deletions
diff --git a/src/plugins/gstreamer/common.pri b/src/plugins/gstreamer/common.pri index babdb7cfb..110bc8549 100644 --- a/src/plugins/gstreamer/common.pri +++ b/src/plugins/gstreamer/common.pri @@ -1,4 +1,3 @@ - QT += core-private multimedia-private network qtHaveModule(widgets) { @@ -8,30 +7,15 @@ qtHaveModule(widgets) { LIBS += -lqgsttools_p -CONFIG += link_pkgconfig - -PKGCONFIG += \ - gstreamer-$$GST_VERSION \ - gstreamer-base-$$GST_VERSION \ - gstreamer-audio-$$GST_VERSION \ - gstreamer-video-$$GST_VERSION \ - gstreamer-pbutils-$$GST_VERSION - -maemo*:PKGCONFIG +=gstreamer-plugins-bad-$$GST_VERSION - -mir: { - DEFINES += HAVE_MIR -} - +QMAKE_USE += gstreamer -config_resourcepolicy { +qtConfig(resourcepolicy) { + QMAKE_USE += libresourceqt5 DEFINES += HAVE_RESOURCE_POLICY - PKGCONFIG += libresourceqt5 } -config_gstreamer_appsrc { - PKGCONFIG += gstreamer-app-$$GST_VERSION +qtConfig(gstreamer_app) { + QMAKE_USE += gstreamer_app DEFINES += HAVE_GST_APPSRC - LIBS += -lgstapp-$$GST_VERSION } |