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

Change-Id: I24ffb71c4cc2e262394797deb8a22b2cf9a80c3c

src/multimedia/doc/qtmultimedia.qdocconf

@@ -32,6 +32,9 @@ qhp.QtMultimedia.subprojects.qmltypes.sortPages = true
 exampledirs += ../../../examples/multimedia \
                snippets
 
+# Specify example install dir under QT_INSTALL_EXAMPLES
+examplesinstallpath = multimedia
+
 headerdirs += ../..
 
 imagedirs += src/images \

src/multimedia/doc/src/multimedia.qdoc

@@ -83,52 +83,52 @@ For some quick recipes, look at the overviews above and consult this table:
         \li QSoundEffect
     \row
         \li Playing low latency audio
-        \li \l{multimedia/audiooutput}{audioinput},
-            \l{multimedia/spectrum}{spectrum}
+        \li \l{audioinput},
+            \l{spectrum}
         \li
         \li QAudioOutput
     \row
         \li Playing encoded audio (MP3, AAC etc)
-        \li \l{multimediawidgets/player}{player}
+        \li \l{player}
         \li \l Audio, \l {MediaPlayer}
         \li QMediaPlayer
     \row
         \li Accessing raw audio input data
-        \li \l{multimedia/spectrum}{spectrum},
-            \l {multimedia/audioinput}{audioinput}
+        \li \l{spectrum},
+            \l{audioinput}
         \li
         \li QAudioInput
     \row
         \li Recording encoded audio data
-        \li \l {multimedia/audiorecorder}{audiorecorder}
+        \li \l{audiorecorder}
         \li
         \li QAudioRecorder
     \row
         \li Discovering raw audio devices
-        \li \l {multimedia/audiodevices}{audiodevices}
+        \li \l{audiodevices}
         \li
         \li QAudioDeviceInfo
     \row
         \li Video Playback
-        \li \l {multimediawidgets/player}{player},
-            \l {multimedia/video/qmlvideo}{qmlvideo},
-            \l{multimedia/video/qmlvideofx}{qmlvideofx}
+        \li \l{player},
+            \l{video/qmlvideo}{qmlvideo},
+            \l{video/qmlvideofx}{qmlvideofx}
         \li \l MediaPlayer, \l VideoOutput, \l Video
         \li QMediaPlayer, QVideoWidget, QGraphicsVideoItem
     \row
         \li Video Processing
-        \li \l {multimedia/video/qmlvideofx}{qmlvideofx}
+        \li \l {video/qmlvideofx}{qmlvideofx}
         \li \l {MediaPlayer}, \l VideoOutput
         \li QMediaPlayer, QAbstractVideoSurface, QVideoFrame
     \row
         \li Listening to the radio
-        \li \l {multimedia/declarative-radio}{declarative-radio}
+        \li \l {declarative-radio}
         \li \l Radio, \l RadioData
         \li QRadioTuner, QRadioData
     \row
         \li Accessing camera viewfinder
         \li \l {Camera Example}{camera},
-            \l {multimediawidgets/declarative-camera}{declarative-camera}
+            \l {declarative-camera}
         \li \l Camera, \l VideoOutput
         \li QCamera, QVideoWidget, QGraphicsVideoItem
     \row
@@ -139,13 +139,13 @@ For some quick recipes, look at the overviews above and consult this table:
     \row
         \li Capturing photos
         \li \l {Camera Example}{camera},
-            \l {multimediawidgets/declarative-camera}{declarative-camera}
+            \l {declarative-camera}
         \li \l Camera
         \li QCamera, QCameraImageCapture
     \row
         \li Capturing movies
         \li \l {Camera Example}{camera},
-            \l {multimediawidgets/declarative-camera}{declarative-camera}
+            \l {declarative-camera}
         \li \l Camera
         \li QCamera, QMediaRecorder
     \row

src/multimedia/multimedia.pro

@@ -51,10 +51,14 @@ include(radio/radio.pri)
 include(recording/recording.pri)
 include(video/video.pri)
 
+ANDROID_BUNDLED_JAR_DEPENDENCIES = \
+    jar/QtMultimedia-bundled.jar:org.qtproject.qt5.android.multimedia.QtAndroidMediaPlayer
 ANDROID_JAR_DEPENDENCIES = \
     jar/QtMultimedia.jar:org.qtproject.qt5.android.multimedia.QtAndroidMediaPlayer
 ANDROID_LIB_DEPENDENCIES = \
     plugins/mediaservice/libandroidmediaplayer.so
+MODULE_PLUGIN_TYPES = \
+    mediaservice
 
 mac {
    LIBS += -framework AppKit -framework QuartzCore -framework QTKit

src/multimedia/playback/playlistfileparser.cpp

@@ -43,7 +43,7 @@
 #include <qfileinfo.h>
 #include <QtNetwork/QNetworkReply>
 #include "qmediaobject_p.h"
-#include "qmultimedia.h"
+#include "qmediametadata.h"
 
 QT_BEGIN_NAMESPACE
 

src/multimedia/qmultimedia.h

@@ -47,7 +47,6 @@
 #include <QtCore/qstring.h>
 
 #include <QtMultimedia/qtmultimediadefs.h>
-#include <QtMultimedia/qmediametadata.h>
 
 QT_BEGIN_NAMESPACE