Merge branch 'xfim-master'
[gentoo.git] / dev-qt / qtwebkit / files / qtwebkit-5.3.2-use-gstreamer010.patch
1 --- Tools/qmake/mkspecs/features/features.prf   2014-09-27 11:09:50.010617142 +0100
2 +++ Tools/qmake/mkspecs/features/features.prf   2014-09-27 11:17:10.741678989 +0100
3 @@ -96,14 +96,8 @@
4      use?(3d_graphics): WEBKIT_CONFIG += webgl
5  
6      # HTML5 Media Support for builds with GStreamer
7 -    unix:!mac:!contains(QT_CONFIG, no-pkg-config) {
8 -        packagesExist("glib-2.0 gio-2.0 gstreamer-1.0 gstreamer-plugins-base-1.0") {
9 -            WEBKIT_CONFIG += video use_gstreamer
10 -        } else: packagesExist("glib-2.0 gio-2.0 \'gstreamer-0.10 >= 0.10.30\' \'gstreamer-plugins-base-0.10 >= 0.10.30\'") {
11 -            WEBKIT_CONFIG += video use_gstreamer use_gstreamer010
12 -        }
13 +        WEBKIT_CONFIG += video use_gstreamer use_gstreamer010
14          use?(gstreamer): WEBKIT_CONFIG += use_native_fullscreen_video
15 -    }
16  
17      !enable?(video):qtHaveModule(multimediawidgets) {
18          WEBKIT_CONFIG += video use_qt_multimedia