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

Conflicts:
	.qmake.conf
	sync.profile

Change-Id: I62a3095e4a4d507de199fac32b64e9e76323bbf4

src/imports/audioengine/qmldir

@@ -1 +1,3 @@
+module QtAudioEngine
 plugin declarative_audioengine
+typeinfo plugins.qmltypes

src/imports/multimedia/plugins.qmltypes

@@ -132,6 +132,7 @@ Module {
         name: "QDeclarativeAudio"
         prototype: "QObject"
         exports: ["QtMultimedia/Audio 5.0", "QtMultimedia/MediaPlayer 5.0"]
+        exportMetaObjectRevisions: [0, 0]
         Enum {
             name: "Status"
             values: {
@@ -230,6 +231,7 @@ Module {
         name: "QDeclarativeCamera"
         prototype: "QObject"
         exports: ["QtMultimedia/Camera 5.0"]
+        exportMetaObjectRevisions: [0]
         Enum {
             name: "CaptureMode"
             values: {
@@ -448,6 +450,7 @@ Module {
         name: "QDeclarativeCameraCapture"
         prototype: "QObject"
         exports: ["QtMultimedia/CameraCapture 5.0"]
+        exportMetaObjectRevisions: [0]
         Property { name: "ready"; type: "bool"; isReadonly: true }
         Property { name: "capturedImagePath"; type: "string"; isReadonly: true }
         Property { name: "resolution"; type: "QSize" }
@@ -506,6 +509,7 @@ Module {
         name: "QDeclarativeCameraExposure"
         prototype: "QObject"
         exports: ["QtMultimedia/CameraExposure 5.0"]
+        exportMetaObjectRevisions: [0]
         Property { name: "exposureCompensation"; type: "double" }
         Property { name: "iso"; type: "int"; isReadonly: true }
         Property { name: "shutterSpeed"; type: "double"; isReadonly: true }
@@ -584,6 +588,7 @@ Module {
         name: "QDeclarativeCameraFlash"
         prototype: "QObject"
         exports: ["QtMultimedia/CameraFlash 5.0"]
+        exportMetaObjectRevisions: [0]
         Property { name: "ready"; type: "bool"; isReadonly: true }
         Property { name: "mode"; type: "int" }
         Signal {
@@ -603,6 +608,7 @@ Module {
         name: "QDeclarativeCameraFocus"
         prototype: "QObject"
         exports: ["QtMultimedia/CameraFocus 5.0"]
+        exportMetaObjectRevisions: [0]
         Property { name: "focusMode"; type: "QDeclarativeCamera::FocusMode" }
         Property { name: "focusPointMode"; type: "QDeclarativeCamera::FocusPointMode" }
         Property { name: "customFocusPoint"; type: "QPointF" }
@@ -646,6 +652,7 @@ Module {
         name: "QDeclarativeCameraImageProcessing"
         prototype: "QObject"
         exports: ["QtMultimedia/CameraImageProcessing 5.0"]
+        exportMetaObjectRevisions: [0]
         Enum {
             name: "WhiteBalanceMode"
             values: {
@@ -720,6 +727,7 @@ Module {
         name: "QDeclarativeCameraRecorder"
         prototype: "QObject"
         exports: ["QtMultimedia/CameraRecorder 5.0"]
+        exportMetaObjectRevisions: [0]
         Enum {
             name: "RecorderState"
             values: {
@@ -918,6 +926,7 @@ Module {
         name: "QDeclarativeRadio"
         prototype: "QObject"
         exports: ["QtMultimedia/Radio 5.0"]
+        exportMetaObjectRevisions: [0]
         Enum {
             name: "State"
             values: {
@@ -1071,6 +1080,7 @@ Module {
         name: "QDeclarativeRadioData"
         prototype: "QObject"
         exports: ["QtMultimedia/RadioData 5.0"]
+        exportMetaObjectRevisions: [0]
         Enum {
             name: "Error"
             values: {
@@ -1192,6 +1202,7 @@ Module {
         name: "QDeclarativeTorch"
         prototype: "QObject"
         exports: ["QtMultimedia/Torch 5.0"]
+        exportMetaObjectRevisions: [0]
         Property { name: "enabled"; type: "bool" }
         Property { name: "power"; type: "int" }
     }
@@ -1200,6 +1211,7 @@ Module {
         defaultProperty: "data"
         prototype: "QQuickItem"
         exports: ["QtMultimedia/VideoOutput 5.0"]
+        exportMetaObjectRevisions: [0]
         Enum {
             name: "FillMode"
             values: {
@@ -1289,6 +1301,7 @@ Module {
         name: "QSoundEffect"
         prototype: "QObject"
         exports: ["QtMultimedia/SoundEffect 5.0"]
+        exportMetaObjectRevisions: [0]
         Enum {
             name: "Loop"
             values: {

src/multimedia/doc/src/multimedia.qdoc

@@ -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

src/multimedia/multimedia.pro

@@ -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
 

src/plugins/wmf/player/mfvideorenderercontrol.cpp

@@ -1286,6 +1286,7 @@ namespace
         {
             HRESULT hr = S_OK;
             Q_ASSERT(pOp != NULL);
+            Q_UNUSED(pOp)
             hr = processSamplesFromQueue(WriteSamples);
             // We are in the middle of an asynchronous operation, so if something failed, send an error.
             if (FAILED(hr))

src/plugins/wmf/wmfserviceplugin.cpp

@@ -105,12 +105,12 @@ QMediaServiceProviderHint::Features WMFServicePlugin::supportedFeatures(
         return QMediaServiceProviderHint::Features();
 }
 
-QList<QByteArray> WMFServicePlugin::devices(const QByteArray &service) const
+QList<QByteArray> WMFServicePlugin::devices(const QByteArray &) const
 {
     return QList<QByteArray>();
 }
 
-QString WMFServicePlugin::deviceDescription(const QByteArray &service, const QByteArray &device)
+QString WMFServicePlugin::deviceDescription(const QByteArray &, const QByteArray &)
 {
     return QString();
 }

sync.profile

@@ -18,10 +18,11 @@
 # Each of the module version specifiers can take one of the following values:
 #   - A specific Git revision.
 #   - any git symbolic ref resolvable from the module's repository (e.g. "refs/heads/master" to track master branch)
+#   - an empty string to use the same branch under test (dependencies will become "refs/heads/master" if we are in the master branch)
 #
 %dependencies = (
-    "qtbase" => "refs/heads/dev",
-    "qtxmlpatterns" => "refs/heads/dev",
-    "qtdeclarative" => "refs/heads/dev",
-    "qtjsbackend" => "refs/heads/dev",
+    "qtbase" => "",
+    "qtxmlpatterns" => "",
+    "qtdeclarative" => "",
+    "qtjsbackend" => "",
 );