slapin/qtmultimedia
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'origin/stable' into dev

Browse Source 
Conflicts:
	.qmake.conf
	sync.profile

Change-Id: I62a3095e4a4d507de199fac32b64e9e76323bbf4
This commit is contained in:
Frederik Gladhorn
2013-06-04 19:50:11 +02:00
parent 0ef52f0102 3d45b9147e
commit 9785766067
7 changed files with 27 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/multimedia/doc/src/multimedia.qdoc
View File

@@ -30,8 +30,6 @@
\title Multimedia
\brief A set of APIs for working with audio, video, radio and camera devices.
\ingroup technology-apis
Multimedia support in Qt is provided by the \l{Qt Multimedia} module. The Qt
Multimedia module provides a rich feature set that enables you to easily take
advantage of a platform's multimedia capabilities such as media playback and

5
src/multimedia/multimedia.pro
View File

@@ -56,7 +56,10 @@ ANDROID_BUNDLED_JAR_DEPENDENCIES = \
ANDROID_JAR_DEPENDENCIES = \
jar/QtMultimedia.jar:org.qtproject.qt5.android.multimedia.QtAndroidMediaPlayer
ANDROID_LIB_DEPENDENCIES = \
plugins/mediaservice/libandroidmediaplayer.so
plugins/mediaservice/libandroidmediaplayer.so \
lib/libQt5MultimediaQuick_p.so:Qt5Quick
ANDROID_BUNDLED_FILES += \
lib/libQt5MultimediaQuick_p.so
MODULE_PLUGIN_TYPES = \
mediaservice