diff mbox series

package/qt5wayland: fix installation with Qt 5.6

Message ID 20191110234916.1473-1-unixmania@gmail.com
State Accepted
Headers show
Series package/qt5wayland: fix installation with Qt 5.6 | expand

Commit Message

Carlos Santos Nov. 10, 2019, 11:49 p.m. UTC 
From: Carlos Santos <unixmania@gmail.com>

Install QtWayland only if the latest Qt version is selected. It does not
exist in version 5.6.

Signed-off-by: Carlos Santos <unixmania@gmail.com>
---
 package/qt5/qt5wayland/qt5wayland.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Thomas Petazzoni Nov. 11, 2019, 3:30 p.m. UTC | #1 
On Sun, 10 Nov 2019 20:49:16 -0300
unixmania@gmail.com wrote:

> From: Carlos Santos <unixmania@gmail.com>
> 
> Install QtWayland only if the latest Qt version is selected. It does not
> exist in version 5.6.
> 
> Signed-off-by: Carlos Santos <unixmania@gmail.com>
> ---
>  package/qt5/qt5wayland/qt5wayland.mk | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

Applied to master, thanks.

Thomas
Peter Korsgaard Nov. 18, 2019, 12:58 p.m. UTC | #2 
>>>>> "unixmania" == unixmania  <unixmania@gmail.com> writes:

 > From: Carlos Santos <unixmania@gmail.com>
 > Install QtWayland only if the latest Qt version is selected. It does not
 > exist in version 5.6.

 > Signed-off-by: Carlos Santos <unixmania@gmail.com>

Committed to 2019.08.x, thanks.
diff mbox series

Patch

diff --git a/package/qt5/qt5wayland/qt5wayland.mk b/package/qt5/qt5wayland/qt5wayland.mk
index 0bda596f3b..4790efc660 100644
--- a/package/qt5/qt5wayland/qt5wayland.mk
+++ b/package/qt5/qt5wayland/qt5wayland.mk
@@ -52,7 +52,7 @@  define QT5WAYLAND_INSTALL_COMPOSITOR
 	cp -dpf $(STAGING_DIR)/usr/lib/libQt5Compositor.so* $(TARGET_DIR)/usr/lib
 endef
 endif
-ifeq ($(BR2_PACKAGE_QT5DECLARATIVE_QUICK),y)
+ifeq ($(BR2_PACKAGE_QT5DECLARATIVE_QUICK)$(BR2_PACKAGE_QT5_VERSION_LATEST),yy)
 define QT5WAYLAND_INSTALL_COMPOSITOR_QMLS
 	cp -dpfr $(STAGING_DIR)/usr/qml/QtWayland $(TARGET_DIR)/usr/qml/
 endef