diff options
| author | Martin Jansa <Martin.Jansa@gmail.com> | 2019-10-31 11:40:30 +0000 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2019-10-31 15:26:55 +0000 |
| commit | 81156172a83da2210e9af290f95f45fd194c84a2 (patch) | |
| tree | 1026e1a48d6ac51358cec65c1a8552eb1d5c77a7 /recipes-qt/qt5/qtwayland | |
| parent | 267e64612558cd562a63925e07e3e87e976a8a44 (diff) | |
qt5: Upgrade to Qt 5.13.2
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qtwayland')
| -rw-r--r-- | recipes-qt/qt5/qtwayland/0001-Fix-use-of-private-dependency.patch | 36 | ||||
| -rw-r--r-- | recipes-qt/qt5/qtwayland/0001-tst_seatv4-Include-array.patch | 7 |
2 files changed, 2 insertions, 41 deletions
diff --git a/recipes-qt/qt5/qtwayland/0001-Fix-use-of-private-dependency.patch b/recipes-qt/qt5/qtwayland/0001-Fix-use-of-private-dependency.patch deleted file mode 100644 index 3cf195db..00000000 --- a/recipes-qt/qt5/qtwayland/0001-Fix-use-of-private-dependency.patch +++ /dev/null @@ -1,36 +0,0 @@ -From f4636b934f90b2a07b09f1925a86440cf1944d08 Mon Sep 17 00:00:00 2001 -From: Pier Luigi Fiorini <pierluigi.fiorini@liri.io> -Date: Wed, 24 Jul 2019 23:40:55 +0200 -Subject: [PATCH] Fix use of private dependency - -With 0761173a, Linux SPI Accessibility bridge was added to -the Wayland QPA plugin, but this had a bad side-effect to -QtWaylandClient. - -Linux Accessibility support is a private module, this means we have -to link to it with QT_PRIVATE not QT, otherwise CMake and pkg-config -files for Qt5WaylandClient will depend on it. - -Change-Id: I6182267f97adc2cd5bd66895df148a6a45614f45 -Fixes: QTBUG-76042 -Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io> ---- - src/client/client.pro | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/client/client.pro b/src/client/client.pro -index db91bd69..4233ac95 100644 ---- a/src/client/client.pro -+++ b/src/client/client.pro -@@ -20,7 +20,7 @@ qtConfig(xkbcommon) { - } - - qtHaveModule(linuxaccessibility_support_private): \ -- QT += linuxaccessibility_support_private -+ QT_PRIVATE += linuxaccessibility_support_private - - QMAKE_USE += wayland-client - --- -2.21.0 - 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 1f15ea0d..93f187dc 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 @@ -From ccd576151ecf174dbfbb854dbcbfe55a5f723124 Mon Sep 17 00:00:00 2001 +From 4df2574a86c2ce86c97da0795dec29438b0c0024 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Sun, 6 Oct 2019 21:44:38 -0700 Subject: [PATCH] tst_seatv4: Include <array> @@ -13,7 +13,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/auto/client/seatv4/tst_seatv4.cpp b/tests/auto/client/seatv4/tst_seatv4.cpp -index 7dc2e727..3ddbb971 100644 +index 1d6fb6b9..4c5732da 100644 --- a/tests/auto/client/seatv4/tst_seatv4.cpp +++ b/tests/auto/client/seatv4/tst_seatv4.cpp @@ -36,7 +36,7 @@ @@ -25,6 +25,3 @@ index 7dc2e727..3ddbb971 100644 using namespace MockCompositor; // wl_seat version 5 was introduced in wayland 1.10, and although that's pretty old, --- -2.23.0 - |