summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Nyström <daniel.nystrom@timeterminal.se>2013-02-20 00:18:51 (GMT)
committer Peter Korsgaard <jacmet@sunsite.dk>2013-02-27 22:57:50 (GMT)
commit1942836999ad64b7a84bd95a6bd1f5c75b81bf45 (patch)
treecdf8bf4b575ebf460e1a3b22f03287b34a540c87
parentaffe885c3cefdce64025c4bc8537e926897c5cea (diff)
downloadbuildroot-1942836999ad64b7a84bd95a6bd1f5c75b81bf45.tar.gz
buildroot-1942836999ad64b7a84bd95a6bd1f5c75b81bf45.tar.bz2
qt: install QML imports on target
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 <daniel.nystrom@timeterminal.se> Acked-by: Alexander Lukichev <alexander.lukichev@gmail.com> Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> Tested-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
-rw-r--r--package/qt/qt.mk10
1 files changed, 10 insertions, 0 deletions
diff --git a/package/qt/qt.mk b/package/qt/qt.mk
index ee1a88b..3767810 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