diff options
author | Lars Knoll <lars.knoll@qt.io> | 2021-04-13 13:57:07 +0200 |
---|---|---|
committer | Lars Knoll <lars.knoll@qt.io> | 2021-04-16 11:01:09 +0000 |
commit | 5eff59b1b5aed9e88100824a0009f5fc5f6c89ba (patch) | |
tree | 88c587fbfab88146c9f1a2a3ff38f928cf46bbfd /src/imports | |
parent | dd17bf10c9932cc4928a954d71a67bbafc587659 (diff) |
Kill all versioned imports
And don't register the items with a version neither.
Change-Id: I514480fe7570cba468404bc891f238991690f499
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Reviewed-by: Doris Verria <doris.verria@qt.io>
Diffstat (limited to 'src/imports')
-rw-r--r-- | src/imports/multimedia/Video.qml | 4 | ||||
-rw-r--r-- | src/imports/multimedia/multimedia.cpp | 84 |
2 files changed, 19 insertions, 69 deletions
diff --git a/src/imports/multimedia/Video.qml b/src/imports/multimedia/Video.qml index 929fdda98..886f7ff9b 100644 --- a/src/imports/multimedia/Video.qml +++ b/src/imports/multimedia/Video.qml @@ -37,8 +37,8 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import QtMultimedia 5.13 +import QtQuick +import QtMultimedia /*! \qmltype Video diff --git a/src/imports/multimedia/multimedia.cpp b/src/imports/multimedia/multimedia.cpp index ddbf81f63..3991b3242 100644 --- a/src/imports/multimedia/multimedia.cpp +++ b/src/imports/multimedia/multimedia.cpp @@ -80,85 +80,35 @@ public: { Q_ASSERT(QLatin1String(uri) == QLatin1String("QtMultimedia")); - // 5.0 types - qmlRegisterType<QSoundEffect>(uri, 5, 0, "SoundEffect"); - qmlRegisterType<QMediaPlayer>(uri, 5, 0, "Audio"); - qmlRegisterType<QMediaPlayer>(uri, 5, 0, "MediaPlayer"); - qmlRegisterType<QDeclarativeVideoOutput>(uri, 5, 0, "VideoOutput"); - qmlRegisterType<QDeclarativeCamera>(uri, 5, 0, "Camera"); - qmlRegisterUncreatableType<QDeclarativeCameraCapture>(uri, 5, 0, "CameraCapture", + // 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")); - qmlRegisterUncreatableType<QDeclarativeCameraRecorder>(uri, 5, 0, "CameraRecorder", + qmlRegisterUncreatableType<QDeclarativeCameraRecorder>(uri, 6, 0, "CameraRecorder", tr("CameraRecorder is provided by Camera")); - qmlRegisterUncreatableType<QDeclarativeCameraExposure>(uri, 5, 0, "CameraExposure", + qmlRegisterUncreatableType<QDeclarativeCameraExposure>(uri, 6, 0, "CameraExposure", tr("CameraExposure is provided by Camera")); - qmlRegisterUncreatableType<QDeclarativeCameraFocus>(uri, 5, 0, "CameraFocus", + qmlRegisterUncreatableType<QDeclarativeCameraFocus>(uri, 6, 0, "CameraFocus", tr("CameraFocus is provided by Camera")); - qmlRegisterUncreatableType<QDeclarativeCameraFlash>(uri, 5, 0, "CameraFlash", + qmlRegisterUncreatableType<QDeclarativeCameraFlash>(uri, 6, 0, "CameraFlash", tr("CameraFlash is provided by Camera")); - qmlRegisterUncreatableType<QDeclarativeTorch>(uri, 5, 0, "CameraTorch", + qmlRegisterUncreatableType<QDeclarativeTorch>(uri, 6, 0, "CameraTorch", tr("CameraTorch is provided by Camera")); - qmlRegisterUncreatableType<QDeclarativeCameraImageProcessing>(uri, 5, 0, "CameraImageProcessing", + qmlRegisterUncreatableType<QDeclarativeCameraImageProcessing>(uri, 6, 0, "CameraImageProcessing", tr("CameraImageProcessing is provided by Camera")); - // 5.2 types - qmlRegisterType<QDeclarativeVideoOutput, 2>(uri, 5, 2, "VideoOutput"); + qmlRegisterSingletonType<QDeclarativeMultimediaGlobal>(uri, 6, 0, "QtMultimedia", multimedia_global_object); - // 5.3 types - // Nothing changed, but adding "import QtMultimedia 5.3" in QML will fail unless at - // least one type is registered for that version. - qmlRegisterType<QSoundEffect>(uri, 5, 3, "SoundEffect"); - - // 5.4 types - qmlRegisterSingletonType<QDeclarativeMultimediaGlobal>(uri, 5, 4, "QtMultimedia", multimedia_global_object); - qmlRegisterType<QDeclarativeCamera, 1>(uri, 5, 4, "Camera"); - - // 5.5 types - qmlRegisterUncreatableType<QDeclarativeCameraImageProcessing, 1>(uri, 5, 5, "CameraImageProcessing", tr("CameraImageProcessing is provided by Camera")); - qmlRegisterType<QDeclarativeCamera, 2>(uri, 5, 5, "Camera"); - - // 5.6 types - qmlRegisterType<QMediaPlayer, 1>(uri, 5, 6, "Audio"); - qmlRegisterType<QMediaPlayer, 1>(uri, 5, 6, "MediaPlayer"); - qmlRegisterType<QDeclarativePlaylist>(uri, 5, 6, "Playlist"); - qmlRegisterType<QDeclarativePlaylistItem>(uri, 5, 6, "PlaylistItem"); - - // 5.7 types - qmlRegisterType<QDeclarativePlaylist, 1>(uri, 5, 7, "Playlist"); - qmlRegisterUncreatableType<QDeclarativeCameraImageProcessing, 2>(uri, 5, 7, "CameraImageProcessing", - tr("CameraImageProcessing is provided by Camera")); - - // 5.8 types (nothing new, re-register one of the types) - qmlRegisterType<QSoundEffect>(uri, 5, 8, "SoundEffect"); - - // 5.9 types - qmlRegisterType<QMediaPlayer, 2>(uri, 5, 9, "Audio"); - qmlRegisterType<QMediaPlayer, 2>(uri, 5, 9, "MediaPlayer"); - qmlRegisterUncreatableType<QDeclarativeCameraCapture, 1>(uri, 5, 9, "CameraCapture", - tr("CameraCapture is provided by Camera")); - qmlRegisterUncreatableType<QDeclarativeCameraFlash, 1>(uri, 5, 9, "CameraFlash", - tr("CameraFlash is provided by Camera")); - - // 5.11 types - qmlRegisterType<QMediaPlayer, 3>(uri, 5, 11, "Audio"); - qmlRegisterType<QMediaPlayer, 3>(uri, 5, 11, "MediaPlayer"); - qmlRegisterUncreatableType<QDeclarativeCameraFocus, 1>(uri, 5, 11, "CameraFocus", - tr("CameraFocus is provided by Camera")); - qmlRegisterUncreatableType<QDeclarativeCameraExposure, 1>(uri, 5, 11, "CameraExposure", - tr("CameraExposure is provided by Camera")); - qmlRegisterUncreatableType<QDeclarativeCameraImageProcessing, 3>(uri, 5, 11, "CameraImageProcessing", - tr("CameraImageProcessing is provided by Camera")); - - // 5.13 types - qmlRegisterType<QDeclarativeVideoOutput, 13>(uri, 5, 13, "VideoOutput"); - - // 5.15 types - qmlRegisterType<QMediaPlayer, 15>(uri, 5, 15, "MediaPlayer"); - qmlRegisterType<QDeclarativeVideoOutput, 15>(uri, 5, 15, "VideoOutput"); + qmlRegisterType<QDeclarativePlaylist>(uri, 6, 0, "Playlist"); + qmlRegisterType<QDeclarativePlaylistItem>(uri, 6, 0, "PlaylistItem"); // The minor version used to be the current Qt 5 minor. For compatibility it is the last // Qt 5 release. - qmlRegisterModule(uri, 5, 15); + qmlRegisterModule(uri, 6, 0); } void initializeEngine(QQmlEngine *engine, const char *uri) override |