summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuca Ceresoli <luca@lucaceresoli.net>2010-06-03 22:31:02 +0200
committerPeter Korsgaard <jacmet@sunsite.dk>2010-06-05 22:18:46 +0200
commit79ec8e88f3a5afacff27e8eb94a5aeda17cf734a (patch)
tree8067556256c6edc8d3b155b638f914a4af7f6080
parentaccf2eb2576c3e122ca2b2095f1dd775cc15f4db (diff)
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>
-rw-r--r--CHANGES2
-rw-r--r--package/qt/qt.mk8
2 files changed, 9 insertions, 1 deletions
diff --git a/CHANGES b/CHANGES
index b653124e5..0a2c1893c 100644
--- 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 aaf965e3c..e2ebbb2a2 100644
--- 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)