From 6566f728ab3d14a4908516fb13ad555dbfe04471 Mon Sep 17 00:00:00 2001 From: Jonathan Liu Date: Thu, 11 Dec 2014 15:52:18 +1100 Subject: 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 Signed-off-by: Jonathan Liu --- ...-qtwaylandscanner-tool-to-the-native-side.patch | 4 +-- ...yland-include-server-buffer-only-when-bui.patch | 31 ++++++++++++++++++++++ ...o-include-server-buffer-only-when-buildin.patch | 31 ---------------------- 3 files changed, 33 insertions(+), 33 deletions(-) create mode 100644 recipes-qt/qt5/qtwayland/0001-examples-wayland-include-server-buffer-only-when-bui.patch delete mode 100644 recipes-qt/qt5/qtwayland/0001-examples.pro-include-server-buffer-only-when-buildin.patch (limited to 'recipes-qt/qt5/qtwayland') 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 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-wayland-include-server-buffer-only-when-bui.patch b/recipes-qt/qt5/qtwayland/0001-examples-wayland-include-server-buffer-only-when-bui.patch new file mode 100644 index 00000000..664fa3f9 --- /dev/null +++ b/recipes-qt/qt5/qtwayland/0001-examples-wayland-include-server-buffer-only-when-bui.patch @@ -0,0 +1,31 @@ +From cd1e17e8c6082fe8578d64baaff55f1f00c0f7a0 Mon Sep 17 00:00:00 2001 +From: Martin Jansa +Date: Sat, 22 Feb 2014 17:47:44 +0100 +Subject: [PATCH] examples/wayland: include server-buffer only when building + with opengles2 + +* it's using glBindBuffer in + server-buffer/client/serverbufferrenderer.cpp + +Change-Id: I8412dfd4ebb95c147328ac6e4dfff14a0cff4e78 +Signed-off-by: Martin Jansa +--- + examples/wayland/wayland.pro | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/examples/wayland/wayland.pro b/examples/wayland/wayland.pro +index d633fb9..643c7cd 100644 +--- a/examples/wayland/wayland.pro ++++ b/examples/wayland/wayland.pro +@@ -9,5 +9,7 @@ contains(CONFIG, wayland-compositor) { + SUBDIRS += qml-compositor + } + +- SUBDIRS += server-buffer ++ contains(QT_CONFIG, opengles2) { ++ SUBDIRS += server-buffer ++ } + } +-- +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.pro-include-server-buffer-only-when-buildin.patch deleted file mode 100644 index 1b46f9bc..00000000 --- a/recipes-qt/qt5/qtwayland/0001-examples.pro-include-server-buffer-only-when-buildin.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 6e554b116bfe57744a3de02370fd96b9ea13ecb2 Mon Sep 17 00:00:00 2001 -From: Martin Jansa -Date: Sat, 22 Feb 2014 17:47:44 +0100 -Subject: [PATCH] examples.pro: include server-buffer only when building with - opengles2 - -* it's using glBindBuffer in - server-buffer/client/serverbufferrenderer.cpp - -Signed-off-by: Martin Jansa -Change-Id: I8412dfd4ebb95c147328ac6e4dfff14a0cff4e78 ---- - examples/examples.pro | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/examples/examples.pro b/examples/examples.pro -index d633fb9..643c7cd 100644 ---- a/examples/examples.pro -+++ b/examples/examples.pro -@@ -9,5 +9,7 @@ contains(CONFIG, wayland-compositor) { - SUBDIRS += qml-compositor - } - -- SUBDIRS += server-buffer -+ contains(QT_CONFIG, opengles2) { -+ SUBDIRS += server-buffer -+ } - } --- -2.1.1 - -- cgit v1.2.3-54-g00ecf