[Buildroot] [PATCH 1/1] package/qt5wayland: install compositor QML files

[Buildroot] [PATCH 1/1] package/qt5wayland: install compositor QML files

[nowrep at gmail.com]

From: David Rosca <nowrep@gmail.com>

Fixes using QtWayland.Compositor QML import.

Signed-off-by: David Rosca <nowrep@gmail.com>
---
 package/qt5/qt5wayland/qt5wayland.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/qt5/qt5wayland/qt5wayland.mk b/package/qt5/qt5wayland/qt5wayland.mk
index f96e4c2f8f..6ff8ba169f 100644
--- a/package/qt5/qt5wayland/qt5wayland.mk
+++ b/package/qt5/qt5wayland/qt5wayland.mk
@@ -46,6 +46,7 @@ ifeq ($(BR2_PACKAGE_QT5WAYLAND_COMPOSITOR),y)
 ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y)
 define QT5WAYLAND_INSTALL_COMPOSITOR
 	cp -dpf $(STAGING_DIR)/usr/lib/libQt5WaylandCompositor.so* $(TARGET_DIR)/usr/lib
+	cp -dpfr $(STAGING_DIR)/usr/qml/QtWayland $(TARGET_DIR)/usr/qml/
 endef
 else
 define QT5WAYLAND_INSTALL_COMPOSITOR
-- 
2.21.0

[Buildroot] [PATCH 1/1] package/qt5wayland: install compositor QML files

[Thomas Petazzoni]

Hello David,

On Sat, 11 May 2019 17:07:49 +0200
nowrep at gmail.com wrote:

> From: David Rosca <nowrep@gmail.com>
> 
> Fixes using QtWayland.Compositor QML import.
> 
> Signed-off-by: David Rosca <nowrep@gmail.com>
> ---
>  package/qt5/qt5wayland/qt5wayland.mk | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/package/qt5/qt5wayland/qt5wayland.mk b/package/qt5/qt5wayland/qt5wayland.mk
> index f96e4c2f8f..6ff8ba169f 100644
> --- a/package/qt5/qt5wayland/qt5wayland.mk
> +++ b/package/qt5/qt5wayland/qt5wayland.mk
> @@ -46,6 +46,7 @@ ifeq ($(BR2_PACKAGE_QT5WAYLAND_COMPOSITOR),y)
>  ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y)
>  define QT5WAYLAND_INSTALL_COMPOSITOR
>  	cp -dpf $(STAGING_DIR)/usr/lib/libQt5WaylandCompositor.so* $(TARGET_DIR)/usr/lib
> +	cp -dpfr $(STAGING_DIR)/usr/qml/QtWayland $(TARGET_DIR)/usr/qml/

Thanks a lot for your patch. However, I see two problems with it:

 - First of all, QML files are only generated when
   BR2_PACKAGE_QT5DECLARATIVE_QUICK=y, but BR2_PACKAGE_QT5WAYLAND does
   not mandate having BR2_PACKAGE_QT5DECLARATIVE_QUICK as far as I can
   see. So I believe we need a conditional on
   BR2_PACKAGE_QT5DECLARATIVE_QUICK=y. See qt5location.mk for an
   example.

 - Secondly, you only handle the BR2_PACKAGE_QT5_VERSION_LATEST case
   (i.e Qt 5.11), but not the Qt LTS version (5.6) case. Does it mean
   that Qt 5.6 did not have those QML files (if that's the case, the
   commit log should at least say it) ? Or was it an oversight ?

Thanks a lot,

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com

[Buildroot] [PATCH v2] package/qt5wayland: install compositor QML files

[David Rosca]

Fixes using QtWayland.Compositor QML import.

Signed-off-by: David Rosca <nowrep@gmail.com>

---
Changes v1 -> v2:
  - move under BR2_PACKAGE_QT5DECLARATIVE_QUICK condition
  - also handle stable Qt version (5.6)
---
 package/qt5/qt5wayland/qt5wayland.mk | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/package/qt5/qt5wayland/qt5wayland.mk b/package/qt5/qt5wayland/qt5wayland.mk
index f96e4c2f8f..449640c881 100644
--- a/package/qt5/qt5wayland/qt5wayland.mk
+++ b/package/qt5/qt5wayland/qt5wayland.mk
@@ -52,6 +52,11 @@ define QT5WAYLAND_INSTALL_COMPOSITOR
 	cp -dpf $(STAGING_DIR)/usr/lib/libQt5Compositor.so* $(TARGET_DIR)/usr/lib
 endef
 endif
+ifeq ($(BR2_PACKAGE_QT5DECLARATIVE_QUICK),y)
+define QT5WAYLAND_INSTALL_COMPOSITOR_QMLS
+	cp -dpfr $(STAGING_DIR)/usr/qml/QtWayland $(TARGET_DIR)/usr/qml/
+endef
+endif
 endif
 
 ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y)
@@ -65,6 +70,7 @@ define QT5WAYLAND_INSTALL_TARGET_CMDS
 	cp -dpfr $(STAGING_DIR)/usr/lib/qt/plugins/wayland* $(TARGET_DIR)/usr/lib/qt/plugins
 	cp -dpfr $(STAGING_DIR)/usr/lib/qt/plugins/platforms/libqwayland* $(TARGET_DIR)/usr/lib/qt/plugins/platforms
 	$(QT5WAYLAND_INSTALL_COMPOSITOR)
+	$(QT5WAYLAND_INSTALL_COMPOSITOR_QMLS)
 	$(QT5WAYLAND_INSTALL_TARGET_EXAMPLES)
 endef
 
-- 
2.21.0

[Buildroot] [PATCH v2] package/qt5wayland: install compositor QML files

[Thomas Petazzoni]

On Tue, 14 May 2019 09:18:29 +0200
David Rosca <nowrep@gmail.com> wrote:

> Fixes using QtWayland.Compositor QML import.
> 
> Signed-off-by: David Rosca <nowrep@gmail.com>
> 
> ---
> Changes v1 -> v2:
>   - move under BR2_PACKAGE_QT5DECLARATIVE_QUICK condition
>   - also handle stable Qt version (5.6)
> ---
>  package/qt5/qt5wayland/qt5wayland.mk | 6 ++++++
>  1 file changed, 6 insertions(+)

Applied to master, thanks.

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com