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 | |
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>
103 files changed, 145 insertions, 195 deletions
diff --git a/examples/multimedia/declarative-camera/CameraButton.qml b/examples/multimedia/declarative-camera/CameraButton.qml index 27fb1eb2d..1547e015f 100644 --- a/examples/multimedia/declarative-camera/CameraButton.qml +++ b/examples/multimedia/declarative-camera/CameraButton.qml @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick Item { id: button diff --git a/examples/multimedia/declarative-camera/CameraListButton.qml b/examples/multimedia/declarative-camera/CameraListButton.qml index 75fb2fb62..2232140c5 100644 --- a/examples/multimedia/declarative-camera/CameraListButton.qml +++ b/examples/multimedia/declarative-camera/CameraListButton.qml @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick Item { id: cameraListButton diff --git a/examples/multimedia/declarative-camera/CameraListPopup.qml b/examples/multimedia/declarative-camera/CameraListPopup.qml index 4a9e39740..37b1b3f9d 100644 --- a/examples/multimedia/declarative-camera/CameraListPopup.qml +++ b/examples/multimedia/declarative-camera/CameraListPopup.qml @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick Popup { id: cameraListPopup diff --git a/examples/multimedia/declarative-camera/CameraPropertyButton.qml b/examples/multimedia/declarative-camera/CameraPropertyButton.qml index cfc0f51c9..cf77f95f0 100644 --- a/examples/multimedia/declarative-camera/CameraPropertyButton.qml +++ b/examples/multimedia/declarative-camera/CameraPropertyButton.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import QtMultimedia 5.0 +import QtQuick +import QtMultimedia Item { id: propertyButton diff --git a/examples/multimedia/declarative-camera/CameraPropertyPopup.qml b/examples/multimedia/declarative-camera/CameraPropertyPopup.qml index e245968f7..6fc125144 100644 --- a/examples/multimedia/declarative-camera/CameraPropertyPopup.qml +++ b/examples/multimedia/declarative-camera/CameraPropertyPopup.qml @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick Popup { id: propertyPopup diff --git a/examples/multimedia/declarative-camera/PhotoCaptureControls.qml b/examples/multimedia/declarative-camera/PhotoCaptureControls.qml index 379ca1f66..911ca8ccd 100644 --- a/examples/multimedia/declarative-camera/PhotoCaptureControls.qml +++ b/examples/multimedia/declarative-camera/PhotoCaptureControls.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import QtMultimedia 5.4 +import QtQuick +import QtMultimedia FocusScope { property Camera camera diff --git a/examples/multimedia/declarative-camera/PhotoPreview.qml b/examples/multimedia/declarative-camera/PhotoPreview.qml index e5f47844b..8aeb116dd 100644 --- a/examples/multimedia/declarative-camera/PhotoPreview.qml +++ b/examples/multimedia/declarative-camera/PhotoPreview.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import QtMultimedia 5.0 +import QtQuick +import QtMultimedia Item { property alias source : preview.source diff --git a/examples/multimedia/declarative-camera/Popup.qml b/examples/multimedia/declarative-camera/Popup.qml index bbf94f465..db304dccb 100644 --- a/examples/multimedia/declarative-camera/Popup.qml +++ b/examples/multimedia/declarative-camera/Popup.qml @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick Rectangle { id: popup diff --git a/examples/multimedia/declarative-camera/VideoCaptureControls.qml b/examples/multimedia/declarative-camera/VideoCaptureControls.qml index 74dc8bc6b..afcb4bc2c 100644 --- a/examples/multimedia/declarative-camera/VideoCaptureControls.qml +++ b/examples/multimedia/declarative-camera/VideoCaptureControls.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import QtMultimedia 5.4 +import QtQuick +import QtMultimedia FocusScope { property Camera camera diff --git a/examples/multimedia/declarative-camera/VideoPreview.qml b/examples/multimedia/declarative-camera/VideoPreview.qml index 218804426..3a33634e1 100644 --- a/examples/multimedia/declarative-camera/VideoPreview.qml +++ b/examples/multimedia/declarative-camera/VideoPreview.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import QtMultimedia 5.0 +import QtQuick +import QtMultimedia Item { id: videoPreview diff --git a/examples/multimedia/declarative-camera/ZoomControl.qml b/examples/multimedia/declarative-camera/ZoomControl.qml index 659205e93..9107ab4ae 100644 --- a/examples/multimedia/declarative-camera/ZoomControl.qml +++ b/examples/multimedia/declarative-camera/ZoomControl.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import QtMultimedia 5.0 +import QtQuick +import QtMultimedia Item { id : zoomControl diff --git a/examples/multimedia/declarative-camera/declarative-camera.qml b/examples/multimedia/declarative-camera/declarative-camera.qml index 29640b82b..48a683844 100644 --- a/examples/multimedia/declarative-camera/declarative-camera.qml +++ b/examples/multimedia/declarative-camera/declarative-camera.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import QtMultimedia 5.4 +import QtQuick +import QtMultimedia Rectangle { id : cameraUI diff --git a/examples/multimedia/video/android/gstreamer/main.qml b/examples/multimedia/video/android/gstreamer/main.qml index 99acb558c..8e41d6c1d 100644 --- a/examples/multimedia/video/android/gstreamer/main.qml +++ b/examples/multimedia/video/android/gstreamer/main.qml @@ -48,10 +48,10 @@ ** ****************************************************************************/ -import QtQuick 2.7 -import QtQuick.Controls 2.0 -import QtQuick.Layouts 1.3 -import QtMultimedia 5.12 +import QtQuick +import QtQuick.Controls +import QtQuick.Layouts +import QtMultimedia ApplicationWindow { visible: true diff --git a/examples/multimedia/video/qmlvideo/qml/qmlvideo/Button.qml b/examples/multimedia/video/qmlvideo/qml/qmlvideo/Button.qml index e2d296e98..b06db6119 100644 --- a/examples/multimedia/video/qmlvideo/qml/qmlvideo/Button.qml +++ b/examples/multimedia/video/qmlvideo/qml/qmlvideo/Button.qml @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick Item { id: root diff --git a/examples/multimedia/video/qmlvideo/qml/qmlvideo/CameraBasic.qml b/examples/multimedia/video/qmlvideo/qml/qmlvideo/CameraBasic.qml index c17f90162..c30344d2a 100644 --- a/examples/multimedia/video/qmlvideo/qml/qmlvideo/CameraBasic.qml +++ b/examples/multimedia/video/qmlvideo/qml/qmlvideo/CameraBasic.qml @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick SceneBasic { contentType: "camera" diff --git a/examples/multimedia/video/qmlvideo/qml/qmlvideo/CameraDrag.qml b/examples/multimedia/video/qmlvideo/qml/qmlvideo/CameraDrag.qml index 395261c1b..c8b7e3d16 100644 --- a/examples/multimedia/video/qmlvideo/qml/qmlvideo/CameraDrag.qml +++ b/examples/multimedia/video/qmlvideo/qml/qmlvideo/CameraDrag.qml @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick SceneDrag { contentType: "camera" diff --git a/examples/multimedia/video/qmlvideo/qml/qmlvideo/CameraDummy.qml b/examples/multimedia/video/qmlvideo/qml/qmlvideo/CameraDummy.qml index 6439bea16..6b3bac9b2 100644 --- a/examples/multimedia/video/qmlvideo/qml/qmlvideo/CameraDummy.qml +++ b/examples/multimedia/video/qmlvideo/qml/qmlvideo/CameraDummy.qml @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick // Item which is loaded by CameraItem if Qt Multimedia is not available Rectangle { diff --git a/examples/multimedia/video/qmlvideo/qml/qmlvideo/CameraFullScreen.qml b/examples/multimedia/video/qmlvideo/qml/qmlvideo/CameraFullScreen.qml index 125d18246..a1ce00176 100644 --- a/examples/multimedia/video/qmlvideo/qml/qmlvideo/CameraFullScreen.qml +++ b/examples/multimedia/video/qmlvideo/qml/qmlvideo/CameraFullScreen.qml @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick SceneFullScreen { contentType: "camera" diff --git a/examples/multimedia/video/qmlvideo/qml/qmlvideo/CameraFullScreenInverted.qml b/examples/multimedia/video/qmlvideo/qml/qmlvideo/CameraFullScreenInverted.qml index e7372b2c3..9b0cb80c8 100644 --- a/examples/multimedia/video/qmlvideo/qml/qmlvideo/CameraFullScreenInverted.qml +++ b/examples/multimedia/video/qmlvideo/qml/qmlvideo/CameraFullScreenInverted.qml @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick SceneFullScreenInverted { contentType: "camera" diff --git a/examples/multimedia/video/qmlvideo/qml/qmlvideo/CameraItem.qml b/examples/multimedia/video/qmlvideo/qml/qmlvideo/CameraItem.qml index 9fd3f9cfa..018453c22 100644 --- a/examples/multimedia/video/qmlvideo/qml/qmlvideo/CameraItem.qml +++ b/examples/multimedia/video/qmlvideo/qml/qmlvideo/CameraItem.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import QtMultimedia 5.0 +import QtQuick +import QtMultimedia VideoOutput { id: root diff --git a/examples/multimedia/video/qmlvideo/qml/qmlvideo/CameraMove.qml b/examples/multimedia/video/qmlvideo/qml/qmlvideo/CameraMove.qml index 39d18cf4f..0f9f55171 100644 --- a/examples/multimedia/video/qmlvideo/qml/qmlvideo/CameraMove.qml +++ b/examples/multimedia/video/qmlvideo/qml/qmlvideo/CameraMove.qml @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick SceneMove { contentType: "camera" diff --git a/examples/multimedia/video/qmlvideo/qml/qmlvideo/CameraOverlay.qml b/examples/multimedia/video/qmlvideo/qml/qmlvideo/CameraOverlay.qml index 5401a51f2..15dc85255 100644 --- a/examples/multimedia/video/qmlvideo/qml/qmlvideo/CameraOverlay.qml +++ b/examples/multimedia/video/qmlvideo/qml/qmlvideo/CameraOverlay.qml @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick SceneOverlay { contentType: "camera" diff --git a/examples/multimedia/video/qmlvideo/qml/qmlvideo/CameraResize.qml b/examples/multimedia/video/qmlvideo/qml/qmlvideo/CameraResize.qml index d9719659c..1fee96489 100644 --- a/examples/multimedia/video/qmlvideo/qml/qmlvideo/CameraResize.qml +++ b/examples/multimedia/video/qmlvideo/qml/qmlvideo/CameraResize.qml @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick SceneResize { contentType: "camera" diff --git a/examples/multimedia/video/qmlvideo/qml/qmlvideo/CameraRotate.qml b/examples/multimedia/video/qmlvideo/qml/qmlvideo/CameraRotate.qml index 5b02392b7..680f4d998 100644 --- a/examples/multimedia/video/qmlvideo/qml/qmlvideo/CameraRotate.qml +++ b/examples/multimedia/video/qmlvideo/qml/qmlvideo/CameraRotate.qml @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick SceneRotate { contentType: "camera" diff --git a/examples/multimedia/video/qmlvideo/qml/qmlvideo/CameraSpin.qml b/examples/multimedia/video/qmlvideo/qml/qmlvideo/CameraSpin.qml index a81652e7c..5ae981350 100644 --- a/examples/multimedia/video/qmlvideo/qml/qmlvideo/CameraSpin.qml +++ b/examples/multimedia/video/qmlvideo/qml/qmlvideo/CameraSpin.qml @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick SceneSpin { contentType: "camera" diff --git a/examples/multimedia/video/qmlvideo/qml/qmlvideo/Content.qml b/examples/multimedia/video/qmlvideo/qml/qmlvideo/Content.qml index ffa04e200..22ebca382 100644 --- a/examples/multimedia/video/qmlvideo/qml/qmlvideo/Content.qml +++ b/examples/multimedia/video/qmlvideo/qml/qmlvideo/Content.qml @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick Rectangle { id: root diff --git a/examples/multimedia/video/qmlvideo/qml/qmlvideo/ErrorDialog.qml b/examples/multimedia/video/qmlvideo/qml/qmlvideo/ErrorDialog.qml index 442eb42c1..cfe719f3a 100644 --- a/examples/multimedia/video/qmlvideo/qml/qmlvideo/ErrorDialog.qml +++ b/examples/multimedia/video/qmlvideo/qml/qmlvideo/ErrorDialog.qml @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick Rectangle { id: root diff --git a/examples/multimedia/video/qmlvideo/qml/qmlvideo/Scene.qml b/examples/multimedia/video/qmlvideo/qml/qmlvideo/Scene.qml index 4f98241a6..6a3efd4cb 100644 --- a/examples/multimedia/video/qmlvideo/qml/qmlvideo/Scene.qml +++ b/examples/multimedia/video/qmlvideo/qml/qmlvideo/Scene.qml @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick Rectangle { id: root diff --git a/examples/multimedia/video/qmlvideo/qml/qmlvideo/SceneBasic.qml b/examples/multimedia/video/qmlvideo/qml/qmlvideo/SceneBasic.qml index b5ea072ba..7e215cac6 100644 --- a/examples/multimedia/video/qmlvideo/qml/qmlvideo/SceneBasic.qml +++ b/examples/multimedia/video/qmlvideo/qml/qmlvideo/SceneBasic.qml @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick Scene { id: root diff --git a/examples/multimedia/video/qmlvideo/qml/qmlvideo/SceneDrag.qml b/examples/multimedia/video/qmlvideo/qml/qmlvideo/SceneDrag.qml index 0c7444e02..433afacd3 100644 --- a/examples/multimedia/video/qmlvideo/qml/qmlvideo/SceneDrag.qml +++ b/examples/multimedia/video/qmlvideo/qml/qmlvideo/SceneDrag.qml @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick Scene { id: root diff --git a/examples/multimedia/video/qmlvideo/qml/qmlvideo/SceneFullScreen.qml b/examples/multimedia/video/qmlvideo/qml/qmlvideo/SceneFullScreen.qml index 2ce10ce39..5fab6e013 100644 --- a/examples/multimedia/video/qmlvideo/qml/qmlvideo/SceneFullScreen.qml +++ b/examples/multimedia/video/qmlvideo/qml/qmlvideo/SceneFullScreen.qml @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick Scene { id: root diff --git a/examples/multimedia/video/qmlvideo/qml/qmlvideo/SceneFullScreenInverted.qml b/examples/multimedia/video/qmlvideo/qml/qmlvideo/SceneFullScreenInverted.qml index 7e7eb7039..7a70d8a0f 100644 --- a/examples/multimedia/video/qmlvideo/qml/qmlvideo/SceneFullScreenInverted.qml +++ b/examples/multimedia/video/qmlvideo/qml/qmlvideo/SceneFullScreenInverted.qml @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick Scene { id: root diff --git a/examples/multimedia/video/qmlvideo/qml/qmlvideo/SceneMove.qml b/examples/multimedia/video/qmlvideo/qml/qmlvideo/SceneMove.qml index adf414daa..45595bbdb 100644 --- a/examples/multimedia/video/qmlvideo/qml/qmlvideo/SceneMove.qml +++ b/examples/multimedia/video/qmlvideo/qml/qmlvideo/SceneMove.qml @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick Scene { id: root diff --git a/examples/multimedia/video/qmlvideo/qml/qmlvideo/SceneMulti.qml b/examples/multimedia/video/qmlvideo/qml/qmlvideo/SceneMulti.qml index 01d82ac33..f06c187e4 100644 --- a/examples/multimedia/video/qmlvideo/qml/qmlvideo/SceneMulti.qml +++ b/examples/multimedia/video/qmlvideo/qml/qmlvideo/SceneMulti.qml @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick Scene { id: root diff --git a/examples/multimedia/video/qmlvideo/qml/qmlvideo/SceneOverlay.qml b/examples/multimedia/video/qmlvideo/qml/qmlvideo/SceneOverlay.qml index b3f7350eb..d650cc0f7 100644 --- a/examples/multimedia/video/qmlvideo/qml/qmlvideo/SceneOverlay.qml +++ b/examples/multimedia/video/qmlvideo/qml/qmlvideo/SceneOverlay.qml @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick Scene { id: root diff --git a/examples/multimedia/video/qmlvideo/qml/qmlvideo/SceneResize.qml b/examples/multimedia/video/qmlvideo/qml/qmlvideo/SceneResize.qml index 778d81dd5..45331d15d 100644 --- a/examples/multimedia/video/qmlvideo/qml/qmlvideo/SceneResize.qml +++ b/examples/multimedia/video/qmlvideo/qml/qmlvideo/SceneResize.qml @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick Scene { id: root diff --git a/examples/multimedia/video/qmlvideo/qml/qmlvideo/SceneRotate.qml b/examples/multimedia/video/qmlvideo/qml/qmlvideo/SceneRotate.qml index f9549fdca..4e1363c03 100644 --- a/examples/multimedia/video/qmlvideo/qml/qmlvideo/SceneRotate.qml +++ b/examples/multimedia/video/qmlvideo/qml/qmlvideo/SceneRotate.qml @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick Scene { id: root diff --git a/examples/multimedia/video/qmlvideo/qml/qmlvideo/SceneSelectionPanel.qml b/examples/multimedia/video/qmlvideo/qml/qmlvideo/SceneSelectionPanel.qml index e36fe6045..f8583a983 100644 --- a/examples/multimedia/video/qmlvideo/qml/qmlvideo/SceneSelectionPanel.qml +++ b/examples/multimedia/video/qmlvideo/qml/qmlvideo/SceneSelectionPanel.qml @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick Rectangle { id: root diff --git a/examples/multimedia/video/qmlvideo/qml/qmlvideo/SceneSpin.qml b/examples/multimedia/video/qmlvideo/qml/qmlvideo/SceneSpin.qml index 925b92566..14c14df05 100644 --- a/examples/multimedia/video/qmlvideo/qml/qmlvideo/SceneSpin.qml +++ b/examples/multimedia/video/qmlvideo/qml/qmlvideo/SceneSpin.qml @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick Scene { id: root diff --git a/examples/multimedia/video/qmlvideo/qml/qmlvideo/SeekControl.qml b/examples/multimedia/video/qmlvideo/qml/qmlvideo/SeekControl.qml index fbba32903..255be8abe 100644 --- a/examples/multimedia/video/qmlvideo/qml/qmlvideo/SeekControl.qml +++ b/examples/multimedia/video/qmlvideo/qml/qmlvideo/SeekControl.qml @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick Item { id: seekControl diff --git a/examples/multimedia/video/qmlvideo/qml/qmlvideo/VideoBasic.qml b/examples/multimedia/video/qmlvideo/qml/qmlvideo/VideoBasic.qml index 09f890670..fa6f07532 100644 --- a/examples/multimedia/video/qmlvideo/qml/qmlvideo/VideoBasic.qml +++ b/examples/multimedia/video/qmlvideo/qml/qmlvideo/VideoBasic.qml @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick SceneBasic { contentType: "video" diff --git a/examples/multimedia/video/qmlvideo/qml/qmlvideo/VideoDrag.qml b/examples/multimedia/video/qmlvideo/qml/qmlvideo/VideoDrag.qml index b24bb4517..1295c15f2 100644 --- a/examples/multimedia/video/qmlvideo/qml/qmlvideo/VideoDrag.qml +++ b/examples/multimedia/video/qmlvideo/qml/qmlvideo/VideoDrag.qml @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick SceneDrag { contentType: "video" diff --git a/examples/multimedia/video/qmlvideo/qml/qmlvideo/VideoDummy.qml b/examples/multimedia/video/qmlvideo/qml/qmlvideo/VideoDummy.qml index 371173973..d36f179ee 100644 --- a/examples/multimedia/video/qmlvideo/qml/qmlvideo/VideoDummy.qml +++ b/examples/multimedia/video/qmlvideo/qml/qmlvideo/VideoDummy.qml @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick // Item which is loaded by VideoItem if Qt Multimedia is not available Rectangle { diff --git a/examples/multimedia/video/qmlvideo/qml/qmlvideo/VideoFillMode.qml b/examples/multimedia/video/qmlvideo/qml/qmlvideo/VideoFillMode.qml index 68157584e..7fbae4241 100644 --- a/examples/multimedia/video/qmlvideo/qml/qmlvideo/VideoFillMode.qml +++ b/examples/multimedia/video/qmlvideo/qml/qmlvideo/VideoFillMode.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import QtMultimedia 5.0 +import QtQuick +import QtMultimedia Scene { id: root diff --git a/examples/multimedia/video/qmlvideo/qml/qmlvideo/VideoFullScreen.qml b/examples/multimedia/video/qmlvideo/qml/qmlvideo/VideoFullScreen.qml index 480d6824d..12973fb15 100644 --- a/examples/multimedia/video/qmlvideo/qml/qmlvideo/VideoFullScreen.qml +++ b/examples/multimedia/video/qmlvideo/qml/qmlvideo/VideoFullScreen.qml @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick SceneFullScreen { contentType: "video" diff --git a/examples/multimedia/video/qmlvideo/qml/qmlvideo/VideoFullScreenInverted.qml b/examples/multimedia/video/qmlvideo/qml/qmlvideo/VideoFullScreenInverted.qml index c65c33872..213ae59d1 100644 --- a/examples/multimedia/video/qmlvideo/qml/qmlvideo/VideoFullScreenInverted.qml +++ b/examples/multimedia/video/qmlvideo/qml/qmlvideo/VideoFullScreenInverted.qml @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick SceneFullScreenInverted { contentType: "video" diff --git a/examples/multimedia/video/qmlvideo/qml/qmlvideo/VideoItem.qml b/examples/multimedia/video/qmlvideo/qml/qmlvideo/VideoItem.qml index 2b9324679..759882b66 100644 --- a/examples/multimedia/video/qmlvideo/qml/qmlvideo/VideoItem.qml +++ b/examples/multimedia/video/qmlvideo/qml/qmlvideo/VideoItem.qml @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick import QtMultimedia VideoOutput { diff --git a/examples/multimedia/video/qmlvideo/qml/qmlvideo/VideoMetadata.qml b/examples/multimedia/video/qmlvideo/qml/qmlvideo/VideoMetadata.qml index b9672f1c5..32323b910 100644 --- a/examples/multimedia/video/qmlvideo/qml/qmlvideo/VideoMetadata.qml +++ b/examples/multimedia/video/qmlvideo/qml/qmlvideo/VideoMetadata.qml @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick Scene { id: root diff --git a/examples/multimedia/video/qmlvideo/qml/qmlvideo/VideoMove.qml b/examples/multimedia/video/qmlvideo/qml/qmlvideo/VideoMove.qml index 56e3a96b9..8fab32a23 100644 --- a/examples/multimedia/video/qmlvideo/qml/qmlvideo/VideoMove.qml +++ b/examples/multimedia/video/qmlvideo/qml/qmlvideo/VideoMove.qml @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick SceneMove { contentType: "video" diff --git a/examples/multimedia/video/qmlvideo/qml/qmlvideo/VideoOverlay.qml b/examples/multimedia/video/qmlvideo/qml/qmlvideo/VideoOverlay.qml index 4313a33db..abbefa937 100644 --- a/examples/multimedia/video/qmlvideo/qml/qmlvideo/VideoOverlay.qml +++ b/examples/multimedia/video/qmlvideo/qml/qmlvideo/VideoOverlay.qml @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick SceneOverlay { contentType: "video" diff --git a/examples/multimedia/video/qmlvideo/qml/qmlvideo/VideoPlaybackRate.qml b/examples/multimedia/video/qmlvideo/qml/qmlvideo/VideoPlaybackRate.qml index 80a12d3db..0fdefc0f4 100644 --- a/examples/multimedia/video/qmlvideo/qml/qmlvideo/VideoPlaybackRate.qml +++ b/examples/multimedia/video/qmlvideo/qml/qmlvideo/VideoPlaybackRate.qml @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick Scene { id: root diff --git a/examples/multimedia/video/qmlvideo/qml/qmlvideo/VideoResize.qml b/examples/multimedia/video/qmlvideo/qml/qmlvideo/VideoResize.qml index f83465f48..85961ea36 100644 --- a/examples/multimedia/video/qmlvideo/qml/qmlvideo/VideoResize.qml +++ b/examples/multimedia/video/qmlvideo/qml/qmlvideo/VideoResize.qml @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick SceneResize { contentType: "video" diff --git a/examples/multimedia/video/qmlvideo/qml/qmlvideo/VideoRotate.qml b/examples/multimedia/video/qmlvideo/qml/qmlvideo/VideoRotate.qml index 0eb198d20..1406ccdea 100644 --- a/examples/multimedia/video/qmlvideo/qml/qmlvideo/VideoRotate.qml +++ b/examples/multimedia/video/qmlvideo/qml/qmlvideo/VideoRotate.qml @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick SceneRotate { contentType: "video" diff --git a/examples/multimedia/video/qmlvideo/qml/qmlvideo/VideoSeek.qml b/examples/multimedia/video/qmlvideo/qml/qmlvideo/VideoSeek.qml index 8e3575920..f17fa0a5c 100644 --- a/examples/multimedia/video/qmlvideo/qml/qmlvideo/VideoSeek.qml +++ b/examples/multimedia/video/qmlvideo/qml/qmlvideo/VideoSeek.qml @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick Scene { id: root diff --git a/examples/multimedia/video/qmlvideo/qml/qmlvideo/VideoSpin.qml b/examples/multimedia/video/qmlvideo/qml/qmlvideo/VideoSpin.qml index cb46797f6..7c8b2e84f 100644 --- a/examples/multimedia/video/qmlvideo/qml/qmlvideo/VideoSpin.qml +++ b/examples/multimedia/video/qmlvideo/qml/qmlvideo/VideoSpin.qml @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick SceneSpin { contentType: "video" diff --git a/examples/multimedia/video/qmlvideo/qml/qmlvideo/main.qml b/examples/multimedia/video/qmlvideo/qml/qmlvideo/main.qml index 43f827e97..eada51ba4 100644 --- a/examples/multimedia/video/qmlvideo/qml/qmlvideo/main.qml +++ b/examples/multimedia/video/qmlvideo/qml/qmlvideo/main.qml @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick Rectangle { id: root diff --git a/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/Button.qml b/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/Button.qml index 326c64ace..bb5d28843 100644 --- a/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/Button.qml +++ b/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/Button.qml @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick Rectangle { id: root diff --git a/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/Content.qml b/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/Content.qml index 8e109b9be..6bd841b38 100644 --- a/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/Content.qml +++ b/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/Content.qml @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.1 +import QtQuick Rectangle { id: root diff --git a/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/ContentCamera.qml b/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/ContentCamera.qml index c448a5fe4..00bc038a3 100644 --- a/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/ContentCamera.qml +++ b/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/ContentCamera.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.1 -import QtMultimedia 5.0 +import QtQuick +import QtMultimedia VideoOutput { source: camera diff --git a/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/ContentImage.qml b/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/ContentImage.qml index d243c8b3e..a0d1083a6 100644 --- a/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/ContentImage.qml +++ b/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/ContentImage.qml @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.1 +import QtQuick Image { fillMode: Image.PreserveAspectFit diff --git a/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/ContentVideo.qml b/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/ContentVideo.qml index ade7012b1..ae57cee75 100644 --- a/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/ContentVideo.qml +++ b/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/ContentVideo.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.1 -import QtMultimedia 5.0 +import QtQuick +import QtMultimedia VideoOutput { source: mediaPlayer diff --git a/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/Curtain.qml b/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/Curtain.qml index 691db5c6d..57b611bff 100644 --- a/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/Curtain.qml +++ b/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/Curtain.qml @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick Rectangle { id: root diff --git a/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/Divider.qml b/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/Divider.qml index e098d4861..d468b7a85 100644 --- a/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/Divider.qml +++ b/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/Divider.qml @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.1 +import QtQuick Rectangle { id: root diff --git a/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/Effect.qml b/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/Effect.qml index 66a6b919f..32cda5c7d 100644 --- a/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/Effect.qml +++ b/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/Effect.qml @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick ShaderEffect { property variant source diff --git a/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectBillboard.qml b/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectBillboard.qml index 4087c8520..514387548 100644 --- a/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectBillboard.qml +++ b/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectBillboard.qml @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick Effect { parameters: ListModel { diff --git a/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectBlackAndWhite.qml b/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectBlackAndWhite.qml index 90e27184d..140d7eb80 100644 --- a/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectBlackAndWhite.qml +++ b/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectBlackAndWhite.qml @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick Effect { parameters: ListModel { diff --git a/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectEmboss.qml b/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectEmboss.qml index a4e981917..57f3c1a99 100644 --- a/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectEmboss.qml +++ b/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectEmboss.qml @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick Effect { fragmentShaderFilename: "emboss.fsh" diff --git a/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectGaussianBlur.qml b/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectGaussianBlur.qml index 6a0c711f5..2a94a7f50 100644 --- a/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectGaussianBlur.qml +++ b/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectGaussianBlur.qml @@ -50,7 +50,7 @@ // Based on http://www.geeks3d.com/20100909/shader-library-gaussian-blur-post-processing-filter-in-glsl/ -import QtQuick 2.0 +import QtQuick Item { id: root diff --git a/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectGlow.qml b/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectGlow.qml index 3f9e3e771..eeca22c97 100644 --- a/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectGlow.qml +++ b/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectGlow.qml @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick Effect { fragmentShaderFilename: "glow.fsh" diff --git a/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectIsolate.qml b/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectIsolate.qml index f04e29deb..26ffeb42b 100644 --- a/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectIsolate.qml +++ b/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectIsolate.qml @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick Effect { parameters: ListModel { diff --git a/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectMagnify.qml b/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectMagnify.qml index ae21d93e4..e5c86f2c5 100644 --- a/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectMagnify.qml +++ b/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectMagnify.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.1 -import QtQuick.Window 2.1 +import QtQuick +import QtQuick.Window Effect { id: root diff --git a/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectPageCurl.qml b/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectPageCurl.qml index 4a208a95f..6788bafbb 100644 --- a/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectPageCurl.qml +++ b/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectPageCurl.qml @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick Effect { divider: false diff --git a/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectPassThrough.qml b/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectPassThrough.qml index 20395a967..5d2ac2fbc 100644 --- a/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectPassThrough.qml +++ b/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectPassThrough.qml @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick Effect { divider: false diff --git a/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectPixelate.qml b/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectPixelate.qml index 79c1f21e2..760751801 100644 --- a/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectPixelate.qml +++ b/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectPixelate.qml @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick Effect { parameters: ListModel { diff --git a/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectPosterize.qml b/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectPosterize.qml index 90c531d2c..a0f2d6577 100644 --- a/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectPosterize.qml +++ b/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectPosterize.qml @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick Effect { parameters: ListModel { diff --git a/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectRipple.qml b/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectRipple.qml index 0fe25b61d..b1c69fcad 100644 --- a/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectRipple.qml +++ b/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectRipple.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.1 -import QtQuick.Window 2.1 +import QtQuick +import QtQuick.Window Effect { parameters: ListModel { diff --git a/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectSelectionList.qml b/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectSelectionList.qml index 593b764a8..f14244dab 100644 --- a/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectSelectionList.qml +++ b/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectSelectionList.qml @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick ListModel { id: sources diff --git a/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectSepia.qml b/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectSepia.qml index ffacb1d01..4f301476c 100644 --- a/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectSepia.qml +++ b/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectSepia.qml @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick Effect { fragmentShaderFilename: "sepia.fsh" diff --git a/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectSharpen.qml b/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectSharpen.qml index bfcfa8b80..ce56c519a 100644 --- a/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectSharpen.qml +++ b/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectSharpen.qml @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick Effect { parameters: ListModel { diff --git a/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectShockwave.qml b/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectShockwave.qml index 875c23b79..a02c2770a 100644 --- a/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectShockwave.qml +++ b/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectShockwave.qml @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick Effect { id: root diff --git a/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectSobelEdgeDetection1.qml b/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectSobelEdgeDetection1.qml index babd09afa..de49be1a1 100644 --- a/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectSobelEdgeDetection1.qml +++ b/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectSobelEdgeDetection1.qml @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick Effect { parameters: ListModel { diff --git a/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectTiltShift.qml b/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectTiltShift.qml index cdc7713f0..f574dffab 100644 --- a/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectTiltShift.qml +++ b/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectTiltShift.qml @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick Effect { fragmentShaderFilename: "tiltshift.fsh" diff --git a/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectToon.qml b/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectToon.qml index 244d465a5..1395a150a 100644 --- a/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectToon.qml +++ b/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectToon.qml @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick Effect { parameters: ListModel { diff --git a/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectVignette.qml b/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectVignette.qml index 2b16c2a01..b011fc643 100644 --- a/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectVignette.qml +++ b/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectVignette.qml @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick Effect { fragmentShaderFilename: "vignette.fsh" diff --git a/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectWarhol.qml b/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectWarhol.qml index 2b88b8409..0dcde6b1b 100644 --- a/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectWarhol.qml +++ b/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectWarhol.qml @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick Effect { fragmentShaderFilename: "warhol.fsh" diff --git a/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectWobble.qml b/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectWobble.qml index f4640be1e..8a7381225 100644 --- a/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectWobble.qml +++ b/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectWobble.qml @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick Effect { parameters: ListModel { diff --git a/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/FileBrowser.qml b/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/FileBrowser.qml index 003f8736b..19e14997f 100644 --- a/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/FileBrowser.qml +++ b/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/FileBrowser.qml @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.1 +import QtQuick import Qt.labs.folderlistmodel 2.1 Rectangle { diff --git a/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/FileOpen.qml b/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/FileOpen.qml index 62b60765e..f4b660f06 100644 --- a/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/FileOpen.qml +++ b/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/FileOpen.qml @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.1 +import QtQuick Rectangle { id: root diff --git a/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/HintedMouseArea.qml b/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/HintedMouseArea.qml index 86750ff90..8b837dabe 100644 --- a/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/HintedMouseArea.qml +++ b/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/HintedMouseArea.qml @@ -50,7 +50,7 @@ // Mouse area which flashes to indicate its location on the screen -import QtQuick 2.0 +import QtQuick MouseArea { property alias hintColor: hintRect.color diff --git a/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/Main.qml b/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/Main.qml index e6da715f4..c94e7a38f 100644 --- a/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/Main.qml +++ b/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/Main.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.1 -import QtQuick.Window 2.1 +import QtQuick +import QtQuick.Window Rectangle { id: root diff --git a/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/ParameterPanel.qml b/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/ParameterPanel.qml index 7d6b2af97..1e16d8d3e 100644 --- a/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/ParameterPanel.qml +++ b/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/ParameterPanel.qml @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick Rectangle { id: root diff --git a/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/Slider.qml b/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/Slider.qml index e359c639d..d89e3459d 100644 --- a/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/Slider.qml +++ b/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/Slider.qml @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.1 +import QtQuick Rectangle { id: root diff --git a/examples/multimedia/video/snippets/frequencymonitor/qml/frequencymonitor/FrequencyItem.qml b/examples/multimedia/video/snippets/frequencymonitor/qml/frequencymonitor/FrequencyItem.qml index 13867eb3c..ec1bab299 100644 --- a/examples/multimedia/video/snippets/frequencymonitor/qml/frequencymonitor/FrequencyItem.qml +++ b/examples/multimedia/video/snippets/frequencymonitor/qml/frequencymonitor/FrequencyItem.qml @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick import FrequencyMonitor 1.0 Rectangle { diff --git a/examples/multimedia/video/snippets/performancemonitor/qml/performancemonitor/PerformanceItem.qml b/examples/multimedia/video/snippets/performancemonitor/qml/performancemonitor/PerformanceItem.qml index 6f5d3d7d3..288fb2f08 100644 --- a/examples/multimedia/video/snippets/performancemonitor/qml/performancemonitor/PerformanceItem.qml +++ b/examples/multimedia/video/snippets/performancemonitor/qml/performancemonitor/PerformanceItem.qml @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick Rectangle { id: root 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 diff --git a/src/multimedia/doc/snippets/multimedia-snippets/multiple-videooutputs.qml b/src/multimedia/doc/snippets/multimedia-snippets/multiple-videooutputs.qml index e3c1587f6..4796b8629 100644 --- a/src/multimedia/doc/snippets/multimedia-snippets/multiple-videooutputs.qml +++ b/src/multimedia/doc/snippets/multimedia-snippets/multiple-videooutputs.qml @@ -37,9 +37,9 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import QtQuick.Window 2.2 -import QtMultimedia 5.15 +import QtQuick +import QtQuick.Window +import QtMultimedia //! [complete] Item { diff --git a/src/multimedia/doc/snippets/multimedia-snippets/qtvideosink.qml b/src/multimedia/doc/snippets/multimedia-snippets/qtvideosink.qml index a4ae07f30..190954e44 100644 --- a/src/multimedia/doc/snippets/multimedia-snippets/qtvideosink.qml +++ b/src/multimedia/doc/snippets/multimedia-snippets/qtvideosink.qml @@ -37,8 +37,8 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import QtMultimedia 5.12 +import QtQuick +import QtMultimedia //! [complete] Item { diff --git a/src/multimedia/doc/snippets/multimedia-snippets/soundeffect.qml b/src/multimedia/doc/snippets/multimedia-snippets/soundeffect.qml index c414aca56..501443d25 100644 --- a/src/multimedia/doc/snippets/multimedia-snippets/soundeffect.qml +++ b/src/multimedia/doc/snippets/multimedia-snippets/soundeffect.qml @@ -37,8 +37,8 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import QtMultimedia 5.5 +import QtQuick +import QtMultimedia //! [complete snippet] Text { diff --git a/tests/auto/integration/qdeclarativevideooutput/main.qml b/tests/auto/integration/qdeclarativevideooutput/main.qml index e456adf6c..6893a6e9f 100644 --- a/tests/auto/integration/qdeclarativevideooutput/main.qml +++ b/tests/auto/integration/qdeclarativevideooutput/main.qml @@ -1,5 +1,5 @@ -import QtQuick 2.0 -import QtMultimedia 5.0 +import QtQuick +import QtMultimedia VideoOutput { width: 150 diff --git a/tests/auto/integration/qdeclarativevideooutput_window/main.qml b/tests/auto/integration/qdeclarativevideooutput_window/main.qml index 8866be147..40cecc762 100644 --- a/tests/auto/integration/qdeclarativevideooutput_window/main.qml +++ b/tests/auto/integration/qdeclarativevideooutput_window/main.qml @@ -1,5 +1,5 @@ -import QtQuick 2.0 -import QtMultimedia 5.0 +import QtQuick +import QtMultimedia Item { width: 200 diff --git a/tests/auto/integration/qml/soundeffect/tst_soundeffect.qml b/tests/auto/integration/qml/soundeffect/tst_soundeffect.qml index 9100cd806..7ebbe2e73 100644 --- a/tests/auto/integration/qml/soundeffect/tst_soundeffect.qml +++ b/tests/auto/integration/qml/soundeffect/tst_soundeffect.qml @@ -26,8 +26,8 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import QtMultimedia 5.0 +import QtQuick +import QtMultimedia import QtTest 1.0 /* diff --git a/tests/auto/unit/qml/qdeclarativemultimediaglobal/tst_qdeclarativemultimediaglobal.qml b/tests/auto/unit/qml/qdeclarativemultimediaglobal/tst_qdeclarativemultimediaglobal.qml index e44c68a29..71d97f8b0 100644 --- a/tests/auto/unit/qml/qdeclarativemultimediaglobal/tst_qdeclarativemultimediaglobal.qml +++ b/tests/auto/unit/qml/qdeclarativemultimediaglobal/tst_qdeclarativemultimediaglobal.qml @@ -26,9 +26,9 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick import QtTest 1.0 -import QtMultimedia 5.4 +import QtMultimedia TestCase { |