summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtwayland
diff options
context:
space:
mode:
authorMikko Gronoff <mikko.gronoff@qt.io>2019-11-18 15:44:26 +0200
committerMikko Gronoff <mikko.gronoff@qt.io>2019-11-18 15:45:10 +0200
commit12cc756c7948a90367473f0a52dd2fe2b519dd24 (patch)
tree5db143dfa7dbee5459cf4079d2e72cdf50c68d79 /recipes-qt/qt5/qtwayland
parent3e502778ee161bef4177e7e7f45c0c9b78d047da (diff)
parent432ad2aa6c3a13253fefc909faba368851d21fb1 (diff)
downloadmeta-qt5-5.13.tar.gz
Merge remote-tracking branch 'qtyocto/upstream/zeus' into 5.135.13
* qtyocto/upstream/zeus: 432ad2a qttools: don't install tst_qtattributionsscanner 8115617 qt5: Upgrade to Qt 5.13.2 267e646 python(3)-pyqt5: add qml support 653e12f libqofono: bump SRCREV and add a fix for voicecall cefb48e qtbase: Add PACKAGECONFIG for lttng 911b346 layer: Mark zeus as compatible release c373272 ogl-runtime: Fix build on x86_64 9172ba1 README.md: Document need for 32bit host compiler db2fd6c qtwayland: Fix build with clang/libc++ 6b5122e qtbase: Fix build when fp16 is used Conflicts: recipes-qt/qt5/ogl-runtime_git.bb recipes-qt/qt5/qtbase/0004-configure-bump-path-length-from-256-to-512-character.patch recipes-qt/qt5/qtbase/0013-Disable-ltcg-for-host_build.patch recipes-qt/qt5/qtbase_git.bb recipes-qt/qt5/qtwayland_git.bb Change-Id: I6f325e5d4fc0f2e774962f1b5fd54e5e0e9c96d7
Diffstat (limited to 'recipes-qt/qt5/qtwayland')
-rw-r--r--recipes-qt/qt5/qtwayland/0001-tst_seatv4-Include-array.patch27
1 files changed, 27 insertions, 0 deletions
diff --git a/recipes-qt/qt5/qtwayland/0001-tst_seatv4-Include-array.patch b/recipes-qt/qt5/qtwayland/0001-tst_seatv4-Include-array.patch
new file mode 100644
index 00000000..93f187dc
--- /dev/null
+++ b/recipes-qt/qt5/qtwayland/0001-tst_seatv4-Include-array.patch
@@ -0,0 +1,27 @@
1From 4df2574a86c2ce86c97da0795dec29438b0c0024 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Sun, 6 Oct 2019 21:44:38 -0700
4Subject: [PATCH] tst_seatv4: Include <array>
5
6build fails with libc++ otherwise
7
8tests/auto/client/seatv4/tst_seatv4.cpp:330:43: error: implicit instantiation of undefined template 'std::__1::array<const char *, 4>'
9
10Signed-off-by: Khem Raj <raj.khem@gmail.com>
11---
12 tests/auto/client/seatv4/tst_seatv4.cpp | 2 +-
13 1 file changed, 1 insertion(+), 1 deletion(-)
14
15diff --git a/tests/auto/client/seatv4/tst_seatv4.cpp b/tests/auto/client/seatv4/tst_seatv4.cpp
16index 1d6fb6b9..4c5732da 100644
17--- a/tests/auto/client/seatv4/tst_seatv4.cpp
18+++ b/tests/auto/client/seatv4/tst_seatv4.cpp
19@@ -36,7 +36,7 @@
20 #include <QtWaylandClient/private/qwaylanddisplay_p.h>
21 #include <QtWaylandClient/private/qwaylandintegration_p.h>
22 #endif
23-
24+#include <array>
25 using namespace MockCompositor;
26
27 // wl_seat version 5 was introduced in wayland 1.10, and although that's pretty old,