Commit 19428369 authored by Daniel Nyström's avatar Daniel Nyström Committed by Peter Korsgaard
Browse files

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: default avatarDaniel Nyström <daniel.nystrom@timeterminal.se>
Acked-by: default avatarAlexander Lukichev <alexander.lukichev@gmail.com>
Acked-by: default avatarArnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Tested-by: default avatarArnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: default avatarPeter Korsgaard <jacmet@sunsite.dk>
parent affe885c

package/qt/qt.mk

+10 −0
Original line number Diff line number Diff line
@@ -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