NetCube-Systems-Austria/kumquat-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

package/qt5xmlpatterns: enable qml module

Browse Source 
qt5declarative:
 - remove unneded dependency on qt5mlpatterns

qt5xmlpatterns:
 - add optional dependency on qt5declarative
 - add target install step of the optional qml files

Reported-by: Nimai Mahajan <nimaim@gmail.com>
Signed-off-by: Peter Seiderer <ps.report@gmx.net>
Tested-by: Nimai Mahajan <nimaim@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
This commit is contained in:
Peter Seiderer 2020-03-13 21:44:15 +01:00 committed by Peter Korsgaard
parent 25bda2ef0a
commit a5fdf37e13
3 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
package/qt5/qt5declarative/Config.in
View File

@ -1,7 +1,6 @@
config BR2_PACKAGE_QT5DECLARATIVE
bool "qt5declarative"
depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE
select BR2_PACKAGE_QT5XMLPATTERNS
select BR2_PACKAGE_QT5BASE
select BR2_PACKAGE_QT5BASE_GUI
help

2
package/qt5/qt5declarative/qt5declarative.mk
View File

@ -7,7 +7,7 @@
QT5DECLARATIVE_VERSION = $(QT5_VERSION)
QT5DECLARATIVE_SITE = $(QT5_SITE)
QT5DECLARATIVE_SOURCE = qtdeclarative-$(QT5_SOURCE_TARBALL_PREFIX)-$(QT5DECLARATIVE_VERSION).tar.xz
QT5DECLARATIVE_DEPENDENCIES = qt5base qt5xmlpatterns
QT5DECLARATIVE_DEPENDENCIES = qt5base
QT5DECLARATIVE_INSTALL_STAGING = YES
ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y)

11
package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk
View File

@ -21,6 +21,10 @@ ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y)
QT5XMLPATTERNS_LICENSE += , BSD-3-Clause (examples)
endif
ifeq ($(BR2_PACKAGE_QT5DECLARATIVE),y)
QT5XMLPATTERNS_DEPENDENCIES += qt5declarative
endif
define QT5XMLPATTERNS_CONFIGURE_CMDS
(cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/bin/qmake)
endef
@ -39,6 +43,12 @@ define QT5XMLPATTERNS_INSTALL_TARGET_LIBS
endef
endif
ifeq ($(BR2_PACKAGE_QT5DECLARATIVE_QUICK),y)
define QT5XMLPATTERNS_INSTALL_TARGET_QMLS
cp -dpfr $(STAGING_DIR)/usr/qml/QtQuick/XmlListModel $(TARGET_DIR)/usr/qml/QtQuick
endef
endif
ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y)
define QT5XMLPATTERNS_INSTALL_TARGET_EXAMPLES
cp -dpfr $(STAGING_DIR)/usr/lib/qt/examples/xmlpatterns $(TARGET_DIR)/usr/lib/qt/examples/
@ -47,6 +57,7 @@ endif
define QT5XMLPATTERNS_INSTALL_TARGET_CMDS
$(QT5XMLPATTERNS_INSTALL_TARGET_LIBS)
$(QT5XMLPATTERNS_INSTALL_TARGET_QMLS)
$(QT5XMLPATTERNS_INSTALL_TARGET_EXAMPLES)
endef