Skip to contentSkip to conversation

package/qt5wayland: fix installation with Qt 5.6

PATCH New unixmania at gmail.com 3 participants 3 messages Nov 10, 2019 – Nov 18, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 package/qt5wayland: fix installation with Qt 5.6

From: Carlos Santos <[email protected]>

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

---
 package/qt5/qt5wayland/qt5wayland.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
package/qt5/qt5wayland/qt5wayland.mk +1 -1
index 0bda596f3b..4790efc660 100644
@@ -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
Signature · 1 line
2.18.1
#1 lore raw

PATCH 1/1 package/qt5wayland: fix installation with Qt 5.6

Quoted 9 lines · On Sun, 10 Nov 2019 20:49:16 -0300 unixmania at gmail.com wrote:

From: Carlos Santos <[email protected]>

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

---
 package/qt5/qt5wayland/qt5wayland.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Applied to master, thanks.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
#2 lore raw

PATCH 1/1 package/qt5wayland: fix installation with Qt 5.6

In reply to unixmania at gmail.com
Quoted 7 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"unixmania" == unixmania <[email protected]> writes:

From: Carlos Santos <[email protected]>
Install QtWayland only if the latest Qt version is selected. It does not exist in version 5.6.

Committed to 2019.08.x, thanks.

Signature · 1 line
Bye, Peter Korsgaard