diff options
| author | florin.sarbu <florin.sarbu@windriver.com> | 2014-03-06 12:46:40 +0200 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2014-03-11 05:21:21 +0100 |
| commit | 13624dc95e73241b2f21571f545b72e655dd4f66 (patch) | |
| tree | 6c45cd4c7b7290fc227951ba9429ba06dd895e58 /recipes-qt | |
| parent | 68772fb4caafd4ec1d6c821f5365b69c8b4b700c (diff) | |
| download | meta-qt5-13624dc95e73241b2f21571f545b72e655dd4f66.tar.gz | |
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>
Diffstat (limited to 'recipes-qt')
| -rw-r--r-- | recipes-qt/qt5/qtwayland-5.1.0+git/fix.missing.v8.public.api.patch | 30 | ||||
| -rw-r--r-- | recipes-qt/qt5/qtwayland-git/fix.missing.v8.public.api.patch | 30 | ||||
| -rw-r--r-- | recipes-qt/qt5/qtwayland.inc | 1 |
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 @@ | |||
| 1 | From b455f5acaec811b70ae3eb896c08a634909cb9d1 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Carsten Munk <carsten.munk@jollamobile.com> | ||
| 3 | Date: Wed, 17 Jul 2013 07:28:04 +0000 | ||
| 4 | Subject: [PATCH] Fix Project ERROR: Module v8 has no public API. make[1]: *** | ||
| 5 | [sub-qml-compositor-make_first] Error 3 | ||
| 6 | |||
| 7 | Cherry-picked from: | ||
| 8 | https://github.com/kvahlman/qtwayland/commit/b455f5acaec811b70ae3eb896c08a634909cb9d1 | ||
| 9 | |||
| 10 | Signed-off-by: Carsten Munk <carsten.munk@jollamobile.com> | ||
| 11 | --- | ||
| 12 | qtwayland/examples/qml-compositor/qml-compositor.pro | 2 +- | ||
| 13 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
| 14 | |||
| 15 | diff --git a/examples/qml-compositor/qml-compositor.pro b/examples/qml-compositor/qml-compositor.pro | ||
| 16 | index 0bc0b02..e397002 100644 | ||
| 17 | --- a/examples/qml-compositor/qml-compositor.pro | ||
| 18 | +++ b/examples/qml-compositor/qml-compositor.pro | ||
| 19 | @@ -2,7 +2,7 @@ DEFINES += QT_COMPOSITOR_QUICK | ||
| 20 | |||
| 21 | LIBS += -L ../../lib | ||
| 22 | |||
| 23 | -QT += quick qml v8 | ||
| 24 | +QT += quick qml | ||
| 25 | QT += quick-private | ||
| 26 | |||
| 27 | QT += compositor | ||
| 28 | -- | ||
| 29 | 1.8.4 | ||
| 30 | |||
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 @@ | |||
| 1 | From b455f5acaec811b70ae3eb896c08a634909cb9d1 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Carsten Munk <carsten.munk@jollamobile.com> | ||
| 3 | Date: Wed, 17 Jul 2013 07:28:04 +0000 | ||
| 4 | Subject: [PATCH] Fix Project ERROR: Module v8 has no public API. make[1]: *** | ||
| 5 | [sub-qml-compositor-make_first] Error 3 | ||
| 6 | |||
| 7 | Cherry-picked from: | ||
| 8 | https://github.com/kvahlman/qtwayland/commit/b455f5acaec811b70ae3eb896c08a634909cb9d1 | ||
| 9 | |||
| 10 | Signed-off-by: Carsten Munk <carsten.munk@jollamobile.com> | ||
| 11 | --- | ||
| 12 | qtwayland/examples/qml-compositor/qml-compositor.pro | 2 +- | ||
| 13 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
| 14 | |||
| 15 | diff --git a/examples/qml-compositor/qml-compositor.pro b/examples/qml-compositor/qml-compositor.pro | ||
| 16 | index 0bc0b02..e397002 100644 | ||
| 17 | --- a/examples/qml-compositor/qml-compositor.pro | ||
| 18 | +++ b/examples/qml-compositor/qml-compositor.pro | ||
| 19 | @@ -2,7 +2,7 @@ DEFINES += QT_COMPOSITOR_QUICK | ||
| 20 | |||
| 21 | LIBS += -L ../../lib | ||
| 22 | |||
| 23 | -QT += quick qml v8 | ||
| 24 | +QT += quick qml | ||
| 25 | QT += quick-private | ||
| 26 | |||
| 27 | QT += compositor | ||
| 28 | -- | ||
| 29 | 1.8.4 | ||
| 30 | |||
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 += " \ | |||
| 17 | file://0001-xcbcommon-should-not-be-a-mandatory-dependency.patch \ | 17 | file://0001-xcbcommon-should-not-be-a-mandatory-dependency.patch \ |
| 18 | file://0002-Temporarily-patching-this-out-as-Qt5.0.0-does-not-ha.patch \ | 18 | file://0002-Temporarily-patching-this-out-as-Qt5.0.0-does-not-ha.patch \ |
| 19 | file://0003-eglCreateImageKHR-requires-the-context-to-be-NULL.patch \ | 19 | file://0003-eglCreateImageKHR-requires-the-context-to-be-NULL.patch \ |
| 20 | file://fix.missing.v8.public.api.patch \ | ||
| 20 | " | 21 | " |
| 21 | 22 | ||
| 22 | QT_WAYLAND_CONFIG ?= "wayland-compositor" | 23 | QT_WAYLAND_CONFIG ?= "wayland-compositor" |
