aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-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)