diff options
| author | Jonathan Liu <net147@gmail.com> | 2014-12-11 15:52:18 +1100 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2014-12-11 13:24:22 +0100 |
| commit | 6566f728ab3d14a4908516fb13ad555dbfe04471 (patch) | |
| tree | d73319dd12e71d434c01b25d04f9b5c84a5c83cc /recipes-qt/qt5/qtwayland | |
| parent | c9a1041cb956d94c04cbf635b00ca19725ffc129 (diff) | |
recipes: upgrade from 5.3.2 to 5.4.0
MJ: nativesdk-qtbase, nativesdk-qttools, qtbase-native: Drop unnecessary LICENSE/LIC_FILES_CHKSUM
MJ: qtwebkit: move leveldb dependency to .inc
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Jonathan Liu <net147@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qtwayland')
| -rw-r--r-- | recipes-qt/qt5/qtwayland/0001-Install-the-qtwaylandscanner-tool-to-the-native-side.patch | 4 | ||||
| -rw-r--r-- | recipes-qt/qt5/qtwayland/0001-examples-wayland-include-server-buffer-only-when-bui.patch (renamed from recipes-qt/qt5/qtwayland/0001-examples.pro-include-server-buffer-only-when-buildin.patch) | 18 |
2 files changed, 11 insertions, 11 deletions
diff --git a/recipes-qt/qt5/qtwayland/0001-Install-the-qtwaylandscanner-tool-to-the-native-side.patch b/recipes-qt/qt5/qtwayland/0001-Install-the-qtwaylandscanner-tool-to-the-native-side.patch index e224e55e..ae3d998f 100644 --- a/recipes-qt/qt5/qtwayland/0001-Install-the-qtwaylandscanner-tool-to-the-native-side.patch +++ b/recipes-qt/qt5/qtwayland/0001-Install-the-qtwaylandscanner-tool-to-the-native-side.patch @@ -1,4 +1,4 @@ -From fd79724a05ee7fb52d8ac1b02057e7a1ba4efb14 Mon Sep 17 00:00:00 2001 +From 99c49a3304c1d08d164e0df252ca85f426381bb7 Mon Sep 17 00:00:00 2001 From: Simon Busch <morphis@gravedo.de> Date: Fri, 19 Jul 2013 13:35:14 +0000 Subject: [PATCH] Install the qtwaylandscanner tool to the native side @@ -28,5 +28,5 @@ index ac2d07b..7a46a24 100644 +target.path = $$[QT_HOST_BINS] +INSTALLS += target -- -2.1.1 +2.1.3 diff --git a/recipes-qt/qt5/qtwayland/0001-examples.pro-include-server-buffer-only-when-buildin.patch b/recipes-qt/qt5/qtwayland/0001-examples-wayland-include-server-buffer-only-when-bui.patch index 1b46f9bc..664fa3f9 100644 --- a/recipes-qt/qt5/qtwayland/0001-examples.pro-include-server-buffer-only-when-buildin.patch +++ b/recipes-qt/qt5/qtwayland/0001-examples-wayland-include-server-buffer-only-when-bui.patch @@ -1,22 +1,22 @@ -From 6e554b116bfe57744a3de02370fd96b9ea13ecb2 Mon Sep 17 00:00:00 2001 +From cd1e17e8c6082fe8578d64baaff55f1f00c0f7a0 Mon Sep 17 00:00:00 2001 From: Martin Jansa <Martin.Jansa@gmail.com> Date: Sat, 22 Feb 2014 17:47:44 +0100 -Subject: [PATCH] examples.pro: include server-buffer only when building with - opengles2 +Subject: [PATCH] examples/wayland: include server-buffer only when building + with opengles2 * it's using glBindBuffer in server-buffer/client/serverbufferrenderer.cpp -Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Change-Id: I8412dfd4ebb95c147328ac6e4dfff14a0cff4e78 +Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> --- - examples/examples.pro | 4 +++- + examples/wayland/wayland.pro | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) -diff --git a/examples/examples.pro b/examples/examples.pro +diff --git a/examples/wayland/wayland.pro b/examples/wayland/wayland.pro index d633fb9..643c7cd 100644 ---- a/examples/examples.pro -+++ b/examples/examples.pro +--- a/examples/wayland/wayland.pro ++++ b/examples/wayland/wayland.pro @@ -9,5 +9,7 @@ contains(CONFIG, wayland-compositor) { SUBDIRS += qml-compositor } @@ -27,5 +27,5 @@ index d633fb9..643c7cd 100644 + } } -- -2.1.1 +2.1.3 |