[v2] package/qt5/qt5scxml: install missing QML module

Message ID 20180301141628.10735-1-b.bilas@grinn-global.com
State Accepted
Headers show
Series
  • [v2] package/qt5/qt5scxml: install missing QML module
Related show

Commit Message

Bartosz Biłas March 1, 2018, 2:16 p.m.
Fixes:
 qrc:/MainUI.qml:2 module "QtScxml" is not installed


Signed-off-by: Bartosz Bilas <b.bilas@grinn-global.com>
Reviewed-by: Peter Seiderer <ps.report@gmx.net>
---
Changes v1 -> v2:
	* Remove QT5DECLARATIVE QUICK dependency (suggested by Peter)

 package/qt5/qt5scxml/qt5scxml.mk | 5 +++++
 1 file changed, 5 insertions(+)

Comments

Arnout Vandecappelle April 1, 2018, 9:55 p.m. | #1
Hi Bartosz,

On 01-03-18 15:16, Bartosz Bilas wrote:
> Fixes:
>  qrc:/MainUI.qml:2 module "QtScxml" is not installed
> 
> 
> Signed-off-by: Bartosz Bilas <b.bilas@grinn-global.com>
> Reviewed-by: Peter Seiderer <ps.report@gmx.net>


 Applied to master, thanks.

 Regards,
 Arnout

> ---
> Changes v1 -> v2:
> 	* Remove QT5DECLARATIVE QUICK dependency (suggested by Peter)
> 
>  package/qt5/qt5scxml/qt5scxml.mk | 5 +++++
>  1 file changed, 5 insertions(+)
> 
> diff --git a/package/qt5/qt5scxml/qt5scxml.mk b/package/qt5/qt5scxml/qt5scxml.mk
> index 2d197a2bca..b6281975c6 100644
> --- a/package/qt5/qt5scxml/qt5scxml.mk
> +++ b/package/qt5/qt5scxml/qt5scxml.mk
> @@ -35,6 +35,10 @@ define QT5SCXML_INSTALL_TARGET_LIBS
>  endef
>  endif
>  
> +define QT5SCXML_INSTALL_TARGET_QMLS
> +	cp -dpfr $(STAGING_DIR)/usr/qml/QtScxml/ $(TARGET_DIR)/usr/qml/
> +endef
> +
>  ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y)
>  define QT5SCXML_INSTALL_TARGET_EXAMPLES
>  	cp -dpfr $(STAGING_DIR)/usr/lib/qt/examples/scxml $(TARGET_DIR)/usr/lib/qt/examples/
> @@ -43,6 +47,7 @@ endif
>  
>  define QT5SCXML_INSTALL_TARGET_CMDS
>  	$(QT5SCXML_INSTALL_TARGET_LIBS)
> +	$(QT5SCXML_INSTALL_TARGET_QMLS)
>  	$(QT5SCXML_INSTALL_TARGET_EXAMPLES)
>  endef
>  
>

Patch

diff --git a/package/qt5/qt5scxml/qt5scxml.mk b/package/qt5/qt5scxml/qt5scxml.mk
index 2d197a2bca..b6281975c6 100644
--- a/package/qt5/qt5scxml/qt5scxml.mk
+++ b/package/qt5/qt5scxml/qt5scxml.mk
@@ -35,6 +35,10 @@  define QT5SCXML_INSTALL_TARGET_LIBS
 endef
 endif
 
+define QT5SCXML_INSTALL_TARGET_QMLS
+	cp -dpfr $(STAGING_DIR)/usr/qml/QtScxml/ $(TARGET_DIR)/usr/qml/
+endef
+
 ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y)
 define QT5SCXML_INSTALL_TARGET_EXAMPLES
 	cp -dpfr $(STAGING_DIR)/usr/lib/qt/examples/scxml $(TARGET_DIR)/usr/lib/qt/examples/
@@ -43,6 +47,7 @@  endif
 
 define QT5SCXML_INSTALL_TARGET_CMDS
 	$(QT5SCXML_INSTALL_TARGET_LIBS)
+	$(QT5SCXML_INSTALL_TARGET_QMLS)
 	$(QT5SCXML_INSTALL_TARGET_EXAMPLES)
 endef