| Message ID | 1523838643-10141-1-git-send-email-rom.reignier@gmail.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [1/1] qt53d: Install missing QML modules, plugins and examples | expand |
Hello, On Mon, 16 Apr 2018 02:30:43 +0200, Romain Reignier wrote: > 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 > > The qt53d examples were not installed if BR2_PACKAGE_QT5BASE_EXAMPLES was > set > > Signed-off-by: Romain Reignier <rom.reignier@gmail.com> > --- > package/qt5/qt53d/qt53d.mk | 10 ++++++++++ > 1 file changed, 10 insertions(+) Applied to master, thanks. Thomas
>>>>> "Romain" == Romain Reignier <rom.reignier@gmail.com> writes: > 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 > The qt53d examples were not installed if BR2_PACKAGE_QT5BASE_EXAMPLES was > set > Signed-off-by: Romain Reignier <rom.reignier@gmail.com> Committed to 2018.02.x, thanks.
diff --git a/package/qt5/qt53d/qt53d.mk b/package/qt5/qt53d/qt53d.mk index d5a3a8e..6896b00 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
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 The qt53d examples were not installed if BR2_PACKAGE_QT5BASE_EXAMPLES was set Signed-off-by: Romain Reignier <rom.reignier@gmail.com> --- package/qt5/qt53d/qt53d.mk | 10 ++++++++++ 1 file changed, 10 insertions(+)