diff options
author | Samuli Piippo <samuli.piippo@qt.io> | 2016-08-23 13:28:36 +0300 |
---|---|---|
committer | Samuli Piippo <samuli.piippo@qt.io> | 2016-08-23 16:37:11 +0300 |
commit | 7a2707393eccad021763cd9a4294e471883b8590 (patch) | |
tree | 713154f6563edc827a610793baa5a33c6b088a53 /recipes-qt/qt5/qtwayland/0001-examples-wayland-include-server-buffer-only-when-bui.patch | |
parent | 0fc7aeb1cbe2c63e24ce6ef06d290ac586133c2e (diff) | |
parent | d9cd5ede502ddf04767d5531340b12050ee7f899 (diff) | |
download | meta-qt5-7a2707393eccad021763cd9a4294e471883b8590.tar.gz |
Merge remote-tracking branch 'meta-qt5/master' into 5.7
* meta-qt5/master:
qtbase: fix drm dependency for eglfs PACKAGECONFIG
qt5: upgrade to latest revisions in 5.7 branch
qt5-opengles2-test: remove
cmake_qt5.bbclass: when using _prepend don't forget to add space at the end
qtquick1: fix qtwebkit support
qtbase: add PACKAGECONFIG for journald logging
qtserialbus: add recipe
qtwayland: Rework recipe to allow PACKAGECONFIG use
qtwayland: add dependency on libxcomposite
qtcharts: Add dependency on qtmultimedia
packagegroup-qt5-toolchain-target.bb: Add qtdeclarative-tools to RDEPENDS.
Conflicts:
classes/qmake5_base.bbclass
recipes-qt/qt5/nativesdk-qtbase_git.bb
recipes-qt/qt5/qt3d_git.bb
recipes-qt/qt5/qtbase-native_git.bb
recipes-qt/qt5/qtbase/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch
recipes-qt/qt5/qtbase/0003-Add-external-hostbindir-option.patch
recipes-qt/qt5/qtbase/0012-Add-external-hostbindir-option-for-native-sdk.patch
recipes-qt/qt5/qtbase_git.bb
recipes-qt/qt5/qtconnectivity_git.bb
recipes-qt/qt5/qtdeclarative_git.bb
recipes-qt/qt5/qtimageformats_git.bb
recipes-qt/qt5/qtlocation_git.bb
recipes-qt/qt5/qtmultimedia_git.bb
recipes-qt/qt5/qtquick1_git.bb
recipes-qt/qt5/qtquickcontrols2_git.bb
recipes-qt/qt5/qtquickcontrols_git.bb
recipes-qt/qt5/qtsensors_git.bb
recipes-qt/qt5/qtserialport_git.bb
recipes-qt/qt5/qtsystems_git.bb
recipes-qt/qt5/qttools_git.bb
recipes-qt/qt5/qttranslations_git.bb
recipes-qt/qt5/qtwayland-native_git.bb
recipes-qt/qt5/qtwayland_git.bb
recipes-qt/qt5/qtwebengine_git.bb
recipes-qt/qt5/qtxmlpatterns_git.bb
Change-Id: Ia3d047984b6249526d6bf14373114d0fc734c458
Diffstat (limited to 'recipes-qt/qt5/qtwayland/0001-examples-wayland-include-server-buffer-only-when-bui.patch')
-rw-r--r-- | recipes-qt/qt5/qtwayland/0001-examples-wayland-include-server-buffer-only-when-bui.patch | 6 |
1 files changed, 3 insertions, 3 deletions
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 index 72f29534..a21c1094 100644 --- 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 | |||
@@ -1,4 +1,4 @@ | |||
1 | From 3c5c13f2f991cc79363969fb3873d553dd985e7b Mon Sep 17 00:00:00 2001 | 1 | From 733a85c14cb4ade510a0c78b32cd12cb2d70dbbd Mon Sep 17 00:00:00 2001 |
2 | From: Martin Jansa <Martin.Jansa@gmail.com> | 2 | From: Martin Jansa <Martin.Jansa@gmail.com> |
3 | Date: Sat, 22 Feb 2014 17:47:44 +0100 | 3 | Date: Sat, 22 Feb 2014 17:47:44 +0100 |
4 | Subject: [PATCH] examples/wayland: include server-buffer only when building | 4 | Subject: [PATCH] examples/wayland: include server-buffer only when building |
@@ -14,10 +14,10 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | |||
14 | 1 file changed, 3 insertions(+), 1 deletion(-) | 14 | 1 file changed, 3 insertions(+), 1 deletion(-) |
15 | 15 | ||
16 | diff --git a/examples/wayland/wayland.pro b/examples/wayland/wayland.pro | 16 | diff --git a/examples/wayland/wayland.pro b/examples/wayland/wayland.pro |
17 | index b67d12e..c5daad0 100644 | 17 | index 503190c..9943c52 100644 |
18 | --- a/examples/wayland/wayland.pro | 18 | --- a/examples/wayland/wayland.pro |
19 | +++ b/examples/wayland/wayland.pro | 19 | +++ b/examples/wayland/wayland.pro |
20 | @@ -9,4 +9,6 @@ qtHaveModule(quick) { | 20 | @@ -10,4 +10,6 @@ qtHaveModule(quick) { |
21 | SUBDIRS += custom-extension | 21 | SUBDIRS += custom-extension |
22 | } | 22 | } |
23 | 23 | ||