diff options
| author | Peter Korsgaard <jacmet@sunsite.dk> | 2013-03-01 11:11:24 +0100 |
|---|---|---|
| committer | Peter Korsgaard <jacmet@sunsite.dk> | 2013-03-01 11:11:24 +0100 |
| commit | ca79d2393519759d3fbe84472ab8bfa359c08592 (patch) | |
| tree | 3d7ba19e17cc066b327ae62d004164a61ba39d9b /package/qt | |
| parent | 37d2ab569d83845a86b980bf4e27e27755294538 (diff) | |
| parent | 1942836999ad64b7a84bd95a6bd1f5c75b81bf45 (diff) | |
| download | buildroot-novena-ca79d2393519759d3fbe84472ab8bfa359c08592.tar.gz buildroot-novena-ca79d2393519759d3fbe84472ab8bfa359c08592.zip | |
Merge branch 'next'
Diffstat (limited to 'package/qt')
| -rw-r--r-- | package/qt/qt.mk | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/package/qt/qt.mk b/package/qt/qt.mk index 9f50f9135..bd3dd338e 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 |