diff options
| author | Mikko Gronoff <mikko.gronoff@qt.io> | 2020-03-02 14:39:52 +0200 |
|---|---|---|
| committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2020-03-03 10:01:14 +0200 |
| commit | af6cd54ed2b6d8834dbf09570dbe42460bd78b92 (patch) | |
| tree | cbb55ca0f320d53b82c69b1afe063b675a20147a /recipes-qt/qt5/qtwayland/0001-tst_seatv4-Include-array.patch | |
| parent | 2da972e58650f5d44f2cfd4fc1ec4e4dc1d2cd48 (diff) | |
| parent | f9a58d623762c5fd78bd6bc18d701a7aaa004567 (diff) | |
| download | meta-qt5-af6cd54ed2b6d8834dbf09570dbe42460bd78b92.tar.gz | |
Merge "Merge remote-tracking branch 'qt/upstream/master' into 5.14"
Diffstat (limited to 'recipes-qt/qt5/qtwayland/0001-tst_seatv4-Include-array.patch')
| -rw-r--r-- | recipes-qt/qt5/qtwayland/0001-tst_seatv4-Include-array.patch | 4 |
1 files changed, 2 insertions, 2 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 index 93f187dc..b21cb5a7 100644 --- a/recipes-qt/qt5/qtwayland/0001-tst_seatv4-Include-array.patch +++ b/recipes-qt/qt5/qtwayland/0001-tst_seatv4-Include-array.patch | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | From 4df2574a86c2ce86c97da0795dec29438b0c0024 Mon Sep 17 00:00:00 2001 | 1 | From e1c8cf94727583c666efe3e6852fa60fba9a652b Mon Sep 17 00:00:00 2001 |
| 2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
| 3 | Date: Sun, 6 Oct 2019 21:44:38 -0700 | 3 | Date: Sun, 6 Oct 2019 21:44:38 -0700 |
| 4 | Subject: [PATCH] tst_seatv4: Include <array> | 4 | Subject: [PATCH] tst_seatv4: Include <array> |
| @@ -13,7 +13,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
| 13 | 1 file changed, 1 insertion(+), 1 deletion(-) | 13 | 1 file changed, 1 insertion(+), 1 deletion(-) |
| 14 | 14 | ||
| 15 | diff --git a/tests/auto/client/seatv4/tst_seatv4.cpp b/tests/auto/client/seatv4/tst_seatv4.cpp | 15 | diff --git a/tests/auto/client/seatv4/tst_seatv4.cpp b/tests/auto/client/seatv4/tst_seatv4.cpp |
| 16 | index 1d6fb6b9..4c5732da 100644 | 16 | index 2e17bef8..df78ba69 100644 |
| 17 | --- a/tests/auto/client/seatv4/tst_seatv4.cpp | 17 | --- a/tests/auto/client/seatv4/tst_seatv4.cpp |
| 18 | +++ b/tests/auto/client/seatv4/tst_seatv4.cpp | 18 | +++ b/tests/auto/client/seatv4/tst_seatv4.cpp |
| 19 | @@ -36,7 +36,7 @@ | 19 | @@ -36,7 +36,7 @@ |