From 89c7c422858e138eb29813866684a4e69a47896b Mon Sep 17 00:00:00 2001 From: Romain Reignier Date: Mon, 16 Apr 2018 02:30:43 +0200 Subject: [PATCH] qt53d: install missing QML modules, plugins and examples Some files were missing on the first build of qt53d but added later: - by qt5base for the plugins because it copies the whole /usr/lib/qt/plugins directory - by qt5declarative for the QML modules because it copies the whole /usr/qml directory Also, the qt53d examples were not installed if BR2_PACKAGE_QT5BASE_EXAMPLES was set. Signed-off-by: Romain Reignier Signed-off-by: Thomas Petazzoni (cherry picked from commit 4fd448c9c1e3ed7ca0f09441bf8a854eb9130190) Signed-off-by: Peter Korsgaard --- package/qt5/qt53d/qt53d.mk | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/package/qt5/qt53d/qt53d.mk b/package/qt5/qt53d/qt53d.mk index fcb743db21..bdcc665b94 100644 --- a/package/qt5/qt53d/qt53d.mk +++ b/package/qt5/qt53d/qt53d.mk @@ -30,11 +30,21 @@ define QT53D_INSTALL_STAGING_CMDS $(QT5_LA_PRL_FILES_FIXUP) endef +ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y) +define QT53D_INSTALL_TARGET_EXAMPLES + cp -dpfr $(STAGING_DIR)/usr/lib/qt/examples/qt3d $(TARGET_DIR)/usr/lib/qt/examples/ +endef +endif + ifeq ($(BR2_STATIC_LIBS),) define QT53D_INSTALL_TARGET_CMDS cp -dpf $(STAGING_DIR)/usr/lib/libQt53D*.so.* $(TARGET_DIR)/usr/lib + cp -dpfr $(STAGING_DIR)/usr/lib/qt/plugins/geometryloaders $(TARGET_DIR)/usr/lib/qt/plugins + cp -dpfr $(STAGING_DIR)/usr/lib/qt/plugins/renderplugins $(TARGET_DIR)/usr/lib/qt/plugins cp -dpfr $(STAGING_DIR)/usr/lib/qt/plugins/sceneparsers $(TARGET_DIR)/usr/lib/qt/plugins cp -dpfr $(STAGING_DIR)/usr/qml/Qt3D $(TARGET_DIR)/usr/qml + cp -dpfr $(STAGING_DIR)/usr/qml/QtQuick $(TARGET_DIR)/usr/qml + $(QT53D_INSTALL_TARGET_EXAMPLES) endef endif