summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2010-06-09 15:20:12 +0200
committerMartin Jansa <Martin.Jansa@gmail.com>2010-06-09 15:50:50 +0200
commitfddbd9804e226fe38e8664d0f53bfc27ac28875d (patch)
treeb4de148bcd81dd4169afb9702e9e580514cab589
parent23619bee5f5b649ded8fc313632e778d4ebbb837 (diff)
qt-4.7.0-beta1: build fix for demos/browser
* to fix it properly someone should package libQtMediaServices (now it's built but not packaged) and results to NOTE: Couldn't find shared library provider for libQtMediaServices.so.4 * so demos/browser won't probably work on target as it's now Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
-rw-r--r--recipes/qt4/qt-4.6.2+4.7.0-beta1.inc1
-rw-r--r--recipes/qt4/qt-4.6.2+4.7.0-beta1/demos.browser.add.mediaservices.lib.patch12
2 files changed, 13 insertions, 0 deletions
diff --git a/recipes/qt4/qt-4.6.2+4.7.0-beta1.inc b/recipes/qt4/qt-4.6.2+4.7.0-beta1.inc
index 9de3a5dbc1..35eb4b330a 100644
--- a/recipes/qt4/qt-4.6.2+4.7.0-beta1.inc
+++ b/recipes/qt4/qt-4.6.2+4.7.0-beta1.inc
@@ -15,6 +15,7 @@ SRC_URI = "\
file://0005-Disable-examples-help.patch \
file://0007-Disable-demos-qtdemos.patch \
file://0008-Disable-examples-declarative.patch \
+ file://demos.browser.add.mediaservices.lib.patch \
file://g++.conf \
file://linux.conf \
"
diff --git a/recipes/qt4/qt-4.6.2+4.7.0-beta1/demos.browser.add.mediaservices.lib.patch b/recipes/qt4/qt-4.6.2+4.7.0-beta1/demos.browser.add.mediaservices.lib.patch
new file mode 100644
index 0000000000..27c42dfcec
--- /dev/null
+++ b/recipes/qt4/qt-4.6.2+4.7.0-beta1/demos.browser.add.mediaservices.lib.patch
@@ -0,0 +1,12 @@
+Index: qt-everywhere-opensource-src-4.7.0-beta1/demos/browser/browser.pro
+===================================================================
+--- qt-everywhere-opensource-src-4.7.0-beta1.orig/demos/browser/browser.pro
++++ qt-everywhere-opensource-src-4.7.0-beta1/demos/browser/browser.pro
+@@ -1,6 +1,6 @@
+ TEMPLATE = app
+ TARGET = browser
+-QT += webkit network
++QT += webkit network mediaservices
+
+ CONFIG += qt warn_on
+ contains(QT_BUILD_PARTS, tools):!embedded: CONFIG += uitools