From 5fe5a5b621cdaaec381b2ce6d96246e89bee6e3d Mon Sep 17 00:00:00 2001 From: Chris Cochrun Date: Fri, 3 Mar 2023 16:47:49 -0600 Subject: [PATCH] switching all layouts to newer layouts --- src/qml/presenter/Actions.qml | 2 +- src/qml/presenter/DragHandle.qml | 2 +- src/qml/presenter/Header.qml | 2 +- src/qml/presenter/ImageEditor.qml | 2 +- src/qml/presenter/LeftDock.qml | 2 +- src/qml/presenter/Library.qml | 2 +- src/qml/presenter/MainWindow.qml | 2 +- src/qml/presenter/PanelItem.qml | 2 +- src/qml/presenter/Presentation.qml | 2 +- src/qml/presenter/PresentationEditor.qml | 2 +- src/qml/presenter/PresentationWindow.qml | 2 +- src/qml/presenter/PreviewSlide.qml | 2 +- src/qml/presenter/PreviewSlideListDelegate.qml | 2 +- src/qml/presenter/ServiceList.qml | 2 +- src/qml/presenter/Settings.qml | 2 +- src/qml/presenter/Slide.qml | 2 +- src/qml/presenter/SlideEditor.qml | 2 +- src/qml/presenter/SongEditor.qml | 2 +- src/qml/presenter/VideoEditor.qml | 2 +- 19 files changed, 19 insertions(+), 19 deletions(-) diff --git a/src/qml/presenter/Actions.qml b/src/qml/presenter/Actions.qml index 2f99693..c0c473d 100644 --- a/src/qml/presenter/Actions.qml +++ b/src/qml/presenter/Actions.qml @@ -2,7 +2,7 @@ import QtQuick 2.13 import QtQuick.Dialogs 1.0 import QtQuick.Controls 2.15 as Controls import QtQuick.Window 2.13 -import QtQuick.Layouts 1.2 +import QtQuick.Layouts 1.15 import QtMultimedia 5.15 /* import QtAudioEngine 1.15 */ import org.kde.kirigami 2.13 as Kirigami diff --git a/src/qml/presenter/DragHandle.qml b/src/qml/presenter/DragHandle.qml index 4740d8f..710f8bb 100644 --- a/src/qml/presenter/DragHandle.qml +++ b/src/qml/presenter/DragHandle.qml @@ -1,5 +1,5 @@ import QtQuick 2.13 -import QtQuick.Layouts 1.2 +import QtQuick.Layouts 1.15 import org.kde.kirigami 2.13 as Kirigami Item { diff --git a/src/qml/presenter/Header.qml b/src/qml/presenter/Header.qml index 7171f04..6e98671 100644 --- a/src/qml/presenter/Header.qml +++ b/src/qml/presenter/Header.qml @@ -2,7 +2,7 @@ import QtQuick 2.13 import QtQuick.Dialogs 1.0 import QtQuick.Controls 2.15 as Controls import QtQuick.Window 2.13 -import QtQuick.Layouts 1.2 +import QtQuick.Layouts 1.15 import org.kde.kirigami 2.13 as Kirigami Kirigami.ActionToolBar { diff --git a/src/qml/presenter/ImageEditor.qml b/src/qml/presenter/ImageEditor.qml index ab4561c..6a7eaf5 100644 --- a/src/qml/presenter/ImageEditor.qml +++ b/src/qml/presenter/ImageEditor.qml @@ -1,7 +1,7 @@ import QtQuick 2.13 import QtQuick.Controls 2.15 as Controls import QtQuick.Dialogs 1.3 -import QtQuick.Layouts 1.2 +import QtQuick.Layouts 1.15 import org.kde.kirigami 2.13 as Kirigami import "./" as Presenter diff --git a/src/qml/presenter/LeftDock.qml b/src/qml/presenter/LeftDock.qml index fb4babf..cca39b2 100644 --- a/src/qml/presenter/LeftDock.qml +++ b/src/qml/presenter/LeftDock.qml @@ -2,7 +2,7 @@ import QtQuick 2.13 /* import QtQuick.Dialogs 1.0 */ import QtQuick.Controls 2.0 as Controls /* import QtQuick.Window 2.13 */ -import QtQuick.Layouts 1.2 +import QtQuick.Layouts 1.15 /* import QtQuick.Shapes 1.15 */ import QtQml.Models 2.12 /* import QtMultimedia 5.15 */ diff --git a/src/qml/presenter/Library.qml b/src/qml/presenter/Library.qml index 1ed91b6..f65bd44 100644 --- a/src/qml/presenter/Library.qml +++ b/src/qml/presenter/Library.qml @@ -1,6 +1,6 @@ import QtQuick 2.13 import QtQuick.Controls 2.15 as Controls -import QtQuick.Layouts 1.2 +import QtQuick.Layouts 1.15 import Qt.labs.platform 1.1 as Labs import QtQuick.Pdf 5.15 import QtQml.Models 2.15 diff --git a/src/qml/presenter/MainWindow.qml b/src/qml/presenter/MainWindow.qml index 9352374..a2b0c19 100644 --- a/src/qml/presenter/MainWindow.qml +++ b/src/qml/presenter/MainWindow.qml @@ -2,7 +2,7 @@ import QtQuick 2.15 import QtQuick.Dialogs 1.0 import QtQuick.Controls 2.15 as Controls import QtQuick.Window 2.13 -import QtQuick.Layouts 1.2 +import QtQuick.Layouts 1.15 import org.kde.kirigami 2.13 as Kirigami import "./" as Presenter import org.presenter 1.0 diff --git a/src/qml/presenter/PanelItem.qml b/src/qml/presenter/PanelItem.qml index 29cc7ae..a134864 100644 --- a/src/qml/presenter/PanelItem.qml +++ b/src/qml/presenter/PanelItem.qml @@ -1,6 +1,6 @@ import QtQuick 2.7 import QtQuick.Controls 2.0 as Controls -import QtQuick.Layouts 1.2 +import QtQuick.Layouts 1.15 import org.kde.kirigami 2.13 as Kirigami Item { diff --git a/src/qml/presenter/Presentation.qml b/src/qml/presenter/Presentation.qml index 2197cb2..98e1c60 100644 --- a/src/qml/presenter/Presentation.qml +++ b/src/qml/presenter/Presentation.qml @@ -2,7 +2,7 @@ import QtQuick 2.15 import QtQuick.Dialogs 1.0 import QtQuick.Controls 2.15 as Controls import QtQuick.Window 2.13 -import QtQuick.Layouts 1.2 +import QtQuick.Layouts 1.15 /* import QtAudioEngine 1.15 */ import org.kde.kirigami 2.13 as Kirigami import "./" as Presenter diff --git a/src/qml/presenter/PresentationEditor.qml b/src/qml/presenter/PresentationEditor.qml index 43e1067..2d9d94b 100644 --- a/src/qml/presenter/PresentationEditor.qml +++ b/src/qml/presenter/PresentationEditor.qml @@ -1,7 +1,7 @@ import QtQuick 2.15 import QtQuick.Controls 2.15 as Controls import QtQuick.Dialogs 1.3 -import QtQuick.Layouts 1.2 +import QtQuick.Layouts 1.15 import org.kde.kirigami 2.13 as Kirigami import "./" as Presenter diff --git a/src/qml/presenter/PresentationWindow.qml b/src/qml/presenter/PresentationWindow.qml index ce05ce9..05f14e6 100644 --- a/src/qml/presenter/PresentationWindow.qml +++ b/src/qml/presenter/PresentationWindow.qml @@ -2,7 +2,7 @@ import QtQuick 2.15 import QtQuick.Dialogs 1.0 import QtQuick.Controls 2.15 as Controls import QtQuick.Window 2.13 -import QtQuick.Layouts 1.2 +import QtQuick.Layouts 1.15 import org.kde.kirigami 2.13 as Kirigami import "./" as Presenter import org.presenter 1.0 diff --git a/src/qml/presenter/PreviewSlide.qml b/src/qml/presenter/PreviewSlide.qml index 9cba6a8..9b1beda 100644 --- a/src/qml/presenter/PreviewSlide.qml +++ b/src/qml/presenter/PreviewSlide.qml @@ -1,6 +1,6 @@ import QtQuick 2.15 import QtQuick.Controls 2.15 as Controls -import QtQuick.Layouts 1.2 +import QtQuick.Layouts 1.15 import QtMultimedia 5.15 /* import QtAudioEngine 1.15 */ import QtGraphicalEffects 1.15 diff --git a/src/qml/presenter/PreviewSlideListDelegate.qml b/src/qml/presenter/PreviewSlideListDelegate.qml index ca40ce6..53acf59 100644 --- a/src/qml/presenter/PreviewSlideListDelegate.qml +++ b/src/qml/presenter/PreviewSlideListDelegate.qml @@ -1,6 +1,6 @@ import QtQuick 2.15 import QtQuick.Controls 2.15 as Controls -import QtQuick.Layouts 1.2 +import QtQuick.Layouts 1.15 import org.kde.kirigami 2.13 as Kirigami import "./" as Presenter import org.presenter 1.0 diff --git a/src/qml/presenter/ServiceList.qml b/src/qml/presenter/ServiceList.qml index d0baf59..4ab52d4 100644 --- a/src/qml/presenter/ServiceList.qml +++ b/src/qml/presenter/ServiceList.qml @@ -2,7 +2,7 @@ import QtQuick 2.13 /* import QtQuick.Dialogs 1.0 */ import QtQuick.Controls 2.0 as Controls /* import QtQuick.Window 2.13 */ -import QtQuick.Layouts 1.2 +import QtQuick.Layouts 1.15 import QtQuick.Shapes 1.15 /* import QtQml.Models 2.12 */ /* import QtMultimedia 5.15 */ diff --git a/src/qml/presenter/Settings.qml b/src/qml/presenter/Settings.qml index 790bcb2..7d98ee3 100644 --- a/src/qml/presenter/Settings.qml +++ b/src/qml/presenter/Settings.qml @@ -1,7 +1,7 @@ import QtQuick 2.13 import QtQuick.Dialogs 1.0 import QtQuick.Controls 2.15 as Controls -import QtQuick.Layouts 1.2 +import QtQuick.Layouts 1.15 import org.kde.kirigami 2.13 as Kirigami import "./" as Presenter import org.presenter 1.0 diff --git a/src/qml/presenter/Slide.qml b/src/qml/presenter/Slide.qml index abe8665..d28f3be 100644 --- a/src/qml/presenter/Slide.qml +++ b/src/qml/presenter/Slide.qml @@ -1,6 +1,6 @@ import QtQuick 2.15 import QtQuick.Controls 2.15 as Controls -import QtQuick.Layouts 1.2 +import QtQuick.Layouts 1.15 import QtMultimedia 5.15 /* import QtAudioEngine 1.15 */ import QtGraphicalEffects 1.15 diff --git a/src/qml/presenter/SlideEditor.qml b/src/qml/presenter/SlideEditor.qml index 9872a87..e198152 100644 --- a/src/qml/presenter/SlideEditor.qml +++ b/src/qml/presenter/SlideEditor.qml @@ -2,7 +2,7 @@ import QtQuick 2.15 import QtQuick.Dialogs 1.0 import QtQuick.Controls 2.15 as Controls import QtQuick.Window 2.13 -import QtQuick.Layouts 1.2 +import QtQuick.Layouts 1.15 import QtMultimedia 5.15 /* import QtAudioEngine 1.15 */ import org.kde.kirigami 2.13 as Kirigami diff --git a/src/qml/presenter/SongEditor.qml b/src/qml/presenter/SongEditor.qml index c7855e3..fb822b9 100644 --- a/src/qml/presenter/SongEditor.qml +++ b/src/qml/presenter/SongEditor.qml @@ -2,7 +2,7 @@ import QtQuick 2.13 import QtQuick.Controls 2.15 as Controls import Qt.labs.platform 1.1 as Labs import QtQuick.Dialogs 1.3 -import QtQuick.Layouts 1.2 +import QtQuick.Layouts 1.15 import org.kde.kirigami 2.13 as Kirigami import "./" as Presenter diff --git a/src/qml/presenter/VideoEditor.qml b/src/qml/presenter/VideoEditor.qml index b89a9b1..d4567eb 100644 --- a/src/qml/presenter/VideoEditor.qml +++ b/src/qml/presenter/VideoEditor.qml @@ -1,7 +1,7 @@ import QtQuick 2.13 import QtQuick.Controls 2.15 as Controls import QtQuick.Dialogs 1.3 -import QtQuick.Layouts 1.2 +import QtQuick.Layouts 1.15 import org.kde.kirigami 2.13 as Kirigami import "./" as Presenter import mpv 1.0