Start using the new type registration scheme for QML types

For now, this is only partially used, mainly for the C++ types we
can expose directly. Some more cleanups in the qml plugin are required.

Change-Id: I05085d3622dca1b3152895e1af035fbe3549b23d
Reviewed-by: Doris Verria <doris.verria@qt.io>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>

3 files changed, 5 insertions, 1579 deletions

diff --git a/src/imports/multimedia/multimedia.cpp b/src/imports/multimedia/multimedia.cpp
index a068d7505..0360a859e 100644
--- a/src/imports/multimedia/multimedia.cpp
+++ b/src/imports/multimedia/multimedia.cpp
@@ -76,16 +76,16 @@ class QMultimediaDeclarativeModule : public QQmlExtensionPlugin
     Q_PLUGIN_METADATA(IID QQmlExtensionInterface_iid)
 
 public:
-    QMultimediaDeclarativeModule(QObject *parent = nullptr) : QQmlExtensionPlugin(parent) { }
+    QMultimediaDeclarativeModule(QObject *parent = nullptr) : QQmlExtensionPlugin(parent)
+    {
+        volatile auto registration = qml_register_types_QtMultimedia;
+        Q_UNUSED(registration);
+    }
     void registerTypes(const char *uri) override
     {
         Q_ASSERT(QLatin1String(uri) == QLatin1String("QtMultimedia"));
 
         // 6.0 types
-        qmlRegisterType<QSoundEffect>(uri, 6, 0, "SoundEffect");
-        qmlRegisterType<QMediaPlayer>(uri, 6, 0, "Audio");
-        qmlRegisterType<QMediaPlayer>(uri, 6, 0, "MediaPlayer");
-        qmlRegisterType<QDeclarativeVideoOutput>(uri, 6, 0, "VideoOutput");
         qmlRegisterType<QDeclarativeCamera>(uri, 6, 0, "Camera");
         qmlRegisterUncreatableType<QDeclarativeCameraCapture>(uri, 6, 0, "CameraCapture",
                                 tr("CameraCapture is provided by Camera"));
@@ -93,27 +93,16 @@ public:
                                 tr("CameraRecorder is provided by Camera"));
         qmlRegisterUncreatableType<QDeclarativeCameraExposure>(uri, 6, 0, "CameraExposure",
                                 tr("CameraExposure is provided by Camera"));
-        qmlRegisterUncreatableType<QCameraFocus>(uri, 6, 0, "CameraFocus",
-                                tr("CameraFocus is provided by Camera"));
         qmlRegisterUncreatableType<QDeclarativeCameraFlash>(uri, 6, 0, "CameraFlash",
                                 tr("CameraFlash is provided by Camera"));
         qmlRegisterUncreatableType<QDeclarativeTorch>(uri, 6, 0, "CameraTorch",
                                 tr("CameraTorch is provided by Camera"));
-        qmlRegisterUncreatableType<QCameraImageProcessing>(uri, 6, 0, "CameraImageProcessing",
-                                tr("CameraImageProcessing is provided by Camera"));
 
         qmlRegisterSingletonType<QDeclarativeMultimediaGlobal>(uri, 6, 0, "QtMultimedia", multimedia_global_object);
 
         qmlRegisterType<QDeclarativePlaylist>(uri, 6, 0, "Playlist");
         qmlRegisterType<QDeclarativePlaylistItem>(uri, 6, 0, "PlaylistItem");
 
-        // ### new replacement types
-        qmlRegisterType<QMediaCaptureSession>(uri, 6, 0, "CaptureSession");
-        qmlRegisterType<QMediaEncoder>(uri, 6, 0, "MediaEncoder");
-        qmlRegisterType<QCamera>(uri, 6, 0, "NCamera");
-        qmlRegisterType<QCameraImageCapture>(uri, 6, 0, "ImageCapture");
-        qmlRegisterUncreatableType<QCameraExposure>(uri, 6, 0, "NCameraExposure", tr("CameraExposure is provided by Camera"));
-
         // The minor version used to be the current Qt 5 minor. For compatibility it is the last
         // Qt 5 release.
         qmlRegisterModule(uri, 6, 0);
