diff options
author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-06-04 19:50:11 +0200 |
---|---|---|
committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-06-04 19:50:11 +0200 |
commit | 9785766067aea72da13b1c7821295254d4fabb78 (patch) | |
tree | 566c94b7074fbbffaf18e01eaf0c4f988744c712 /src | |
parent | 0ef52f01029176a8fb8fbef2c22ae9350635ebe1 (diff) | |
parent | 3d45b9147ec93c4af38aef5e6ab2302681bb1425 (diff) |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
.qmake.conf
sync.profile
Change-Id: I62a3095e4a4d507de199fac32b64e9e76323bbf4
Diffstat (limited to 'src')
-rw-r--r-- | src/imports/audioengine/qmldir | 2 | ||||
-rw-r--r-- | src/imports/multimedia/plugins.qmltypes | 13 | ||||
-rw-r--r-- | src/multimedia/doc/src/multimedia.qdoc | 2 | ||||
-rw-r--r-- | src/multimedia/multimedia.pro | 5 | ||||
-rw-r--r-- | src/plugins/wmf/player/mfvideorenderercontrol.cpp | 1 | ||||
-rw-r--r-- | src/plugins/wmf/wmfserviceplugin.cpp | 4 |
6 files changed, 22 insertions, 5 deletions
diff --git a/src/imports/audioengine/qmldir b/src/imports/audioengine/qmldir index 94335c03a..d853c8022 100644 --- a/src/imports/audioengine/qmldir +++ b/src/imports/audioengine/qmldir @@ -1 +1,3 @@ +module QtAudioEngine plugin declarative_audioengine +typeinfo plugins.qmltypes diff --git a/src/imports/multimedia/plugins.qmltypes b/src/imports/multimedia/plugins.qmltypes index b2970649f..12d7ea85d 100644 --- a/src/imports/multimedia/plugins.qmltypes +++ b/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: { diff --git a/src/multimedia/doc/src/multimedia.qdoc b/src/multimedia/doc/src/multimedia.qdoc index d93468273..b18236a93 100644 --- a/src/multimedia/doc/src/multimedia.qdoc +++ b/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 diff --git a/src/multimedia/multimedia.pro b/src/multimedia/multimedia.pro index 31c438acb..726f00ab4 100644 --- a/src/multimedia/multimedia.pro +++ b/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 diff --git a/src/plugins/wmf/player/mfvideorenderercontrol.cpp b/src/plugins/wmf/player/mfvideorenderercontrol.cpp index 6baa3716e..8f73244c0 100644 --- a/src/plugins/wmf/player/mfvideorenderercontrol.cpp +++ b/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)) diff --git a/src/plugins/wmf/wmfserviceplugin.cpp b/src/plugins/wmf/wmfserviceplugin.cpp index 0978069c9..79354b4e1 100644 --- a/src/plugins/wmf/wmfserviceplugin.cpp +++ b/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(); } |