All of lore.kernel.org
 help / color / mirror / Atom feed
* [Buildroot] [PATCH] package/qt5wayland: fix installation with Qt 5.6
@ 2019-11-10 23:49 unixmania at gmail.com
  2019-11-11 15:30 ` Thomas Petazzoni
  2019-11-18 12:58 ` Peter Korsgaard
  0 siblings, 2 replies; 3+ messages in thread
From: unixmania at gmail.com @ 2019-11-10 23:49 UTC (permalink / raw)
  To: buildroot

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(-)

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
-- 
2.18.1

^ permalink raw reply related	[flat|nested] 3+ messages in thread

* [Buildroot] [PATCH] package/qt5wayland: fix installation with Qt 5.6
  2019-11-10 23:49 [Buildroot] [PATCH] package/qt5wayland: fix installation with Qt 5.6 unixmania at gmail.com
@ 2019-11-11 15:30 ` Thomas Petazzoni
  2019-11-18 12:58 ` Peter Korsgaard
  1 sibling, 0 replies; 3+ messages in thread
From: Thomas Petazzoni @ 2019-11-11 15:30 UTC (permalink / raw)
  To: buildroot

On Sun, 10 Nov 2019 20:49:16 -0300
unixmania at 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
-- 
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com

^ permalink raw reply	[flat|nested] 3+ messages in thread

* [Buildroot] [PATCH] package/qt5wayland: fix installation with Qt 5.6
  2019-11-10 23:49 [Buildroot] [PATCH] package/qt5wayland: fix installation with Qt 5.6 unixmania at gmail.com
  2019-11-11 15:30 ` Thomas Petazzoni
@ 2019-11-18 12:58 ` Peter Korsgaard
  1 sibling, 0 replies; 3+ messages in thread
From: Peter Korsgaard @ 2019-11-18 12:58 UTC (permalink / raw)
  To: buildroot

>>>>> "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.

-- 
Bye, Peter Korsgaard

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2019-11-18 12:58 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-11-10 23:49 [Buildroot] [PATCH] package/qt5wayland: fix installation with Qt 5.6 unixmania at gmail.com
2019-11-11 15:30 ` Thomas Petazzoni
2019-11-18 12:58 ` Peter Korsgaard

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.