qt: fix libQtMultimedia installation

With BR2_PACKAGE_QT_MULTIMEDIA=y, libQtMultimedia.so.* was not
copied to the target directory.

Signed-off-by: Luca Ceresoli <luca@lucaceresoli.net>
Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>

diff --git a/CHANGES b/CHANGES
index b653124e523687e4f2dd9c62add14fc00db86c0f..0a2c1893cf2e099e65c906d5bb7064f54bce786d 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -7,7 +7,7 @@
        New packages: cgilua, copas, coxpcall, luafilesystem,
        luasocket, rings, wsapi, xavante
 
-       Updated/fixed packages: cdrkit, libidn, netperf
+       Updated/fixed packages: cdrkit, libidn, netperf, qt
 
        Issues resolved (http://bugs.uclibc.org):
 

diff --git a/package/qt/qt.mk b/package/qt/qt.mk
index aaf965e3c84b230cf7f167d6e2f5799a9e13ea5e..e2ebbb2a22ad90a29e40cf68894dc2edab404fb6 100644 (file)
--- a/package/qt/qt.mk
+++ b/package/qt/qt.mk
@@ -387,6 +387,9 @@ endif
 ifeq ($(BR2_PACKAGE_QT_SQL_MODULE),y)
 QT_LIBS+= qt-sql
 endif
+ifeq ($(BR2_PACKAGE_QT_MULTIMEDIA),y)
+QT_LIBS+= qt-multimedia
+endif
 ifeq ($(BR2_PACKAGE_QT_PHONON),y)
 QT_LIBS+= qt-phonon
 endif
@@ -542,6 +545,11 @@ ifeq ($(BR2_PACKAGE_QT_SHARED),y)
        cp -dpf $(STAGING_DIR)/usr/lib/libQtSql.so.* $(TARGET_DIR)/usr/lib/
 endif
 
+qt-multimedia: $(STAGING_DIR)/usr/lib/libQtCore.la
+ifeq ($(BR2_PACKAGE_QT_SHARED),y)
+       cp -dpf $(STAGING_DIR)/usr/lib/libQtMultimedia.so.* $(TARGET_DIR)/usr/lib/
+endif
+
 qt-phonon: $(STAGING_DIR)/usr/lib/libQtCore.la
        $(call QT_INSTALL_PLUGINS,phonon_backend)
 ifeq ($(BR2_PACKAGE_QT_SHARED),y)