projects / buildroot.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 89611dc)
qt5multimedia: fix installation when quick is disabled
authorFatih Aşıcı <fatih.asici@gmail.com>
Mon, 21 Jul 2014 11:16:50 +0000 (14:16 +0300)
committerThomas Petazzoni <thomas.petazzoni@free-electrons.com>
Mon, 21 Jul 2014 19:49:26 +0000 (21:49 +0200)
Fixes:

  http://autobuild.buildroot.net/results/b97/b975c4bb8aebad2d0b8eaefc98c42c0460ace5be/
  http://autobuild.buildroot.net/results/b1c/b1ca9c845f1cf3a396cbd7ad81bfc4411974c709/

Signed-off-by: Fatih Aşıcı <fatih.asici@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
package/qt5/qt5multimedia/qt5multimedia.mk patch | blob | history

diff --git a/package/qt5/qt5multimedia/qt5multimedia.mk b/package/qt5/qt5multimedia/qt5multimedia.mk
index e89e31cdbc153dece92c174131719cc5eb8a37ff..da26c03a2205efd6bbcfbb2eb9cc541e183446af 100644 (file)
--- a/package/qt5/qt5multimedia/qt5multimedia.mk
+++ b/package/qt5/qt5multimedia/qt5multimedia.mk
@@ -53,9 +53,15 @@ define QT5MULTIMEDIA_INSTALL_TARGET_LIBS
 endef
 endif
 
+ifeq ($(BR2_PACKAGE_QT5DECLARATIVE_QUICK),y)
+define QT5MULTIMEDIA_INSTALL_TARGET_QMLS
+       cp -dpfr $(STAGING_DIR)/usr/qml/QtMultimedia $(TARGET_DIR)/usr/qml/
+endef
+endif
+
 define QT5MULTIMEDIA_INSTALL_TARGET_CMDS
-       cp -dpfr $(STAGING_DIR)/usr/qml/* $(TARGET_DIR)/usr/qml
        $(QT5MULTIMEDIA_INSTALL_TARGET_LIBS)
+       $(QT5MULTIMEDIA_INSTALL_TARGET_QMLS)
 endef
 
 $(eval $(generic-package))