diff options
| author | Martin Jansa <Martin.Jansa@gmail.com> | 2013-12-31 12:07:29 +0100 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2014-01-01 12:54:50 +0100 |
| commit | 775d77e482f1ea203c78003cccd2547075fd720f (patch) | |
| tree | 3be7e559712cc6b04763ec15fca099617a07fd84 | |
| parent | 57709a4ee2213a3c352b9cedce1d4b16a1b35042 (diff) | |
| download | meta-qt5-775d77e482f1ea203c78003cccd2547075fd720f.tar.gz | |
qtwebkit: Depend on gstreamer-1.0 instead of 0.10
* since this commit:
commit e0debe138cb59c140ebbc69755d36028d2b89459
Author: Allan Sandfeld Jensen <allan.jensen@digia.com>
Date: Thu Feb 28 13:42:27 2013 +0100
Subject: Switch QtWebKit to GStreamer 1.0.
qtwebkit supports 1.0 and will use that by default when found
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
| -rw-r--r-- | recipes-qt/qt5/qtwebkit.inc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/recipes-qt/qt5/qtwebkit.inc b/recipes-qt/qt5/qtwebkit.inc index c0e06480..2d211c7b 100644 --- a/recipes-qt/qt5/qtwebkit.inc +++ b/recipes-qt/qt5/qtwebkit.inc | |||
| @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://Source/WebCore/rendering/RenderApplet.h;endline=22;md | |||
| 5 | file://Source/WebKit/gtk/webkit/webkit.h;endline=21;md5=b4fbe9f4a944f1d071dba1d2c76b3351 \ | 5 | file://Source/WebKit/gtk/webkit/webkit.h;endline=21;md5=b4fbe9f4a944f1d071dba1d2c76b3351 \ |
| 6 | file://Source/JavaScriptCore/parser/Parser.h;endline=23;md5=b57c8a2952a8d0e655988fa0ecb2bf7f" | 6 | file://Source/JavaScriptCore/parser/Parser.h;endline=23;md5=b57c8a2952a8d0e655988fa0ecb2bf7f" |
| 7 | 7 | ||
| 8 | DEPENDS += "qtdeclarative qtlocation qtsensors ${ICU} ruby-native sqlite3 glib-2.0 gstreamer gst-plugins-base libxslt" | 8 | DEPENDS += "qtdeclarative qtlocation qtsensors ${ICU} ruby-native sqlite3 glib-2.0 gstreamer1.0 gstreamer1.0-plugins-base libxslt" |
| 9 | 9 | ||
| 10 | # qtwebkit gets terribly big when linking with all debug info, disable by default | 10 | # qtwebkit gets terribly big when linking with all debug info, disable by default |
| 11 | QTWEBKIT_DEBUG = "QMAKE_CFLAGS+=-g0 QMAKE_CXXFLAGS+=-g0" | 11 | QTWEBKIT_DEBUG = "QMAKE_CFLAGS+=-g0 QMAKE_CXXFLAGS+=-g0" |