aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorflorin.sarbu <florin.sarbu@windriver.com>2014-03-06 12:46:40 +0200
committerMartin Jansa <Martin.Jansa@gmail.com>2014-03-11 05:21:21 +0100
commit13624dc95e73241b2f21571f545b72e655dd4f66 (patch)
tree6c45cd4c7b7290fc227951ba9429ba06dd895e58
parent68772fb4caafd4ec1d6c821f5365b69c8b4b700c (diff)
qtwayland: Fix Project ERROR: Module v8 has no public API
Signed-off-by: Florin Sarbu <florin.sarbu@windriver.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
-rw-r--r--recipes-qt/qt5/qtwayland-5.1.0+git/fix.missing.v8.public.api.patch30
-rw-r--r--recipes-qt/qt5/qtwayland-git/fix.missing.v8.public.api.patch30
-rw-r--r--recipes-qt/qt5/qtwayland.inc1
3 files changed, 61 insertions, 0 deletions
diff --git a/recipes-qt/qt5/qtwayland-5.1.0+git/fix.missing.v8.public.api.patch b/recipes-qt/qt5/qtwayland-5.1.0+git/fix.missing.v8.public.api.patch
new file mode 100644
index 00000000..6bbbaa1e
--- /dev/null
+++ b/recipes-qt/qt5/qtwayland-5.1.0+git/fix.missing.v8.public.api.patch
@@ -0,0 +1,30 @@
+From b455f5acaec811b70ae3eb896c08a634909cb9d1 Mon Sep 17 00:00:00 2001
+From: Carsten Munk <carsten.munk@jollamobile.com>
+Date: Wed, 17 Jul 2013 07:28:04 +0000
+Subject: [PATCH] Fix Project ERROR: Module v8 has no public API. make[1]: ***
+ [sub-qml-compositor-make_first] Error 3
+
+Cherry-picked from:
+https://github.com/kvahlman/qtwayland/commit/b455f5acaec811b70ae3eb896c08a634909cb9d1
+
+Signed-off-by: Carsten Munk <carsten.munk@jollamobile.com>
+---
+ qtwayland/examples/qml-compositor/qml-compositor.pro | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/examples/qml-compositor/qml-compositor.pro b/examples/qml-compositor/qml-compositor.pro
+index 0bc0b02..e397002 100644
+--- a/examples/qml-compositor/qml-compositor.pro
++++ b/examples/qml-compositor/qml-compositor.pro
+@@ -2,7 +2,7 @@ DEFINES += QT_COMPOSITOR_QUICK
+
+ LIBS += -L ../../lib
+
+-QT += quick qml v8
++QT += quick qml
+ QT += quick-private
+
+ QT += compositor
+--
+1.8.4
+
diff --git a/recipes-qt/qt5/qtwayland-git/fix.missing.v8.public.api.patch b/recipes-qt/qt5/qtwayland-git/fix.missing.v8.public.api.patch
new file mode 100644
index 00000000..6bbbaa1e
--- /dev/null
+++ b/recipes-qt/qt5/qtwayland-git/fix.missing.v8.public.api.patch
@@ -0,0 +1,30 @@
+From b455f5acaec811b70ae3eb896c08a634909cb9d1 Mon Sep 17 00:00:00 2001
+From: Carsten Munk <carsten.munk@jollamobile.com>
+Date: Wed, 17 Jul 2013 07:28:04 +0000
+Subject: [PATCH] Fix Project ERROR: Module v8 has no public API. make[1]: ***
+ [sub-qml-compositor-make_first] Error 3
+
+Cherry-picked from:
+https://github.com/kvahlman/qtwayland/commit/b455f5acaec811b70ae3eb896c08a634909cb9d1
+
+Signed-off-by: Carsten Munk <carsten.munk@jollamobile.com>
+---
+ qtwayland/examples/qml-compositor/qml-compositor.pro | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/examples/qml-compositor/qml-compositor.pro b/examples/qml-compositor/qml-compositor.pro
+index 0bc0b02..e397002 100644
+--- a/examples/qml-compositor/qml-compositor.pro
++++ b/examples/qml-compositor/qml-compositor.pro
+@@ -2,7 +2,7 @@ DEFINES += QT_COMPOSITOR_QUICK
+
+ LIBS += -L ../../lib
+
+-QT += quick qml v8
++QT += quick qml
+ QT += quick-private
+
+ QT += compositor
+--
+1.8.4
+
diff --git a/recipes-qt/qt5/qtwayland.inc b/recipes-qt/qt5/qtwayland.inc
index 40dd803a..2d5d6af5 100644
--- a/recipes-qt/qt5/qtwayland.inc
+++ b/recipes-qt/qt5/qtwayland.inc
@@ -17,6 +17,7 @@ SRC_URI += " \
file://0001-xcbcommon-should-not-be-a-mandatory-dependency.patch \
file://0002-Temporarily-patching-this-out-as-Qt5.0.0-does-not-ha.patch \
file://0003-eglCreateImageKHR-requires-the-context-to-be-NULL.patch \
+ file://fix.missing.v8.public.api.patch \
"
QT_WAYLAND_CONFIG ?= "wayland-compositor"