diff options
author | Andreas Müller <schnitzeltony@gmail.com> | 2019-08-18 16:22:26 +0200 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2019-08-22 16:15:15 +0000 |
commit | 725c87da81a5bfb6e838f7fb53f14bb2c06cf81a (patch) | |
tree | 3a89c8ecdf7bd0d8f400576fac0a587a9e9ebcca | |
parent | a41cd9eded4bd661a71c86a2d6080094f8a77069 (diff) | |
download | meta-qt5-725c87da81a5bfb6e838f7fb53f14bb2c06cf81a.tar.gz |
qtwayland: do not reference private modules in cmake Qt5WaylandClient
The files referenced are not installed causing trouble in projects using
Qt5WaylandClientConfig.cmake:
| CMake Error at /home/superandy/tmp/oe-core-glibc/work/cortexa7t2hf-neon-vfpv4-mortsgna-linux-gnueabi/liri-shell/0.9.0+gitAUTOINC+42bd7f4610-r0/recipe-sysroot/usr/lib/cmake/Qt5WaylandClient/Qt5WaylandClientConfig.cmake:110 (find_package):
| Could not find a package configuration file provided by
| "Qt5LinuxAccessibilitySupport" (requested version 5.13.0) with any of the
| following names:
|
| Qt5LinuxAccessibilitySupportConfig.cmake
| qt5linuxaccessibilitysupport-config.cmake
Fixes: QTBUG-76042 [1]
Upstream-Status: Applied [2]
[1] https://bugreports.qt.io/browse/QTBUG-76042
[2] https://code.qt.io/cgit/qt/qtwayland.git/commit/?id=f4636b934f90b2a07b09f1925a86440cf1944d08
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
-rw-r--r-- | recipes-qt/qt5/qtwayland/0001-Fix-use-of-private-dependency.patch | 36 | ||||
-rw-r--r-- | recipes-qt/qt5/qtwayland_git.bb | 2 |
2 files changed, 38 insertions, 0 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 new file mode 100644 index 00000000..3cf195db --- /dev/null +++ b/recipes-qt/qt5/qtwayland/0001-Fix-use-of-private-dependency.patch | |||
@@ -0,0 +1,36 @@ | |||
1 | From f4636b934f90b2a07b09f1925a86440cf1944d08 Mon Sep 17 00:00:00 2001 | ||
2 | From: Pier Luigi Fiorini <pierluigi.fiorini@liri.io> | ||
3 | Date: Wed, 24 Jul 2019 23:40:55 +0200 | ||
4 | Subject: [PATCH] Fix use of private dependency | ||
5 | |||
6 | With 0761173a, Linux SPI Accessibility bridge was added to | ||
7 | the Wayland QPA plugin, but this had a bad side-effect to | ||
8 | QtWaylandClient. | ||
9 | |||
10 | Linux Accessibility support is a private module, this means we have | ||
11 | to link to it with QT_PRIVATE not QT, otherwise CMake and pkg-config | ||
12 | files for Qt5WaylandClient will depend on it. | ||
13 | |||
14 | Change-Id: I6182267f97adc2cd5bd66895df148a6a45614f45 | ||
15 | Fixes: QTBUG-76042 | ||
16 | Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io> | ||
17 | --- | ||
18 | src/client/client.pro | 2 +- | ||
19 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
20 | |||
21 | diff --git a/src/client/client.pro b/src/client/client.pro | ||
22 | index db91bd69..4233ac95 100644 | ||
23 | --- a/src/client/client.pro | ||
24 | +++ b/src/client/client.pro | ||
25 | @@ -20,7 +20,7 @@ qtConfig(xkbcommon) { | ||
26 | } | ||
27 | |||
28 | qtHaveModule(linuxaccessibility_support_private): \ | ||
29 | - QT += linuxaccessibility_support_private | ||
30 | + QT_PRIVATE += linuxaccessibility_support_private | ||
31 | |||
32 | QMAKE_USE += wayland-client | ||
33 | |||
34 | -- | ||
35 | 2.21.0 | ||
36 | |||
diff --git a/recipes-qt/qt5/qtwayland_git.bb b/recipes-qt/qt5/qtwayland_git.bb index 8a6f38f6..cd55b43b 100644 --- a/recipes-qt/qt5/qtwayland_git.bb +++ b/recipes-qt/qt5/qtwayland_git.bb | |||
@@ -13,6 +13,8 @@ LIC_FILES_CHKSUM = " \ | |||
13 | file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ | 13 | file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ |
14 | " | 14 | " |
15 | 15 | ||
16 | SRC_URI += "file://0001-Fix-use-of-private-dependency.patch" | ||
17 | |||
16 | PACKAGECONFIG ?= " \ | 18 | PACKAGECONFIG ?= " \ |
17 | wayland-client \ | 19 | wayland-client \ |
18 | wayland-server \ | 20 | wayland-server \ |