From 1942836999ad64b7a84bd95a6bd1f5c75b81bf45 Mon Sep 17 00:00:00 2001 From: Daniel Nyström Date: Wed, 20 Feb 2013 00:18:51 +0000 Subject: qt: install QML imports on target MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit When selecting the Qt declarative module, all the QML imports was built and installed to staging, but never installed to the target. Signed-off-by: Daniel Nyström Acked-by: Alexander Lukichev Acked-by: Arnout Vandecappelle (Essensium/Mind) Tested-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Peter Korsgaard --- package/qt/qt.mk | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'package') diff --git a/package/qt/qt.mk b/package/qt/qt.mk index ee1a88b7a..376781057 100644 --- a/package/qt/qt.mk +++ b/package/qt/qt.mk @@ -498,6 +498,7 @@ define QT_CONFIGURE_CMDS -no-separate-debug-info \ -prefix /usr \ -plugindir /usr/lib/qt/plugins \ + -importdir /usr/lib/qt/imports \ -hostprefix $(STAGING_DIR) \ -fast \ -no-rpath \ @@ -610,6 +611,14 @@ define QT_INSTALL_TARGET_PLUGINS fi endef +# Import installation +define QT_INSTALL_TARGET_IMPORTS + if [ -d $(STAGING_DIR)/usr/lib/qt/imports/ ] ; then \ + mkdir -p $(TARGET_DIR)/usr/lib/qt/imports ; \ + cp -dpfr $(STAGING_DIR)/usr/lib/qt/imports/* $(TARGET_DIR)/usr/lib/qt/imports ; \ + fi +endef + # Fonts installation ifneq ($(QT_FONTS),) define QT_INSTALL_TARGET_FONTS @@ -628,6 +637,7 @@ endif define QT_INSTALL_TARGET_CMDS $(QT_INSTALL_TARGET_LIBS) $(QT_INSTALL_TARGET_PLUGINS) + $(QT_INSTALL_TARGET_IMPORTS) $(QT_INSTALL_TARGET_FONTS) $(QT_INSTALL_TARGET_FONTS_TTF) endef -- cgit v1.2.3