* [Buildroot] [PATCH-for-2020.02.x v1] package/qt5xmlpatterns: enable qml module
@ 2020-03-13 20:27 Peter Seiderer
0 siblings, 0 replies; only message in thread
From: Peter Seiderer @ 2020-03-13 20:27 UTC (permalink / raw)
To: buildroot
qt5declarative:
- remove unneded dependency on qt5mlpatterns
qt5xmlpatterns:
- add optional dependency on qt5declarative
- add target install step of the optional qml files
Signed-off-by: Peter Seiderer <ps.report@gmx.net>
---
package/qt5/qt5declarative/Config.in | 1 -
package/qt5/qt5declarative/qt5declarative.mk | 2 +-
package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk | 11 +++++++++++
3 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/package/qt5/qt5declarative/Config.in b/package/qt5/qt5declarative/Config.in
index 3a353a8326..d85f4c7136 100644
--- a/package/qt5/qt5declarative/Config.in
+++ b/package/qt5/qt5declarative/Config.in
@@ -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
diff --git a/package/qt5/qt5declarative/qt5declarative.mk b/package/qt5/qt5declarative/qt5declarative.mk
index 6210611961..200a5578f8 100644
--- a/package/qt5/qt5declarative/qt5declarative.mk
+++ b/package/qt5/qt5declarative/qt5declarative.mk
@@ -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)
diff --git a/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk b/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk
index 6ed247fd59..50f0c58931 100644
--- a/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk
+++ b/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk
@@ -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
--
2.25.1
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2020-03-13 20:27 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-03-13 20:27 [Buildroot] [PATCH-for-2020.02.x v1] package/qt5xmlpatterns: enable qml module Peter Seiderer
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.