diff --git a/src/imports/multimedia/plugins.qmltypes b/src/imports/multimedia/plugins.qmltypes
deleted file mode 100644
index f09d015dd..000000000
--- a/src/imports/multimedia/plugins.qmltypes
+++ /dev/null
@@ -1,1562 +0,0 @@
-import QtQuick.tooling 1.2
-
-// This file describes the plugin-supplied types contained in the library.
-// It is used for QML tooling purposes only.
-//
-// This file was auto-generated by:
-// 'qmlplugindump -nonrelocatable QtMultimedia 5.15'
-
-Module {
-    dependencies: ["QtQuick 2.0"]
-    Component {
-        name: "QAbstractItemModel"
-        prototype: "QObject"
-        Enum {
-            name: "LayoutChangeHint"
-            values: {
-                "NoLayoutChangeHint": 0,
-                "VerticalSortHint": 1,
-                "HorizontalSortHint": 2
-            }
-        }
-        Enum {
-            name: "CheckIndexOption"
-            values: {
-                "NoOption": 0,
-                "IndexIsValid": 1,
-                "DoNotUseParent": 2,
-                "ParentIsInvalid": 4
-            }
-        }
-        Signal {
-            name: "dataChanged"
-            Parameter { name: "topLeft"; type: "QModelIndex" }
-            Parameter { name: "bottomRight"; type: "QModelIndex" }
-            Parameter { name: "roles"; type: "QVector<int>" }
-        }
-        Signal {
-            name: "dataChanged"
-            Parameter { name: "topLeft"; type: "QModelIndex" }
-            Parameter { name: "bottomRight"; type: "QModelIndex" }
-        }
-        Signal {
-            name: "headerDataChanged"
-            Parameter { name: "orientation"; type: "Qt::Orientation" }
-            Parameter { name: "first"; type: "int" }
-            Parameter { name: "last"; type: "int" }
-        }
-        Signal {
-            name: "layoutChanged"
-            Parameter { name: "parents"; type: "QList<QPersistentModelIndex>" }
-            Parameter { name: "hint"; type: "QAbstractItemModel::LayoutChangeHint" }
-        }
-        Signal {
-            name: "layoutChanged"
-            Parameter { name: "parents"; type: "QList<QPersistentModelIndex>" }
-        }
-        Signal { name: "layoutChanged" }
-        Signal {
-            name: "layoutAboutToBeChanged"
-            Parameter { name: "parents"; type: "QList<QPersistentModelIndex>" }
-            Parameter { name: "hint"; type: "QAbstractItemModel::LayoutChangeHint" }
-        }
-        Signal {
-            name: "layoutAboutToBeChanged"
-            Parameter { name: "parents"; type: "QList<QPersistentModelIndex>" }
-        }
-        Signal { name: "layoutAboutToBeChanged" }
-        Signal {
-            name: "rowsAboutToBeInserted"
-            Parameter { name: "parent"; type: "QModelIndex" }
-            Parameter { name: "first"; type: "int" }
-            Parameter { name: "last"; type: "int" }
-        }
-        Signal {
-            name: "rowsInserted"
-            Parameter { name: "parent"; type: "QModelIndex" }
-            Parameter { name: "first"; type: "int" }
-            Parameter { name: "last"; type: "int" }
-        }
-        Signal {
-            name: "rowsAboutToBeRemoved"
-            Parameter { name: "parent"; type: "QModelIndex" }
-            Parameter { name: "first"; type: "int" }
-            Parameter { name: "last"; type: "int" }
-        }
-        Signal {
-            name: "rowsRemoved"
-            Parameter { name: "parent"; type: "QModelIndex" }
-            Parameter { name: "first"; type: "int" }
-            Parameter { name: "last"; type: "int" }
-        }
-        Signal {
-            name: "columnsAboutToBeInserted"
-            Parameter { name: "parent"; type: "QModelIndex" }
-            Parameter { name: "first"; type: "int" }
-            Parameter { name: "last"; type: "int" }
-        }
-        Signal {
-            name: "columnsInserted"
-            Parameter { name: "parent"; type: "QModelIndex" }
-            Parameter { name: "first"; type: "int" }
-            Parameter { name: "last"; type: "int" }
-        }
-        Signal {
-            name: "columnsAboutToBeRemoved"
-            Parameter { name: "parent"; type: "QModelIndex" }
-            Parameter { name: "first"; type: "int" }
-            Parameter { name: "last"; type: "int" }
-        }
-        Signal {
-            name: "columnsRemoved"
-            Parameter { name: "parent"; type: "QModelIndex" }
-            Parameter { name: "first"; type: "int" }
-            Parameter { name: "last"; type: "int" }
-        }
-        Signal { name: "modelAboutToBeReset" }
-        Signal { name: "modelReset" }
-        Signal {
-            name: "rowsAboutToBeMoved"
-            Parameter { name: "sourceParent"; type: "QModelIndex" }
-            Parameter { name: "sourceStart"; type: "int" }
-            Parameter { name: "sourceEnd"; type: "int" }
-            Parameter { name: "destinationParent"; type: "QModelIndex" }
-            Parameter { name: "destinationRow"; type: "int" }
-        }
-        Signal {
-            name: "rowsMoved"
-            Parameter { name: "parent"; type: "QModelIndex" }
-            Parameter { name: "start"; type: "int" }
-            Parameter { name: "end"; type: "int" }
-            Parameter { name: "destination"; type: "QModelIndex" }
-            Parameter { name: "row"; type: "int" }
-        }
-        Signal {
-            name: "columnsAboutToBeMoved"
-            Parameter { name: "sourceParent"; type: "QModelIndex" }
-            Parameter { name: "sourceStart"; type: "int" }
-            Parameter { name: "sourceEnd"; type: "int" }
-            Parameter { name: "destinationParent"; type: "QModelIndex" }
-            Parameter { name: "destinationColumn"; type: "int" }
-        }
-        Signal {
-            name: "columnsMoved"
-            Parameter { name: "parent"; type: "QModelIndex" }
-            Parameter { name: "start"; type: "int" }
-            Parameter { name: "end"; type: "int" }
-            Parameter { name: "destination"; type: "QModelIndex" }
-            Parameter { name: "column"; type: "int" }
-        }
-        Method { name: "submit"; type: "bool" }
-        Method { name: "revert" }
-        Method {
-            name: "hasIndex"
-            type: "bool"
-            Parameter { name: "row"; type: "int" }
-            Parameter { name: "column"; type: "int" }
-            Parameter { name: "parent"; type: "QModelIndex" }
-        }
-        Method {
-            name: "hasIndex"
-            type: "bool"
-            Parameter { name: "row"; type: "int" }
-            Parameter { name: "column"; type: "int" }
-        }
-        Method {
-            name: "index"
-            type: "QModelIndex"
-            Parameter { name: "row"; type: "int" }
-            Parameter { name: "column"; type: "int" }
-            Parameter { name: "parent"; type: "QModelIndex" }
-        }
-        Method {
-            name: "index"
-            type: "QModelIndex"
-            Parameter { name: "row"; type: "int" }
-            Parameter { name: "column"; type: "int" }
-        }
-        Method {
-            name: "parent"
-            type: "QModelIndex"
-            Parameter { name: "child"; type: "QModelIndex" }
-        }
-        Method {
-            name: "sibling"
-            type: "QModelIndex"
-            Parameter { name: "row"; type: "int" }
-            Parameter { name: "column"; type: "int" }
-            Parameter { name: "idx"; type: "QModelIndex" }
-        }
-        Method {
-            name: "rowCount"
-            type: "int"
-            Parameter { name: "parent"; type: "QModelIndex" }
-        }
-        Method { name: "rowCount"; type: "int" }
-        Method {
-            name: "columnCount"
-            type: "int"
-            Parameter { name: "parent"; type: "QModelIndex" }
-        }
-        Method { name: "columnCount"; type: "int" }
-        Method {
-            name: "hasChildren"
-            type: "bool"
-            Parameter { name: "parent"; type: "QModelIndex" }
-        }
-        Method { name: "hasChildren"; type: "bool" }
-        Method {
-            name: "data"
-            type: "QVariant"
-            Parameter { name: "index"; type: "QModelIndex" }
-            Parameter { name: "role"; type: "int" }
-        }
-        Method {
-            name: "data"
-            type: "QVariant"
-            Parameter { name: "index"; type: "QModelIndex" }
-        }
-        Method {
-            name: "setData"
-            type: "bool"
-            Parameter { name: "index"; type: "QModelIndex" }
-            Parameter { name: "value"; type: "QVariant" }
-            Parameter { name: "role"; type: "int" }
-        }
-        Method {
-            name: "setData"
-            type: "bool"
-            Parameter { name: "index"; type: "QModelIndex" }
-            Parameter { name: "value"; type: "QVariant" }
-        }
-        Method {
-            name: "headerData"
-            type: "QVariant"
-            Parameter { name: "section"; type: "int" }
-            Parameter { name: "orientation"; type: "Qt::Orientation" }
-            Parameter { name: "role"; type: "int" }
-        }
-        Method {
-            name: "headerData"
-            type: "QVariant"
-            Parameter { name: "section"; type: "int" }
-            Parameter { name: "orientation"; type: "Qt::Orientation" }
-        }
-        Method {
-            name: "fetchMore"
-            Parameter { name: "parent"; type: "QModelIndex" }
-        }
-        Method {
-            name: "canFetchMore"
-            type: "bool"
-            Parameter { name: "parent"; type: "QModelIndex" }
-        }
-        Method {
-            name: "flags"
-            type: "Qt::ItemFlags"
-            Parameter { name: "index"; type: "QModelIndex" }
-        }
-        Method {
-            name: "match"
-            type: "QModelIndexList"
-            Parameter { name: "start"; type: "QModelIndex" }
-            Parameter { name: "role"; type: "int" }
-            Parameter { name: "value"; type: "QVariant" }
-            Parameter { name: "hits"; type: "int" }
-            Parameter { name: "flags"; type: "Qt::MatchFlags" }
-        }
-        Method {
-            name: "match"
-            type: "QModelIndexList"
-            Parameter { name: "start"; type: "QModelIndex" }
-            Parameter { name: "role"; type: "int" }
-            Parameter { name: "value"; type: "QVariant" }
-            Parameter { name: "hits"; type: "int" }
-        }
-        Method {
-            name: "match"
-            type: "QModelIndexList"
-            Parameter { name: "start"; type: "QModelIndex" }
-            Parameter { name: "role"; type: "int" }
-            Parameter { name: "value"; type: "QVariant" }
-        }
-    }
-    Component { name: "QAbstractListModel"; prototype: "QAbstractItemModel" }
-    Component {
-        name: "QCamera"
-        prototype: "QObject"
-        Enum {
-            name: "Status"
-            values: {
-                "UnavailableStatus": 0,
-                "InactiveStatus": 1,
-                "StartingStatus": 2,
-                "StoppingStatus": 3,
-                "ActiveStatus": 4
-            }
-        }
-        Enum {
-            name: "State"
-            values: {
-                "InactiveState": 0,
-                "ActiveState": 1
-            }
-        }
-        Enum {
-            name: "CaptureMode"
-            values: {
-                "CaptureViewfinder": 0,
-                "CaptureStillImage": 1,
-                "CaptureVideo": 2
-            }
-        }
-        Enum {
-            name: "Error"
-            values: {
-                "NoError": 0,
-                "CameraError": 1
-            }
-        }
-        Enum {
-            name: "Position"
-            values: {
-                "UnspecifiedPosition": 0,
-                "BackFace": 1,
-                "FrontFace": 2
-            }
-        }
-        Property { name: "state"; type: "QCamera::State"; isReadonly: true }
-        Property { name: "status"; type: "QCamera::Status"; isReadonly: true }
-        Property { name: "captureMode"; type: "QCamera::CaptureModes" }
-        Signal {
-            name: "stateChanged"
-            Parameter { name: "state"; type: "QCamera::State" }
-        }
-        Signal {
-            name: "captureModeChanged"
-            Parameter { type: "QCamera::CaptureModes" }
-        }
-        Signal {
-            name: "statusChanged"
-            Parameter { name: "status"; type: "QCamera::Status" }
-        }
-        Signal {
-            name: "error"
-            Parameter { type: "QCamera::Error" }
-        }
-        Method {
-            name: "setCaptureMode"
-            Parameter { name: "mode"; type: "QCamera::CaptureModes" }
-        }
-        Method { name: "load" }
-        Method { name: "unload" }
-        Method { name: "start" }
-        Method { name: "stop" }
-    }
-    Component {
-        name: "QDeclarativeAudio"
-        prototype: "QObject"
-        exports: [
-            "QtMultimedia/Audio 5.0",
-            "QtMultimedia/Audio 5.11",
-            "QtMultimedia/Audio 5.6",
-            "QtMultimedia/Audio 5.9",
-            "QtMultimedia/MediaPlayer 5.0",
-            "QtMultimedia/MediaPlayer 5.11",
-            "QtMultimedia/MediaPlayer 5.15",
-            "QtMultimedia/MediaPlayer 5.6",
-            "QtMultimedia/MediaPlayer 5.9"
-        ]
-        exportMetaObjectRevisions: [0, 3, 1, 2, 0, 3, 15, 1, 2]
-        Enum {
-            name: "Status"
-            values: {
-                "UnknownStatus": 0,
-                "NoMedia": 1,
-                "Loading": 2,
-                "Loaded": 3,
-                "Stalled": 4,
-                "Buffering": 5,
-                "Buffered": 6,
-                "EndOfMedia": 7,
-                "InvalidMedia": 8
-            }
-        }
-        Enum {
-            name: "Error"
-            values: {
-                "NoError": 0,
-                "ResourceError": 1,
-                "FormatError": 2,
-                "NetworkError": 3,
-                "AccessDenied": 4,
-                "ServiceMissing": 5
-            }
-        }
-        Enum {
-            name: "Loop"
-            values: {
-                "Infinite": -1
-            }
-        }
-        Enum {
-            name: "PlaybackState"
-            values: {
-                "PlayingState": 1,
-                "PausedState": 2,
-                "StoppedState": 0
-            }
-        }
-        Enum {
-            name: "Availability"
-            values: {
-                "Available": 0,
-                "Busy": 2,
-                "Unavailable": 1,
-                "ResourceMissing": 3
-            }
-        }
-        Enum {
-            name: "AudioRole"
-            values: {
-                "UnknownRole": 0,
-                "AccessibilityRole": 7,
-                "AlarmRole": 4,
-                "GameRole": 9,
-                "MusicRole": 1,
-                "NotificationRole": 5,
-                "RingtoneRole": 6,
-                "SonificationRole": 8,
-                "VideoRole": 2,
-                "VoiceCommunicationRole": 3
-            }
-        }
-        Property { name: "source"; type: "QUrl" }
-        Property { name: "playlist"; revision: 1; type: "QDeclarativePlaylist"; isPointer: true }
-        Property { name: "loops"; type: "int" }
-        Property { name: "playbackState"; type: "PlaybackState"; isReadonly: true }
-        Property { name: "autoPlay"; type: "bool" }
-        Property { name: "autoLoad"; type: "bool" }
-        Property { name: "status"; type: "Status"; isReadonly: true }
-        Property { name: "duration"; type: "int"; isReadonly: true }
-        Property { name: "position"; type: "int"; isReadonly: true }
-        Property { name: "volume"; type: "double" }
-        Property { name: "muted"; type: "bool" }
-        Property { name: "hasAudio"; type: "bool"; isReadonly: true }
-        Property { name: "hasVideo"; type: "bool"; isReadonly: true }
-        Property { name: "bufferProgress"; type: "double"; isReadonly: true }
-        Property { name: "seekable"; type: "bool"; isReadonly: true }
-        Property { name: "playbackRate"; type: "double" }
-        Property { name: "error"; type: "Error"; isReadonly: true }
-        Property { name: "errorString"; type: "string"; isReadonly: true }
-        Property { name: "availability"; type: "Availability"; isReadonly: true }
-        Property { name: "audioRole"; revision: 1; type: "AudioRole" }
-        Property { name: "videoOutput"; revision: 15; type: "QVariant" }
-        Signal { name: "playlistChanged"; revision: 1 }
-        Signal { name: "loopCountChanged" }
-        Signal { name: "paused" }
-        Signal { name: "stopped" }
-        Signal { name: "playing" }
-        Signal { name: "audioRoleChanged"; revision: 1 }
-        Signal {
-            name: "error"
-            Parameter { name: "error"; type: "QDeclarativeAudio::Error" }
-            Parameter { name: "errorString"; type: "string" }
-        }
-        Signal { name: "videoOutputChanged"; revision: 15 }
-        Method { name: "play" }
-        Method { name: "pause" }
-        Method { name: "stop" }
-        Method {
-            name: "seek"
-            Parameter { name: "position"; type: "int" }
-        }
-        Method { name: "supportedAudioRoles"; revision: 1; type: "QJSValue" }
-    }
-    Component {
-        name: "QDeclarativeCamera"
-        prototype: "QObject"
-        exports: [
-            "QtMultimedia/Camera 5.0",
-            "QtMultimedia/Camera 5.4",
-            "QtMultimedia/Camera 5.5"
-        ]
-        exportMetaObjectRevisions: [0, 1, 2]
-        Enum {
-            name: "Position"
-            values: {
-                "UnspecifiedPosition": 0,
-                "BackFace": 1,
-                "FrontFace": 2
-            }
-        }
-        Enum {
-            name: "CaptureMode"
-            values: {
-                "CaptureViewfinder": 0,
-                "CaptureStillImage": 1,
-                "CaptureVideo": 2
-            }
-        }
-        Enum {
-            name: "State"
-            values: {
-                "InactiveState": 0,
-                "ActiveState": 1
-            }
-        }
-        Enum {
-            name: "Status"
-            values: {
-                "UnavailableStatus": 0,
-                "InactiveStatus": 1,
-                "StartingStatus": 2,
-                "StoppingStatus": 3,
-                "ActiveStatus": 4
-            }
-        }
-        Enum {
-            name: "Error"
-            values: {
-                "NoError": 0,
-                "CameraError": 1
-            }
-        }
-        Enum {
-            name: "FlashMode"
-            values: {
-                "FlashOff": 0,
-                "FlashOn": 1,
-                "FlashAuto": 2
-            }
-        }
-        Enum {
-            name: "ExposureMode"
-            values: {
-                "ExposureAuto": 0,
-                "ExposureManual": 1,
-                "ExposurePortrait": 2,
-                "ExposureNight": 3,
-                "ExposureSports": 4,
-                "ExposureSnow": 5,
-                "ExposureBeach": 6,
-                "ExposureAction": 7,
-                "ExposureLandscape": 8,
-                "ExposureNightPortrait": 9,
-                "ExposureTheatre": 10,
-                "ExposureSunset": 11,
-                "ExposureSteadyPhoto": 12,
-                "ExposureFireworks": 13,
-                "ExposureParty": 14,
-                "ExposureCandlelight": 15,
-                "ExposureBarcode": 16,
-            }
-        }
-        Enum {
-            name: "FocusMode"
-            values: {
-                "FocusModeAuto": 0,
-                "FocusModeAutoNear": 1,
-                "FocusModeAutoFar": 2,
-                "FocusModeHyperfocal": 3,
-                "FocusModeInfinity": 4,
-                "FocusModeManual": 5,
-                "FocusContinuous": 0,
-                "FocusAuto": 0,
-                "FocusMacro": 1,
-                "FocusHyperfocal": 3,
-                "FocusInfinity": 4,
-                "FocusManual": 5
-            }
-        }
-        Enum {
-            name: "Availability"
-            values: {
-                "Available": 0,
-                "Busy": 2,
-                "Unavailable": 1,
-                "ResourceMissing": 3
-            }
-        }
-        Property { name: "deviceId"; revision: 1; type: "string" }
-        Property { name: "position"; revision: 1; type: "Position" }
-        Property { name: "displayName"; revision: 1; type: "string"; isReadonly: true }
-        Property { name: "orientation"; revision: 1; type: "int"; isReadonly: true }
-        Property { name: "captureMode"; type: "CaptureMode" }
-        Property { name: "cameraState"; type: "State" }
-        Property { name: "cameraStatus"; type: "Status"; isReadonly: true }
-        Property { name: "errorCode"; type: "Error"; isReadonly: true }
-        Property { name: "errorString"; type: "string"; isReadonly: true }
-        Property { name: "availability"; type: "Availability"; isReadonly: true }
-        Property { name: "opticalZoom"; type: "double" }
-        Property { name: "maximumOpticalZoom"; type: "double"; isReadonly: true }
-        Property { name: "digitalZoom"; type: "double" }
-        Property { name: "maximumDigitalZoom"; type: "double"; isReadonly: true }
-        Property {
-            name: "imageCapture"
-            type: "QDeclarativeCameraCapture"
-            isReadonly: true
-            isPointer: true
-        }
-        Property {
-            name: "videoRecorder"
-            type: "QDeclarativeCameraRecorder"
-            isReadonly: true
-            isPointer: true
-        }
-        Property {
-            name: "exposure"
-            type: "QDeclarativeCameraExposure"
-            isReadonly: true
-            isPointer: true
-        }
-        Property { name: "flash"; type: "QDeclarativeCameraFlash"; isReadonly: true; isPointer: true }
-        Property { name: "focus"; type: "QDeclarativeCameraFocus"; isReadonly: true; isPointer: true }
-        Property {
-            name: "imageProcessing"
-            type: "QDeclarativeCameraImageProcessing"
-            isReadonly: true
-            isPointer: true
-        }
-        Property {
-            name: "viewfinder"
-            revision: 1
-            type: "QDeclarativeCameraViewfinder"
-            isReadonly: true
-            isPointer: true
-        }
-        Signal { name: "errorChanged" }
-        Signal {
-            name: "error"
-            Parameter { name: "errorCode"; type: "QDeclarativeCamera::Error" }
-            Parameter { name: "errorString"; type: "string" }
-        }
-        Signal { name: "deviceIdChanged"; revision: 1 }
-        Signal { name: "positionChanged"; revision: 1 }
-        Signal { name: "displayNameChanged"; revision: 1 }
-        Signal { name: "orientationChanged"; revision: 1 }
-        Signal {
-            name: "cameraStateChanged"
-            Parameter { type: "QDeclarativeCamera::State" }
-        }
-        Signal {
-            name: "opticalZoomChanged"
-            Parameter { type: "double" }
-        }
-        Signal {
-            name: "digitalZoomChanged"
-            Parameter { type: "double" }
-        }
-        Signal {
-            name: "maximumOpticalZoomChanged"
-            Parameter { type: "double" }
-        }
-        Signal {
-            name: "maximumDigitalZoomChanged"
-            Parameter { type: "double" }
-        }
-        Method {
-            name: "setCaptureMode"
-            Parameter { name: "mode"; type: "CaptureMode" }
-        }
-        Method { name: "start" }
-        Method { name: "stop" }
-        Method {
-            name: "setCameraState"
-            Parameter { name: "state"; type: "State" }
-        }
-        Method {
-            name: "setDigitalZoom"
-            Parameter { type: "double" }
-        }
-        Method {
-            name: "supportedViewfinderResolutions"
-            revision: 2
-            type: "QJSValue"
-            Parameter { name: "minimumFrameRate"; type: "double" }
-            Parameter { name: "maximumFrameRate"; type: "double" }
-        }
-        Method {
-            name: "supportedViewfinderResolutions"
-            revision: 2
-            type: "QJSValue"
-            Parameter { name: "minimumFrameRate"; type: "double" }
-        }
-        Method { name: "supportedViewfinderResolutions"; revision: 2; type: "QJSValue" }
-        Method {
-            name: "supportedViewfinderFrameRateRanges"
-            revision: 2
-            type: "QJSValue"
-            Parameter { name: "resolution"; type: "QJSValue" }
-        }
-        Method { name: "supportedViewfinderFrameRateRanges"; revision: 2; type: "QJSValue" }
-    }
-    Component {
-        name: "QDeclarativeCameraCapture"
-        prototype: "QObject"
-        exports: [
-            "QtMultimedia/CameraCapture 5.0",
-            "QtMultimedia/CameraCapture 5.9"
-        ]
-        isCreatable: false
-        exportMetaObjectRevisions: [0, 1]
-        Property { name: "ready"; type: "bool"; isReadonly: true }
-        Property { name: "capturedImagePath"; type: "string"; isReadonly: true }
-        Property { name: "resolution"; type: "QSize" }
-        Property { name: "errorString"; type: "string"; isReadonly: true }
-        Property { name: "supportedResolutions"; revision: 1; type: "QVariantList"; isReadonly: true }
-        Signal {
-            name: "readyForCaptureChanged"
-            Parameter { type: "bool" }
-        }
-        Signal {
-            name: "imageExposed"
-            Parameter { name: "requestId"; type: "int" }
-        }
-        Signal {
-            name: "imageCaptured"
-            Parameter { name: "requestId"; type: "int" }
-            Parameter { name: "preview"; type: "string" }
-        }
-        Signal {
-            name: "imageMetadataAvailable"
-            Parameter { name: "requestId"; type: "int" }
-            Parameter { name: "key"; type: "string" }
-            Parameter { name: "value"; type: "QVariant" }
-        }
-        Signal {
-            name: "imageSaved"
-            Parameter { name: "requestId"; type: "int" }
-            Parameter { name: "path"; type: "string" }
-        }
-        Signal {
-            name: "captureFailed"
-            Parameter { name: "requestId"; type: "int" }
-            Parameter { name: "message"; type: "string" }
-        }
-        Signal {
-            name: "resolutionChanged"
-            Parameter { type: "QSize" }
-        }
-        Method { name: "capture"; type: "int" }
-        Method {
-            name: "captureToLocation"
-            type: "int"
-            Parameter { name: "location"; type: "string" }
-        }
-        Method { name: "cancelCapture" }
-        Method {
-            name: "setResolution"
-            Parameter { name: "resolution"; type: "QSize" }
-        }
-        Method {
-            name: "setMetadata"
-            Parameter { name: "key"; type: "string" }
-            Parameter { name: "value"; type: "QVariant" }
-        }
-    }
-    Component {
-        name: "QDeclarativeCameraExposure"
-        prototype: "QObject"
-        exports: [
-            "QtMultimedia/CameraExposure 5.0",
-            "QtMultimedia/CameraExposure 5.11"
-        ]
-        isCreatable: false
-        exportMetaObjectRevisions: [0, 1]
-        Enum {
-            name: "ExposureMode"
-            values: {
-                "ExposureAuto": 0,
-                "ExposureManual": 1,
-                "ExposurePortrait": 2,
-                "ExposureNight": 3,
-                "ExposureSports": 4,
-                "ExposureSnow": 5,
-                "ExposureBeach": 6,
-                "ExposureAction": 7,
-                "ExposureLandscape": 8,
-                "ExposureNightPortrait": 9,
-                "ExposureTheatre": 10,
-                "ExposureSunset": 11,
-                "ExposureSteadyPhoto": 12,
-                "ExposureFireworks": 13,
-                "ExposureParty": 14,
-                "ExposureCandlelight": 15,
-                "ExposureBarcode": 16,
-            }
-        }
-        Property { name: "exposureCompensation"; type: "double" }
-        Property { name: "iso"; type: "int"; isReadonly: true }
-        Property { name: "shutterSpeed"; type: "double"; isReadonly: true }
-        Property { name: "aperture"; type: "double"; isReadonly: true }
-        Property { name: "manualShutterSpeed"; type: "double" }
-        Property { name: "manualAperture"; type: "double" }
-        Property { name: "manualIso"; type: "double" }
-        Property { name: "exposureMode"; type: "ExposureMode" }
-        Property { name: "supportedExposureModes"; revision: 1; type: "QVariantList"; isReadonly: true }
-        Signal {
-            name: "isoSensitivityChanged"
-            Parameter { type: "int" }
-        }
-        Signal {
-            name: "apertureChanged"
-            Parameter { type: "double" }
-        }
-        Signal {
-            name: "shutterSpeedChanged"
-            Parameter { type: "double" }
-        }
-        Signal {
-            name: "manualIsoSensitivityChanged"
-            Parameter { type: "int" }
-        }
-        Signal {
-            name: "manualApertureChanged"
-            Parameter { type: "double" }
-        }
-        Signal {
-            name: "manualShutterSpeedChanged"
-            Parameter { type: "double" }
-        }
-        Signal {
-            name: "exposureCompensationChanged"
-            Parameter { type: "double" }
-        }
-        Signal {
-            name: "exposureModeChanged"
-            Parameter { type: "ExposureMode" }
-        }
-        Method {
-            name: "setExposureMode"
-            Parameter { type: "ExposureMode" }
-        }
-        Method {
-            name: "setExposureCompensation"
-            Parameter { name: "ev"; type: "double" }
-        }
-        Method {
-            name: "setManualAperture"
-            Parameter { type: "double" }
-        }
-        Method {
-            name: "setManualShutterSpeed"
-            Parameter { type: "double" }
-        }
-        Method {
-            name: "setManualIsoSensitivity"
-            Parameter { name: "iso"; type: "int" }
-        }
-        Method { name: "setAutoAperture" }
-        Method { name: "setAutoShutterSpeed" }
-        Method { name: "setAutoIsoSensitivity" }
-    }
-    Component {
-        name: "QDeclarativeCameraFlash"
-        prototype: "QObject"
-        exports: [
-            "QtMultimedia/CameraFlash 5.0",
-            "QtMultimedia/CameraFlash 5.9"
-        ]
-        isCreatable: false
-        exportMetaObjectRevisions: [0, 1]
-        Enum {
-            name: "FlashMode"
-            values: {
-                "FlashOff": 0,
-                "FlashOn": 1,
-                "FlashAuto": 2
-            }
-        }
-        Property { name: "ready"; type: "bool"; isReadonly: true }
-        Property { name: "mode"; type: "FlashMode" }
-        Property { name: "supportedModes"; revision: 1; type: "QVariantList"; isReadonly: true }
-        Signal {
-            name: "flashReady"
-            Parameter { name: "status"; type: "bool" }
-        }
-        Signal {
-            name: "flashModeChanged"
-            Parameter { type: "FlashMode" }
-        }
-        Method {
-            name: "setFlashMode"
-            Parameter { type: "FlashMode" }
-        }
-    }
-    Component {
-        name: "QDeclarativeCameraFocus"
-        prototype: "QObject"
-        exports: [
-            "QtMultimedia/CameraFocus 5.0",
-            "QtMultimedia/CameraFocus 5.11"
-        ]
-        isCreatable: false
-        exportMetaObjectRevisions: [0, 1]
-        Enum {
-            name: "FocusMode"
-            values: {
-                "FocusModeAuto": 0,
-                "FocusModeAutoNear": 1,
-                "FocusModeAutoFar": 2,
-                "FocusModeHyperfocal": 3,
-                "FocusModeInfinity": 4,
-                "FocusModeManual": 5,
-                "FocusContinuous": 0,
-                "FocusAuto": 0,
-                "FocusMacro": 1,
-                "FocusHyperfocal": 3,
-                "FocusInfinity": 4,
-                "FocusManual": 5
-            }
-        }
-        Property { name: "focusMode"; type: "FocusMode" }
-        Property { name: "supportedFocusModes"; revision: 1; type: "QVariantList"; isReadonly: true }
-        Property { name: "customFocusPoint"; type: "QPointF" }
-        Signal {
-            name: "focusModeChanged"
-            Parameter { type: "FocusMode" }
-        }
-        Signal {
-            name: "customFocusPointChanged"
-            Parameter { type: "QPointF" }
-        }
-        Method {
-            name: "setFocusMode"
-            Parameter { type: "FocusMode" }
-        }
-        Method {
-            name: "setCustomFocusPoint"
-            Parameter { name: "point"; type: "QPointF" }
-        }
-        Method {
-            name: "isFocusModeSupported"
-            type: "bool"
-            Parameter { name: "mode"; type: "FocusMode" }
-        }
-    }
-    Component {
-        name: "QDeclarativeCameraImageProcessing"
-        prototype: "QObject"
-        exports: [
-            "QtMultimedia/CameraImageProcessing 5.0",
-            "QtMultimedia/CameraImageProcessing 5.11",
-            "QtMultimedia/CameraImageProcessing 5.5",
-            "QtMultimedia/CameraImageProcessing 5.7"
-        ]
-        isCreatable: false
-        exportMetaObjectRevisions: [0, 3, 1, 2]
-        Enum {
-            name: "WhiteBalanceMode"
-            values: {
-                "WhiteBalanceAuto": 0,
-                "WhiteBalanceManual": 1,
-                "WhiteBalanceSunlight": 2,
-                "WhiteBalanceCloudy": 3,
-                "WhiteBalanceShade": 4,
-                "WhiteBalanceTungsten": 5,
-                "WhiteBalanceFluorescent": 6,
-                "WhiteBalanceFlash": 7,
-                "WhiteBalanceSunset": 8,
-            }
-        }
-        Enum {
-            name: "ColorFilter"
-            values: {
-                "ColorFilterNone": 0,
-                "ColorFilterGrayscale": 1,
-                "ColorFilterNegative": 2,
-                "ColorFilterSolarize": 3,
-                "ColorFilterSepia": 4,
-                "ColorFilterPosterize": 5,
-                "ColorFilterWhiteboard": 6,
-                "ColorFilterBlackboard": 7,
-                "ColorFilterAqua": 8,
-            }
-        }
-        Property { name: "whiteBalanceMode"; type: "WhiteBalanceMode" }
-        Property { name: "manualWhiteBalance"; type: "double" }
-        Property { name: "brightness"; revision: 2; type: "double" }
-        Property { name: "contrast"; type: "double" }
-        Property { name: "saturation"; type: "double" }
-        Property { name: "colorFilter"; revision: 1; type: "ColorFilter" }
-        Property { name: "available"; revision: 3; type: "bool"; isReadonly: true }
-        Property { name: "supportedColorFilters"; revision: 3; type: "QVariantList"; isReadonly: true }
-        Property {
-            name: "supportedWhiteBalanceModes"
-            revision: 3
-            type: "QVariantList"
-            isReadonly: true
-        }
-        Signal {
-            name: "whiteBalanceModeChanged"
-            Parameter { type: "QDeclarativeCameraImageProcessing::WhiteBalanceMode" }
-        }
-        Signal {
-            name: "manualWhiteBalanceChanged"
-            Parameter { type: "double" }
-        }
-        Signal {
-            name: "brightnessChanged"
-            revision: 2
-            Parameter { type: "double" }
-        }
-        Signal {
-            name: "contrastChanged"
-            Parameter { type: "double" }
-        }
-        Signal {
-            name: "saturationChanged"
-            Parameter { type: "double" }
-        }
-        Method {
-            name: "setWhiteBalanceMode"
-            Parameter { name: "mode"; type: "QDeclarativeCameraImageProcessing::WhiteBalanceMode" }
-        }
-        Method {
-            name: "setManualWhiteBalance"
-            Parameter { name: "colorTemp"; type: "double" }
-        }
-        Method {
-            name: "setBrightness"
-            revision: 2
-            Parameter { name: "value"; type: "double" }
-        }
-        Method {
-            name: "setContrast"
-            Parameter { name: "value"; type: "double" }
-        }
-        Method {
-            name: "setSaturation"
-            Parameter { name: "value"; type: "double" }
-        }
-        Method {
-            name: "setColorFilter"
-            Parameter { name: "colorFilter"; type: "ColorFilter" }
-        }
-    }
-    Component {
-        name: "QDeclarativeCameraRecorder"
-        prototype: "QObject"
-        exports: ["QtMultimedia/CameraRecorder 5.0"]
-        isCreatable: false
-        exportMetaObjectRevisions: [0]
-        Enum {
-            name: "RecorderState"
-            values: {
-                "StoppedState": 0,
-                "RecordingState": 1
-            }
-        }
-        Enum {
-            name: "RecorderStatus"
-            values: {
-                "UnavailableStatus": 0,
-                "StoppedStatus": 1,
-                "StartingStatus": 2,
-                "RecordingStatus": 3,
-                "PausedStatus": 4,
-                "FinalizingStatus": 5
-            }
-        }
-        Enum {
-            name: "EncodingMode"
-            values: {
-                "ConstantQualityEncoding": 0,
-                "ConstantBitRateEncoding": 1,
-                "AverageBitRateEncoding": 2
-            }
-        }
-        Enum {
-            name: "Error"
-            values: {
-                "NoError": 0,
-                "ResourceError": 1,
-                "FormatError": 2,
-                "OutOfSpaceError": 3
-            }
-        }
-        Property { name: "recorderState"; type: "RecorderState" }
-        Property { name: "recorderStatus"; type: "RecorderStatus"; isReadonly: true }
-        Property { name: "videoCodec"; type: "string" }
-        Property { name: "resolution"; type: "QSize" }
-        Property { name: "frameRate"; type: "double" }
-        Property { name: "videoBitRate"; type: "int" }
-        Property { name: "videoEncodingMode"; type: "EncodingMode" }
-        Property { name: "audioCodec"; type: "string" }
-        Property { name: "audioBitRate"; type: "int" }
-        Property { name: "audioChannels"; type: "int" }
-        Property { name: "audioSampleRate"; type: "int" }
-        Property { name: "audioEncodingMode"; type: "EncodingMode" }
-        Property { name: "mediaContainer"; type: "string" }
-        Property { name: "duration"; type: "qlonglong"; isReadonly: true }
-        Property { name: "outputLocation"; type: "string" }
-        Property { name: "actualLocation"; type: "string"; isReadonly: true }
-        Property { name: "muted"; type: "bool" }
-        Property { name: "errorString"; type: "string"; isReadonly: true }
-        Property { name: "errorCode"; type: "Error"; isReadonly: true }
-        Signal {
-            name: "recorderStateChanged"
-            Parameter { name: "state"; type: "QDeclarativeCameraRecorder::RecorderState" }
-        }
-        Signal {
-            name: "durationChanged"
-            Parameter { name: "duration"; type: "qlonglong" }
-        }
-        Signal {
-            name: "mutedChanged"
-            Parameter { name: "muted"; type: "bool" }
-        }
-        Signal {
-            name: "outputLocationChanged"
-            Parameter { name: "location"; type: "string" }
-        }
-        Signal {
-            name: "actualLocationChanged"
-            Parameter { name: "location"; type: "string" }
-        }
-        Signal {
-            name: "error"
-            Parameter { name: "errorCode"; type: "QDeclarativeCameraRecorder::Error" }
-            Parameter { name: "errorString"; type: "string" }
-        }
-        Signal {
-            name: "metaDataChanged"
-            Parameter { name: "key"; type: "string" }
-            Parameter { name: "value"; type: "QVariant" }
-        }
-        Signal {
-            name: "captureResolutionChanged"
-            Parameter { type: "QSize" }
-        }
-        Signal {
-            name: "audioCodecChanged"
-            Parameter { name: "codec"; type: "string" }
-        }
-        Signal {
-            name: "videoCodecChanged"
-            Parameter { name: "codec"; type: "string" }
-        }
-        Signal {
-            name: "mediaContainerChanged"
-            Parameter { name: "container"; type: "string" }
-        }
-        Signal {
-            name: "frameRateChanged"
-            Parameter { name: "arg"; type: "double" }
-        }
-        Signal {
-            name: "videoBitRateChanged"
-            Parameter { name: "arg"; type: "int" }
-        }
-        Signal {
-            name: "audioBitRateChanged"
-            Parameter { name: "arg"; type: "int" }
-        }
-        Signal {
-            name: "audioChannelsChanged"
-            Parameter { name: "arg"; type: "int" }
-        }
-        Signal {
-            name: "audioSampleRateChanged"
-            Parameter { name: "arg"; type: "int" }
-        }
-        Signal {
-            name: "audioEncodingModeChanged"
-            Parameter { name: "encodingMode"; type: "EncodingMode" }
-        }
-        Signal {
-            name: "videoEncodingModeChanged"
-            Parameter { name: "encodingMode"; type: "EncodingMode" }
-        }
-        Method {
-            name: "setOutputLocation"
-            Parameter { name: "location"; type: "string" }
-        }
-        Method { name: "record" }
-        Method { name: "stop" }
-        Method {
-            name: "setRecorderState"
-            Parameter { name: "state"; type: "QDeclarativeCameraRecorder::RecorderState" }
-        }
-        Method {
-            name: "setMuted"
-            Parameter { name: "muted"; type: "bool" }
-        }
-        Method {
-            name: "setMetadata"
-            Parameter { name: "key"; type: "string" }
-            Parameter { name: "value"; type: "QVariant" }
-        }
-        Method {
-            name: "setCaptureResolution"
-            Parameter { name: "resolution"; type: "QSize" }
-        }
-        Method {
-            name: "setAudioCodec"
-            Parameter { name: "codec"; type: "string" }
-        }
-        Method {
-            name: "setVideoCodec"
-            Parameter { name: "codec"; type: "string" }
-        }
-        Method {
-            name: "setMediaContainer"
-            Parameter { name: "container"; type: "string" }
-        }
-        Method {
-            name: "setFrameRate"
-            Parameter { name: "frameRate"; type: "double" }
-        }
-        Method {
-            name: "setVideoBitRate"
-            Parameter { name: "rate"; type: "int" }
-        }
-        Method {
-            name: "setAudioBitRate"
-            Parameter { name: "rate"; type: "int" }
-        }
-        Method {
-            name: "setAudioChannels"
-            Parameter { name: "channels"; type: "int" }
-        }
-        Method {
-            name: "setAudioSampleRate"
-            Parameter { name: "rate"; type: "int" }
-        }
-        Method {
-            name: "setVideoEncodingMode"
-            Parameter { name: "encodingMode"; type: "EncodingMode" }
-        }
-        Method {
-            name: "setAudioEncodingMode"
-            Parameter { name: "encodingMode"; type: "EncodingMode" }
-        }
-    }
-    Component {
-        name: "QDeclarativeCameraViewfinder"
-        prototype: "QObject"
-        exports: ["QtMultimedia/CameraViewfinder 5.4"]
-        isCreatable: false
-        exportMetaObjectRevisions: [0]
-        Property { name: "resolution"; type: "QSize" }
-        Property { name: "minimumFrameRate"; type: "double" }
-        Property { name: "maximumFrameRate"; type: "double" }
-    }
-    Component {
-        name: "QDeclarativeMultimediaGlobal"
-        prototype: "QObject"
-        exports: ["QtMultimedia/QtMultimedia 5.4"]
-        isCreatable: false
-        isSingleton: true
-        exportMetaObjectRevisions: [0]
-        Enum {
-            name: "VolumeScale"
-            values: {
-                "LinearVolumeScale": 0,
-                "CubicVolumeScale": 1,
-                "LogarithmicVolumeScale": 2,
-                "DecibelVolumeScale": 3
-            }
-        }
-        Property { name: "defaultCamera"; type: "QJSValue"; isReadonly: true }
-        Property { name: "availableCameras"; type: "QJSValue"; isReadonly: true }
-        Method {
-            name: "convertVolume"
-            type: "double"
-            Parameter { name: "volume"; type: "double" }
-            Parameter { name: "from"; type: "VolumeScale" }
-            Parameter { name: "to"; type: "VolumeScale" }
-        }
-    }
-    Component {
-        name: "QDeclarativePlaylist"
-        defaultProperty: "items"
-        prototype: "QAbstractListModel"
-        exports: ["QtMultimedia/Playlist 5.6", "QtMultimedia/Playlist 5.7"]
-        exportMetaObjectRevisions: [0, 1]
-        Enum {
-            name: "PlaybackMode"
-            values: {
-                "CurrentItemOnce": 0,
-                "CurrentItemInLoop": 1,
-                "Sequential": 2,
-                "Loop": 3,
-                "Random": 4
-            }
-        }
-        Enum {
-            name: "Error"
-            values: {
-                "NoError": 0,
-                "FormatError": 1,
-                "FormatNotSupportedError": 2,
-                "NetworkError": 3,
-                "AccessDeniedError": 4
-            }
-        }
-        Property { name: "playbackMode"; type: "PlaybackMode" }
-        Property { name: "currentItemSource"; type: "QUrl"; isReadonly: true }
-        Property { name: "currentIndex"; type: "int" }
-        Property { name: "itemCount"; type: "int"; isReadonly: true }
-        Property { name: "readOnly"; type: "bool"; isReadonly: true }
-        Property { name: "error"; type: "Error"; isReadonly: true }
-        Property { name: "errorString"; type: "string"; isReadonly: true }
-        Property { name: "items"; type: "QDeclarativePlaylistItem"; isList: true; isReadonly: true }
-        Signal {
-            name: "itemAboutToBeInserted"
-            Parameter { name: "start"; type: "int" }
-            Parameter { name: "end"; type: "int" }
-        }
-        Signal {
-            name: "itemInserted"
-            Parameter { name: "start"; type: "int" }
-            Parameter { name: "end"; type: "int" }
-        }
-        Signal {
-            name: "itemAboutToBeRemoved"
-            Parameter { name: "start"; type: "int" }
-            Parameter { name: "end"; type: "int" }
-        }
-        Signal {
-            name: "itemRemoved"
-            Parameter { name: "start"; type: "int" }
-            Parameter { name: "end"; type: "int" }
-        }
-        Signal {
-            name: "itemChanged"
-            Parameter { name: "start"; type: "int" }
-            Parameter { name: "end"; type: "int" }
-        }
-        Signal { name: "loaded" }
-        Signal { name: "loadFailed" }
-        Signal {
-            name: "error"
-            Parameter { name: "error"; type: "QDeclarativePlaylist::Error" }
-            Parameter { name: "errorString"; type: "string" }
-        }
-        Method {
-            name: "itemSource"
-            type: "QUrl"
-            Parameter { name: "index"; type: "int" }
-        }
-        Method {
-            name: "nextIndex"
-            type: "int"
-            Parameter { name: "steps"; type: "int" }
-        }
-        Method { name: "nextIndex"; type: "int" }
-        Method {
-            name: "previousIndex"
-            type: "int"
-            Parameter { name: "steps"; type: "int" }
-        }
-        Method { name: "previousIndex"; type: "int" }
-        Method { name: "next" }
-        Method { name: "previous" }
-        Method { name: "shuffle" }
-        Method {
-            name: "load"
-            Parameter { name: "location"; type: "QUrl" }
-            Parameter { name: "format"; type: "string" }
-        }
-        Method {
-            name: "load"
-            Parameter { name: "location"; type: "QUrl" }
-        }
-        Method {
-            name: "save"
-            type: "bool"
-            Parameter { name: "location"; type: "QUrl" }
-            Parameter { name: "format"; type: "string" }
-        }
-        Method {
-            name: "save"
-            type: "bool"
-            Parameter { name: "location"; type: "QUrl" }
-        }
-        Method {
-            name: "addItem"
-            type: "bool"
-            Parameter { name: "source"; type: "QUrl" }
-        }
-        Method {
-            name: "addItems"
-            revision: 1
-            type: "bool"
-            Parameter { name: "sources"; type: "QList<QUrl>" }
-        }
-        Method {
-            name: "insertItem"
-            type: "bool"
-            Parameter { name: "index"; type: "int" }
-            Parameter { name: "source"; type: "QUrl" }
-        }
-        Method {
-            name: "insertItems"
-            revision: 1
-            type: "bool"
-            Parameter { name: "index"; type: "int" }
-            Parameter { name: "sources"; type: "QList<QUrl>" }
-        }
-        Method {
-            name: "moveItem"
-            revision: 1
-            type: "bool"
-            Parameter { name: "from"; type: "int" }
-            Parameter { name: "to"; type: "int" }
-        }
-        Method {
-            name: "removeItem"
-            type: "bool"
-            Parameter { name: "index"; type: "int" }
-        }
-        Method {
-            name: "removeItems"
-            revision: 1
-            type: "bool"
-            Parameter { name: "start"; type: "int" }
-            Parameter { name: "end"; type: "int" }
-        }
-        Method { name: "clear"; type: "bool" }
-    }
-    Component {
-        name: "QDeclarativePlaylistItem"
-        prototype: "QObject"
-        exports: ["QtMultimedia/PlaylistItem 5.6"]
-        exportMetaObjectRevisions: [0]
-        Property { name: "source"; type: "QUrl" }
-    }
-    Component {
-        name: "QDeclarativeTorch"
-        prototype: "QObject"
-        exports: ["QtMultimedia/Torch 5.0"]
-        exportMetaObjectRevisions: [0]
-        Property { name: "enabled"; type: "bool" }
-        Property { name: "power"; type: "int" }
-    }
-    Component {
-        name: "QDeclarativeVideoOutput"
-        defaultProperty: "data"
-        prototype: "QQuickItem"
-        exports: [
-            "QtMultimedia/VideoOutput 5.0",
-            "QtMultimedia/VideoOutput 5.13",
-            "QtMultimedia/VideoOutput 5.15",
-            "QtMultimedia/VideoOutput 5.2"
-        ]
-        exportMetaObjectRevisions: [0, 13, 15, 2]
-        Enum {
-            name: "FlushMode"
-            values: {
-                "EmptyFrame": 0,
-                "FirstFrame": 1,
-                "LastFrame": 2
-            }
-        }
-        Enum {
-            name: "FillMode"
-            values: {
-                "Stretch": 0,
-                "PreserveAspectFit": 1,
-                "PreserveAspectCrop": 2
-            }
-        }
-        Property { name: "source"; type: "QObject"; isPointer: true }
-        Property { name: "fillMode"; type: "FillMode" }
-        Property { name: "orientation"; type: "int" }
-        Property { name: "autoOrientation"; revision: 2; type: "bool" }
-        Property { name: "sourceRect"; type: "QRectF"; isReadonly: true }
-        Property { name: "contentRect"; type: "QRectF"; isReadonly: true }
-        Property { name: "flushMode"; revision: 13; type: "FlushMode" }
-        Property {
-            name: "videoSurface"
-            revision: 15
-            type: "QAbstractVideoSurface"
-            isReadonly: true
-            isPointer: true
-        }
-        Signal {
-            name: "fillModeChanged"
-            Parameter { type: "QDeclarativeVideoOutput::FillMode" }
-        }
-        Method {
-            name: "mapPointToItem"
-            type: "QPointF"
-            Parameter { name: "point"; type: "QPointF" }
-        }
-        Method {
-            name: "mapRectToItem"
-            type: "QRectF"
-            Parameter { name: "rectangle"; type: "QRectF" }
-        }
-        Method {
-            name: "mapNormalizedPointToItem"
-            type: "QPointF"
-            Parameter { name: "point"; type: "QPointF" }
-        }
-        Method {
-            name: "mapNormalizedRectToItem"
-            type: "QRectF"
-            Parameter { name: "rectangle"; type: "QRectF" }
-        }
-        Method {
-            name: "mapPointToSource"
-            type: "QPointF"
-            Parameter { name: "point"; type: "QPointF" }
-        }
-        Method {
-            name: "mapRectToSource"
-            type: "QRectF"
-            Parameter { name: "rectangle"; type: "QRectF" }
-        }
-        Method {
-            name: "mapPointToSourceNormalized"
-            type: "QPointF"
-            Parameter { name: "point"; type: "QPointF" }
-        }
-        Method {
-            name: "mapRectToSourceNormalized"
-            type: "QRectF"
-            Parameter { name: "rectangle"; type: "QRectF" }
-        }
-    }
-    Component { name: "QSGVideoItemSurface"; prototype: "QAbstractVideoSurface" }
-    Component {
-        name: "QSoundEffect"
-        prototype: "QObject"
-        exports: [
-            "QtMultimedia/SoundEffect 5.0",
-            "QtMultimedia/SoundEffect 5.3",
-            "QtMultimedia/SoundEffect 5.8"
-        ]
-        exportMetaObjectRevisions: [0, 0, 0]
-        Enum {
-            name: "Loop"
-            values: {
-                "Infinite": -2
-            }
-        }
-        Enum {
-            name: "Status"
-            values: {
-                "Null": 0,
-                "Loading": 1,
-                "Ready": 2,
-                "Error": 3
-            }
-        }
-        Property { name: "source"; type: "QUrl" }
-        Property { name: "loops"; type: "int" }
-        Property { name: "loopsRemaining"; type: "int"; isReadonly: true }
-        Property { name: "volume"; type: "double" }
-        Property { name: "muted"; type: "bool" }
-        Property { name: "playing"; type: "bool"; isReadonly: true }
-        Property { name: "status"; type: "Status"; isReadonly: true }
-        Property { name: "category"; type: "string" }
-        Signal { name: "loopCountChanged" }
-        Signal { name: "loadedChanged" }
-        Method { name: "play" }
-        Method { name: "stop" }
-    }
-}
diff --git a/src/imports/multimedia/qmldir b/src/imports/multimedia/qmldir
index 3444aaa06..028587088 100644
--- a/src/imports/multimedia/qmldir
+++ b/src/imports/multimedia/qmldir
@@ -3,5 +3,4 @@ plugin declarative_multimedia
 classname QMultimediaDeclarativeModule
 typeinfo plugins.qmltypes
 prefer :/qt-project.org/imports/QtMultimedia/
-typeinfo plugins.qmltypes
 Video 5.0 Video.qml