projects / buildroot.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 2726952)
package/qt5wayland: fix installation with Qt 5.6
authorCarlos Santos <unixmania@gmail.com>
Sun, 10 Nov 2019 23:49:16 +0000 (20:49 -0300)
committerThomas Petazzoni <thomas.petazzoni@bootlin.com>
Mon, 11 Nov 2019 15:29:58 +0000 (16:29 +0100)
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>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
package/qt5/qt5wayland/qt5wayland.mk patch | blob | history

diff --git a/package/qt5/qt5wayland/qt5wayland.mk b/package/qt5/qt5wayland/qt5wayland.mk
index 0bda596f3b638b3d51207aa25a1bb37d51ac3f56..4790efc66048b3742e59ef13af1644c37b858d5d 100644 (file)
--- 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