From 6f213dc83d4ee35c7ba978c63a9c0a0a28b4fcb2 Mon Sep 17 00:00:00 2001 From: janbar Date: Mon, 4 May 2020 17:15:39 +0200 Subject: [PATCH] Revert "downgrade requirements to qt-5.8" This reverts commit bff37c88a8c40f6af447ca79267f497482b849ff. --- gui/components/ActivitySpinner.qml | 4 ++-- gui/components/AlarmsEmptyState.qml | 4 ++-- gui/components/BlurredBackground.qml | 2 +- gui/components/ClockTumbler.qml | 4 ++-- gui/components/CoverGrid.qml | 2 +- gui/components/DataFailureState.qml | 4 ++-- gui/components/Delegates/Card.qml | 4 ++-- .../Delegates/DragMusicListItem.qml | 6 ++--- gui/components/Delegates/MusicListItem.qml | 6 ++--- .../Delegates/SelectMusicListItem.qml | 6 ++--- gui/components/Delegates/SimpleListItem.qml | 6 ++--- gui/components/Dialog/DialogAbout.qml | 4 ++-- gui/components/Dialog/DialogAlarm.qml | 4 ++-- .../Dialog/DialogApplicationSettings.qml | 4 ++-- gui/components/Dialog/DialogBase.qml | 4 ++-- gui/components/Dialog/DialogManageQueue.qml | 4 ++-- gui/components/Dialog/DialogNewPlaylist.qml | 4 ++-- .../Dialog/DialogRemovePlaylist.qml | 6 ++--- gui/components/Dialog/DialogSearchMusic.qml | 6 ++--- gui/components/Dialog/DialogSelectSource.qml | 4 ++-- gui/components/Dialog/DialogServiceLabel.qml | 4 ++-- gui/components/Dialog/DialogSettings.qml | 6 ++--- gui/components/Dialog/DialogSleepTimer.qml | 4 ++-- gui/components/Dialog/DialogSongInfo.qml | 5 +++-- gui/components/Dialog/DialogSoundSettings.qml | 4 ++-- .../Flickables/MultiSelectListView.qml | 4 ++-- gui/components/Flickables/MusicGridView.qml | 4 ++-- gui/components/Flickables/MusicListView.qml | 4 ++-- gui/components/Icon.qml | 4 ++-- gui/components/IndexEmptyState.qml | 4 ++-- gui/components/IndexUpdateState.qml | 4 ++-- .../ListItemActions/AddToFavorites.qml | 4 ++-- .../ListItemActions/AddToPlaylist.qml | 4 ++-- gui/components/ListItemActions/AddToQueue.qml | 4 ++-- gui/components/ListItemActions/Remove.qml | 4 ++-- gui/components/MusicCheckBox.qml | 4 ++-- gui/components/MusicFilter.qml | 4 ++-- gui/components/MusicHeader.qml | 4 ++-- gui/components/MusicPage.qml | 4 ++-- gui/components/MusicRow.qml | 4 ++-- gui/components/MusicToolbar.qml | 4 ++-- gui/components/NowPlayingFullView.qml | 4 ++-- gui/components/NowPlayingSidebar.qml | 4 ++-- gui/components/NowPlayingToolbar.qml | 4 ++-- gui/components/Player.qml | 2 +- gui/components/PlaylistsEmptyState.qml | 4 ++-- gui/components/PopInfo.qml | 4 ++-- gui/components/Queue.qml | 6 ++--- gui/components/RenderingBubble.qml | 4 ++-- gui/components/RenderingControlerView.qml | 4 ++-- gui/components/ServiceEmptyState.qml | 4 ++-- gui/components/ServiceLogin.qml | 4 ++-- gui/components/ServiceRegistration.qml | 4 ++-- gui/components/SimpleRow.qml | 4 ++-- gui/components/StyleLight.qml | 4 ++-- gui/components/StyledSlider.qml | 4 ++-- gui/components/TrackQueue.qml | 2 +- gui/components/Units.qml | 2 +- gui/components/ViewButton/PlayAllButton.qml | 4 ++-- gui/components/ViewButton/QueueAllButton.qml | 4 ++-- gui/components/ViewButton/ShuffleButton.qml | 4 ++-- gui/components/ZoneControls.qml | 4 ++-- gui/noson.qml | 22 +++++-------------- gui/ui/AddService.qml | 4 ++-- gui/ui/AddToPlaylist.qml | 4 ++-- gui/ui/Alarms.qml | 6 ++--- gui/ui/Albums.qml | 4 ++-- gui/ui/ArtistView.qml | 4 ++-- gui/ui/Artists.qml | 4 ++-- gui/ui/ComposerView.qml | 4 ++-- gui/ui/Composers.qml | 4 ++-- gui/ui/Favorites.qml | 4 ++-- gui/ui/Genres.qml | 4 ++-- gui/ui/Group.qml | 6 ++--- gui/ui/Index.qml | 4 ++-- gui/ui/MusicServices.qml | 4 ++-- gui/ui/NoZoneState.qml | 4 ++-- gui/ui/NowPlaying.qml | 4 ++-- gui/ui/Playlists.qml | 4 ++-- gui/ui/QueueView.qml | 4 ++-- gui/ui/Service.qml | 4 ++-- gui/ui/SongsView.qml | 6 ++--- gui/ui/ThisDevice.qml | 4 ++-- gui/ui/ThisDevice/AddToQueue.qml | 4 ++-- gui/ui/ThisDevice/Albums.qml | 4 ++-- gui/ui/ThisDevice/ArtistView.qml | 4 ++-- gui/ui/ThisDevice/Artists.qml | 4 ++-- gui/ui/ThisDevice/Genres.qml | 4 ++-- gui/ui/ThisDevice/PlayAllButton.qml | 4 ++-- gui/ui/ThisDevice/QueueAllButton.qml | 4 ++-- gui/ui/ThisDevice/ShuffleButton.qml | 4 ++-- gui/ui/ThisDevice/SongsView.qml | 6 ++--- gui/ui/Welcome.qml | 4 ++-- gui/ui/Zones.qml | 6 ++--- 94 files changed, 200 insertions(+), 211 deletions(-) diff --git a/gui/components/ActivitySpinner.qml b/gui/components/ActivitySpinner.qml index ff57288c..7fe0b6fe 100644 --- a/gui/components/ActivitySpinner.qml +++ b/gui/components/ActivitySpinner.qml @@ -1,5 +1,5 @@ -import QtQuick 2.8 -import QtQuick.Controls 2.1 +import QtQuick 2.9 +import QtQuick.Controls 2.2 Item { id: loading diff --git a/gui/components/AlarmsEmptyState.qml b/gui/components/AlarmsEmptyState.qml index 6fff2e1b..81bdb39d 100644 --- a/gui/components/AlarmsEmptyState.qml +++ b/gui/components/AlarmsEmptyState.qml @@ -18,8 +18,8 @@ * along with this program. If not, see . */ -import QtQuick 2.8 -import QtQuick.Controls 2.1 +import QtQuick 2.9 +import QtQuick.Controls 2.2 Rectangle { diff --git a/gui/components/BlurredBackground.qml b/gui/components/BlurredBackground.qml index 50a75ed2..e4b184fc 100644 --- a/gui/components/BlurredBackground.qml +++ b/gui/components/BlurredBackground.qml @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -import QtQuick 2.8 +import QtQuick 2.9 import QtGraphicalEffects 1.0 // Blurred background diff --git a/gui/components/ClockTumbler.qml b/gui/components/ClockTumbler.qml index b82bfc5a..ec792c3d 100644 --- a/gui/components/ClockTumbler.qml +++ b/gui/components/ClockTumbler.qml @@ -15,8 +15,8 @@ * along with this program. If not, see . */ -import QtQuick 2.8 -import QtQuick.Controls 2.1 +import QtQuick 2.9 +import QtQuick.Controls 2.2 Item { id: item diff --git a/gui/components/CoverGrid.qml b/gui/components/CoverGrid.qml index 44d9927d..f77a3059 100644 --- a/gui/components/CoverGrid.qml +++ b/gui/components/CoverGrid.qml @@ -18,7 +18,7 @@ * along with this program. If not, see . */ -import QtQuick 2.8 +import QtQuick 2.9 import NosonThumbnailer 1.0 Item { diff --git a/gui/components/DataFailureState.qml b/gui/components/DataFailureState.qml index 448ae648..62a77067 100644 --- a/gui/components/DataFailureState.qml +++ b/gui/components/DataFailureState.qml @@ -15,8 +15,8 @@ * along with this program. If not, see . */ -import QtQuick 2.8 -import QtQuick.Controls 2.1 +import QtQuick 2.9 +import QtQuick.Controls 2.2 Rectangle { diff --git a/gui/components/Delegates/Card.qml b/gui/components/Delegates/Card.qml index 33ab3837..e56f18e4 100644 --- a/gui/components/Delegates/Card.qml +++ b/gui/components/Delegates/Card.qml @@ -15,8 +15,8 @@ * along with this program. If not, see . */ -import QtQuick 2.8 -import QtQuick.Controls 2.1 +import QtQuick 2.9 +import QtQuick.Controls 2.2 import "../" diff --git a/gui/components/Delegates/DragMusicListItem.qml b/gui/components/Delegates/DragMusicListItem.qml index 6e949a36..21f1c257 100644 --- a/gui/components/Delegates/DragMusicListItem.qml +++ b/gui/components/Delegates/DragMusicListItem.qml @@ -15,9 +15,9 @@ * along with this program. If not, see . */ -import QtQuick 2.8 -import QtQuick.Controls 2.1 -import QtQml.Models 2.2 +import QtQuick 2.9 +import QtQuick.Controls 2.2 +import QtQml.Models 2.3 import "../" MouseArea { diff --git a/gui/components/Delegates/MusicListItem.qml b/gui/components/Delegates/MusicListItem.qml index add2e64a..27ebf121 100644 --- a/gui/components/Delegates/MusicListItem.qml +++ b/gui/components/Delegates/MusicListItem.qml @@ -15,9 +15,9 @@ * along with this program. If not, see . */ -import QtQuick 2.8 -import QtQuick.Controls 2.1 -import QtQml.Models 2.2 +import QtQuick 2.9 +import QtQuick.Controls 2.2 +import QtQml.Models 2.3 import "../" MouseArea { diff --git a/gui/components/Delegates/SelectMusicListItem.qml b/gui/components/Delegates/SelectMusicListItem.qml index 0c39aa24..35addf4f 100644 --- a/gui/components/Delegates/SelectMusicListItem.qml +++ b/gui/components/Delegates/SelectMusicListItem.qml @@ -15,9 +15,9 @@ * along with this program. If not, see . */ -import QtQuick 2.8 -import QtQuick.Controls 2.1 -import QtQml.Models 2.2 +import QtQuick 2.9 +import QtQuick.Controls 2.2 +import QtQml.Models 2.3 import "../" MouseArea { diff --git a/gui/components/Delegates/SimpleListItem.qml b/gui/components/Delegates/SimpleListItem.qml index 7ce575ef..ae66a71c 100644 --- a/gui/components/Delegates/SimpleListItem.qml +++ b/gui/components/Delegates/SimpleListItem.qml @@ -15,9 +15,9 @@ * along with this program. If not, see . */ -import QtQuick 2.8 -import QtQuick.Controls 2.1 -import QtQml.Models 2.2 +import QtQuick 2.9 +import QtQuick.Controls 2.2 +import QtQml.Models 2.3 import "../" MouseArea { diff --git a/gui/components/Dialog/DialogAbout.qml b/gui/components/Dialog/DialogAbout.qml index 0e6671d7..af852fd1 100644 --- a/gui/components/Dialog/DialogAbout.qml +++ b/gui/components/Dialog/DialogAbout.qml @@ -15,8 +15,8 @@ * along with this program. If not, see . */ -import QtQuick 2.8 -import QtQuick.Controls 2.1 +import QtQuick 2.9 +import QtQuick.Controls 2.2 import QtQuick.Layouts 1.3 import NosonApp 1.0 import NosonThumbnailer 1.0 diff --git a/gui/components/Dialog/DialogAlarm.qml b/gui/components/Dialog/DialogAlarm.qml index 7180846e..e6e1cc64 100644 --- a/gui/components/Dialog/DialogAlarm.qml +++ b/gui/components/Dialog/DialogAlarm.qml @@ -15,8 +15,8 @@ * along with this program. If not, see . */ -import QtQuick 2.8 -import QtQuick.Controls 2.1 +import QtQuick 2.9 +import QtQuick.Controls 2.2 import QtQuick.Layouts 1.3 import NosonApp 1.0 import "../" diff --git a/gui/components/Dialog/DialogApplicationSettings.qml b/gui/components/Dialog/DialogApplicationSettings.qml index eb4c2993..1f629839 100644 --- a/gui/components/Dialog/DialogApplicationSettings.qml +++ b/gui/components/Dialog/DialogApplicationSettings.qml @@ -15,8 +15,8 @@ * along with this program. If not, see . */ -import QtQuick 2.8 -import QtQuick.Controls 2.1 +import QtQuick 2.9 +import QtQuick.Controls 2.2 import QtQuick.Layouts 1.3 import NosonThumbnailer 1.0 import "../" diff --git a/gui/components/Dialog/DialogBase.qml b/gui/components/Dialog/DialogBase.qml index 894c2499..e1c28282 100644 --- a/gui/components/Dialog/DialogBase.qml +++ b/gui/components/Dialog/DialogBase.qml @@ -15,8 +15,8 @@ * along with this program. If not, see . */ -import QtQuick 2.8 -import QtQuick.Controls 2.1 +import QtQuick 2.9 +import QtQuick.Controls 2.2 Dialog { id: dialog diff --git a/gui/components/Dialog/DialogManageQueue.qml b/gui/components/Dialog/DialogManageQueue.qml index 3e8f62dc..41d9ca03 100644 --- a/gui/components/Dialog/DialogManageQueue.qml +++ b/gui/components/Dialog/DialogManageQueue.qml @@ -15,8 +15,8 @@ * along with this program. If not, see . */ -import QtQuick 2.8 -import QtQuick.Controls 2.1 +import QtQuick 2.9 +import QtQuick.Controls 2.2 DialogBase { diff --git a/gui/components/Dialog/DialogNewPlaylist.qml b/gui/components/Dialog/DialogNewPlaylist.qml index 5c27641c..43676e84 100644 --- a/gui/components/Dialog/DialogNewPlaylist.qml +++ b/gui/components/Dialog/DialogNewPlaylist.qml @@ -15,8 +15,8 @@ * along with this program. If not, see . */ -import QtQuick 2.8 -import QtQuick.Controls 2.1 +import QtQuick 2.9 +import QtQuick.Controls 2.2 DialogBase { diff --git a/gui/components/Dialog/DialogRemovePlaylist.qml b/gui/components/Dialog/DialogRemovePlaylist.qml index 1bab74c2..693e1074 100644 --- a/gui/components/Dialog/DialogRemovePlaylist.qml +++ b/gui/components/Dialog/DialogRemovePlaylist.qml @@ -15,10 +15,10 @@ * along with this program. If not, see . */ -import QtQuick 2.8 +import QtQuick 2.9 import QtQuick.Layouts 1.3 -import QtQuick.Controls 2.1 -import QtQml.Models 2.2 +import QtQuick.Controls 2.2 +import QtQml.Models 2.3 DialogBase { id: dialog diff --git a/gui/components/Dialog/DialogSearchMusic.qml b/gui/components/Dialog/DialogSearchMusic.qml index ce5471c3..bafbc8b8 100644 --- a/gui/components/Dialog/DialogSearchMusic.qml +++ b/gui/components/Dialog/DialogSearchMusic.qml @@ -15,10 +15,10 @@ * along with this program. If not, see . */ -import QtQuick 2.8 +import QtQuick 2.9 import QtQuick.Layouts 1.3 -import QtQuick.Controls 2.1 -import QtQml.Models 2.2 +import QtQuick.Controls 2.2 +import QtQml.Models 2.3 DialogBase { id: dialog diff --git a/gui/components/Dialog/DialogSelectSource.qml b/gui/components/Dialog/DialogSelectSource.qml index 85431644..45280786 100644 --- a/gui/components/Dialog/DialogSelectSource.qml +++ b/gui/components/Dialog/DialogSelectSource.qml @@ -15,8 +15,8 @@ * along with this program. If not, see . */ -import QtQuick 2.8 -import QtQuick.Controls 2.1 +import QtQuick 2.9 +import QtQuick.Controls 2.2 import QtQuick.Layouts 1.3 import NosonApp 1.0 diff --git a/gui/components/Dialog/DialogServiceLabel.qml b/gui/components/Dialog/DialogServiceLabel.qml index 0c8c1fd3..96a88ea2 100644 --- a/gui/components/Dialog/DialogServiceLabel.qml +++ b/gui/components/Dialog/DialogServiceLabel.qml @@ -15,8 +15,8 @@ * along with this program. If not, see . */ -import QtQuick 2.8 -import QtQuick.Controls 2.1 +import QtQuick 2.9 +import QtQuick.Controls 2.2 import QtQuick.Layouts 1.3 DialogBase { diff --git a/gui/components/Dialog/DialogSettings.qml b/gui/components/Dialog/DialogSettings.qml index 29c5e221..e3c02b8b 100644 --- a/gui/components/Dialog/DialogSettings.qml +++ b/gui/components/Dialog/DialogSettings.qml @@ -15,10 +15,10 @@ * along with this program. If not, see . */ -import QtQuick 2.8 +import QtQuick 2.9 import QtQuick.Layouts 1.3 -import QtQuick.Controls 2.1 -import QtQml.Models 2.2 +import QtQuick.Controls 2.2 +import QtQml.Models 2.3 DialogBase { id: dialog diff --git a/gui/components/Dialog/DialogSleepTimer.qml b/gui/components/Dialog/DialogSleepTimer.qml index d3e35ba2..58ac1c9e 100644 --- a/gui/components/Dialog/DialogSleepTimer.qml +++ b/gui/components/Dialog/DialogSleepTimer.qml @@ -15,8 +15,8 @@ * along with this program. If not, see . */ -import QtQuick 2.8 -import QtQuick.Controls 2.1 +import QtQuick 2.9 +import QtQuick.Controls 2.2 import QtQuick.Layouts 1.3 DialogBase { diff --git a/gui/components/Dialog/DialogSongInfo.qml b/gui/components/Dialog/DialogSongInfo.qml index 8cb43c97..79d4a2e2 100644 --- a/gui/components/Dialog/DialogSongInfo.qml +++ b/gui/components/Dialog/DialogSongInfo.qml @@ -15,8 +15,9 @@ * along with this program. If not, see . */ -import QtQuick 2.8 -import QtQuick.Controls 2.1 +import QtQuick 2.9 +import QtQuick.Controls 2.2 +//import QtQuick.Layouts 1.3 import QtGraphicalEffects 1.0 import NosonApp 1.0 import "../Delegates" diff --git a/gui/components/Dialog/DialogSoundSettings.qml b/gui/components/Dialog/DialogSoundSettings.qml index 6889d4b7..17c18eeb 100644 --- a/gui/components/Dialog/DialogSoundSettings.qml +++ b/gui/components/Dialog/DialogSoundSettings.qml @@ -15,8 +15,8 @@ * along with this program. If not, see . */ -import QtQuick 2.8 -import QtQuick.Controls 2.1 +import QtQuick 2.9 +import QtQuick.Controls 2.2 import QtQuick.Layouts 1.3 import NosonApp 1.0 import "../" diff --git a/gui/components/Flickables/MultiSelectListView.qml b/gui/components/Flickables/MultiSelectListView.qml index 769c93a6..28276068 100644 --- a/gui/components/Flickables/MultiSelectListView.qml +++ b/gui/components/Flickables/MultiSelectListView.qml @@ -17,8 +17,8 @@ * along with this program. If not, see . */ -import QtQuick 2.8 -import QtQuick.Controls 2.1 +import QtQuick 2.9 +import QtQuick.Controls 2.2 MusicListView { diff --git a/gui/components/Flickables/MusicGridView.qml b/gui/components/Flickables/MusicGridView.qml index 8d2c4e7f..5bd3cc78 100644 --- a/gui/components/Flickables/MusicGridView.qml +++ b/gui/components/Flickables/MusicGridView.qml @@ -15,8 +15,8 @@ * along with this program. If not, see . */ -import QtQuick 2.8 -import QtQuick.Controls 2.1 +import QtQuick 2.9 +import QtQuick.Controls 2.2 GridView { id: gridView diff --git a/gui/components/Flickables/MusicListView.qml b/gui/components/Flickables/MusicListView.qml index 2f337537..3f5e2317 100644 --- a/gui/components/Flickables/MusicListView.qml +++ b/gui/components/Flickables/MusicListView.qml @@ -17,8 +17,8 @@ * along with this program. If not, see . */ -import QtQuick 2.8 -import QtQuick.Controls 2.1 +import QtQuick 2.9 +import QtQuick.Controls 2.2 ListView { Component.onCompleted: { diff --git a/gui/components/Icon.qml b/gui/components/Icon.qml index e7883a83..dc989c0f 100644 --- a/gui/components/Icon.qml +++ b/gui/components/Icon.qml @@ -15,8 +15,8 @@ * along with this program. If not, see . */ -import QtQuick 2.8 -import QtQuick.Controls 2.1 +import QtQuick 2.9 +import QtQuick.Controls 2.2 import QtGraphicalEffects 1.0 MouseArea { diff --git a/gui/components/IndexEmptyState.qml b/gui/components/IndexEmptyState.qml index 6f469fe4..247b607c 100644 --- a/gui/components/IndexEmptyState.qml +++ b/gui/components/IndexEmptyState.qml @@ -18,8 +18,8 @@ * along with this program. If not, see . */ -import QtQuick 2.8 -import QtQuick.Controls 2.1 +import QtQuick 2.9 +import QtQuick.Controls 2.2 Rectangle { diff --git a/gui/components/IndexUpdateState.qml b/gui/components/IndexUpdateState.qml index ed209d98..b4b968b6 100644 --- a/gui/components/IndexUpdateState.qml +++ b/gui/components/IndexUpdateState.qml @@ -18,8 +18,8 @@ * along with this program. If not, see . */ -import QtQuick 2.8 -import QtQuick.Controls 2.1 +import QtQuick 2.9 +import QtQuick.Controls 2.2 Rectangle { diff --git a/gui/components/ListItemActions/AddToFavorites.qml b/gui/components/ListItemActions/AddToFavorites.qml index bffc7157..613a408b 100644 --- a/gui/components/ListItemActions/AddToFavorites.qml +++ b/gui/components/ListItemActions/AddToFavorites.qml @@ -15,8 +15,8 @@ * along with this program. If not, see . */ -import QtQuick 2.8 -import QtQuick.Controls 2.1 +import QtQuick 2.9 +import QtQuick.Controls 2.2 import NosonApp 1.0 MenuItem { diff --git a/gui/components/ListItemActions/AddToPlaylist.qml b/gui/components/ListItemActions/AddToPlaylist.qml index 4c005a74..d1938ace 100644 --- a/gui/components/ListItemActions/AddToPlaylist.qml +++ b/gui/components/ListItemActions/AddToPlaylist.qml @@ -18,8 +18,8 @@ * along with this program. If not, see . */ -import QtQuick 2.8 -import QtQuick.Controls 2.1 +import QtQuick 2.9 +import QtQuick.Controls 2.2 MenuItem { text: qsTr("Add to playlist") diff --git a/gui/components/ListItemActions/AddToQueue.qml b/gui/components/ListItemActions/AddToQueue.qml index 08cf8b3b..b3f255e5 100644 --- a/gui/components/ListItemActions/AddToQueue.qml +++ b/gui/components/ListItemActions/AddToQueue.qml @@ -18,8 +18,8 @@ * along with this program. If not, see . */ -import QtQuick 2.8 -import QtQuick.Controls 2.1 +import QtQuick 2.9 +import QtQuick.Controls 2.2 MenuItem { text: qsTr("Add to queue") diff --git a/gui/components/ListItemActions/Remove.qml b/gui/components/ListItemActions/Remove.qml index 5eafa8e8..be0501fc 100644 --- a/gui/components/ListItemActions/Remove.qml +++ b/gui/components/ListItemActions/Remove.qml @@ -17,8 +17,8 @@ * along with this program. If not, see . */ -import QtQuick 2.8 -import QtQuick.Controls 2.1 +import QtQuick 2.9 +import QtQuick.Controls 2.2 MenuItem { text: qsTr("Remove") diff --git a/gui/components/MusicCheckBox.qml b/gui/components/MusicCheckBox.qml index b6d4cb4e..8e4c275d 100644 --- a/gui/components/MusicCheckBox.qml +++ b/gui/components/MusicCheckBox.qml @@ -15,8 +15,8 @@ * along with this program. If not, see . */ -import QtQuick 2.8 -import QtQuick.Controls 2.1 +import QtQuick 2.9 +import QtQuick.Controls 2.2 CheckBox { id: control diff --git a/gui/components/MusicFilter.qml b/gui/components/MusicFilter.qml index af7cf06e..11957be0 100644 --- a/gui/components/MusicFilter.qml +++ b/gui/components/MusicFilter.qml @@ -15,8 +15,8 @@ * along with this program. If not, see . */ -import QtQuick 2.8 -import QtQuick.Controls 2.1 +import QtQuick 2.9 +import QtQuick.Controls 2.2 import QtQuick.Layouts 1.3 Rectangle { diff --git a/gui/components/MusicHeader.qml b/gui/components/MusicHeader.qml index 0045df58..4116afb1 100644 --- a/gui/components/MusicHeader.qml +++ b/gui/components/MusicHeader.qml @@ -15,8 +15,8 @@ * along with this program. If not, see . */ -import QtQuick 2.8 -import QtQuick.Controls 2.1 +import QtQuick 2.9 +import QtQuick.Controls 2.2 Item { anchors { diff --git a/gui/components/MusicPage.qml b/gui/components/MusicPage.qml index d0da7af3..947f0ec6 100644 --- a/gui/components/MusicPage.qml +++ b/gui/components/MusicPage.qml @@ -18,8 +18,8 @@ * along with this program. If not, see . */ -import QtQuick 2.8 -import QtQuick.Controls 2.1 +import QtQuick 2.9 +import QtQuick.Controls 2.2 import QtQuick.Layouts 1.3 // generic page for music, could be useful for bottomedge implementation diff --git a/gui/components/MusicRow.qml b/gui/components/MusicRow.qml index 08a129b0..8a2d1ccf 100644 --- a/gui/components/MusicRow.qml +++ b/gui/components/MusicRow.qml @@ -15,8 +15,8 @@ * along with this program. If not, see . */ -import QtQuick 2.8 -import QtQuick.Controls 2.1 +import QtQuick 2.9 +import QtQuick.Controls 2.2 import "ListItemActions" Row { diff --git a/gui/components/MusicToolbar.qml b/gui/components/MusicToolbar.qml index 4e0074db..96563ef9 100644 --- a/gui/components/MusicToolbar.qml +++ b/gui/components/MusicToolbar.qml @@ -15,8 +15,8 @@ * along with this program. If not, see . */ -import QtQuick 2.8 -import QtQuick.Controls 2.1 +import QtQuick 2.9 +import QtQuick.Controls 2.2 Item { id: toolBar diff --git a/gui/components/NowPlayingFullView.qml b/gui/components/NowPlayingFullView.qml index bae9c8a1..97567910 100644 --- a/gui/components/NowPlayingFullView.qml +++ b/gui/components/NowPlayingFullView.qml @@ -18,8 +18,8 @@ * along with this program. If not, see . */ -import QtQuick 2.8 -import QtQuick.Controls 2.1 +import QtQuick 2.9 +import QtQuick.Controls 2.2 import QtGraphicalEffects 1.0 //import "../components/Themes/Ambiance" diff --git a/gui/components/NowPlayingSidebar.qml b/gui/components/NowPlayingSidebar.qml index 01a90eab..090a9c0e 100644 --- a/gui/components/NowPlayingSidebar.qml +++ b/gui/components/NowPlayingSidebar.qml @@ -15,8 +15,8 @@ * along with this program. If not, see . */ -import QtQuick 2.8 -import QtQuick.Controls 2.1 +import QtQuick 2.9 +import QtQuick.Controls 2.2 import QtQuick.Layouts 1.3 Page { diff --git a/gui/components/NowPlayingToolbar.qml b/gui/components/NowPlayingToolbar.qml index 38c173ca..3aa6e9d7 100644 --- a/gui/components/NowPlayingToolbar.qml +++ b/gui/components/NowPlayingToolbar.qml @@ -18,8 +18,8 @@ * along with this program. If not, see . */ -import QtQuick 2.8 -import QtQuick.Controls 2.1 +import QtQuick 2.9 +import QtQuick.Controls 2.2 /* Full toolbar */ diff --git a/gui/components/Player.qml b/gui/components/Player.qml index 591b6799..1c881562 100644 --- a/gui/components/Player.qml +++ b/gui/components/Player.qml @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -import QtQuick 2.8 +import QtQuick 2.9 import NosonApp 1.0 /* diff --git a/gui/components/PlaylistsEmptyState.qml b/gui/components/PlaylistsEmptyState.qml index c48893f3..a9fc53d2 100644 --- a/gui/components/PlaylistsEmptyState.qml +++ b/gui/components/PlaylistsEmptyState.qml @@ -18,8 +18,8 @@ * along with this program. If not, see . */ -import QtQuick 2.8 -import QtQuick.Controls 2.1 +import QtQuick 2.9 +import QtQuick.Controls 2.2 Rectangle { diff --git a/gui/components/PopInfo.qml b/gui/components/PopInfo.qml index ede9ee11..d355bd7c 100644 --- a/gui/components/PopInfo.qml +++ b/gui/components/PopInfo.qml @@ -15,8 +15,8 @@ * along with this program. If not, see . */ -import QtQuick 2.8 -import QtQuick.Controls 2.1 +import QtQuick 2.9 +import QtQuick.Controls 2.2 Item { property string message: "" diff --git a/gui/components/Queue.qml b/gui/components/Queue.qml index 7dd1b1e7..beee970d 100644 --- a/gui/components/Queue.qml +++ b/gui/components/Queue.qml @@ -18,9 +18,9 @@ * along with this program. If not, see . */ -import QtQuick 2.8 -import QtQuick.Controls 2.1 -import QtQml.Models 2.2 +import QtQuick 2.9 +import QtQuick.Controls 2.2 +import QtQml.Models 2.3 import "Delegates" import "Flickables" import "ListItemActions" diff --git a/gui/components/RenderingBubble.qml b/gui/components/RenderingBubble.qml index 4995f108..37de9062 100644 --- a/gui/components/RenderingBubble.qml +++ b/gui/components/RenderingBubble.qml @@ -15,8 +15,8 @@ * along with this program. If not, see . */ -import QtQuick 2.8 -import QtQuick.Controls 2.1 +import QtQuick 2.9 +import QtQuick.Controls 2.2 Item { diff --git a/gui/components/RenderingControlerView.qml b/gui/components/RenderingControlerView.qml index ea22a858..79279903 100644 --- a/gui/components/RenderingControlerView.qml +++ b/gui/components/RenderingControlerView.qml @@ -15,8 +15,8 @@ * along with this program. If not, see . */ -import QtQuick 2.8 -import QtQuick.Controls 2.1 +import QtQuick 2.9 +import QtQuick.Controls 2.2 import "Delegates" import "Flickables" diff --git a/gui/components/ServiceEmptyState.qml b/gui/components/ServiceEmptyState.qml index 24195e8c..deff9898 100644 --- a/gui/components/ServiceEmptyState.qml +++ b/gui/components/ServiceEmptyState.qml @@ -18,8 +18,8 @@ * along with this program. If not, see . */ -import QtQuick 2.8 -import QtQuick.Controls 2.1 +import QtQuick 2.9 +import QtQuick.Controls 2.2 Rectangle { diff --git a/gui/components/ServiceLogin.qml b/gui/components/ServiceLogin.qml index b0bd6665..4226a227 100644 --- a/gui/components/ServiceLogin.qml +++ b/gui/components/ServiceLogin.qml @@ -15,8 +15,8 @@ * along with this program. If not, see . */ -import QtQuick 2.8 -import QtQuick.Controls 2.1 +import QtQuick 2.9 +import QtQuick.Controls 2.2 import NosonApp 1.0 // Overlay to show when auth expired diff --git a/gui/components/ServiceRegistration.qml b/gui/components/ServiceRegistration.qml index 7525e351..5c44ee5e 100644 --- a/gui/components/ServiceRegistration.qml +++ b/gui/components/ServiceRegistration.qml @@ -15,8 +15,8 @@ * along with this program. If not, see . */ -import QtQuick 2.8 -import QtQuick.Controls 2.1 +import QtQuick 2.9 +import QtQuick.Controls 2.2 import NosonApp 1.0 // Overlay to show when auth expired diff --git a/gui/components/SimpleRow.qml b/gui/components/SimpleRow.qml index f1c76870..8b7e7d77 100644 --- a/gui/components/SimpleRow.qml +++ b/gui/components/SimpleRow.qml @@ -15,8 +15,8 @@ * along with this program. If not, see . */ -import QtQuick 2.8 -import QtQuick.Controls 2.1 +import QtQuick 2.9 +import QtQuick.Controls 2.2 Row { property alias column: columnComponent.sourceComponent diff --git a/gui/components/StyleLight.qml b/gui/components/StyleLight.qml index fc00747d..b46d8bef 100644 --- a/gui/components/StyleLight.qml +++ b/gui/components/StyleLight.qml @@ -15,8 +15,8 @@ * along with this program. If not, see . */ -import QtQuick 2.8 -import QtQuick.Controls 2.1 +import QtQuick 2.9 +import QtQuick.Controls 2.2 QtObject { property QtObject view: QtObject { diff --git a/gui/components/StyledSlider.qml b/gui/components/StyledSlider.qml index 2433a224..f853f8c4 100644 --- a/gui/components/StyledSlider.qml +++ b/gui/components/StyledSlider.qml @@ -15,8 +15,8 @@ * along with this program. If not, see . */ -import QtQuick 2.8 -import QtQuick.Controls 2.1 +import QtQuick 2.9 +import QtQuick.Controls 2.2 Slider { id: control diff --git a/gui/components/TrackQueue.qml b/gui/components/TrackQueue.qml index 3e26fff6..7fa2adbf 100644 --- a/gui/components/TrackQueue.qml +++ b/gui/components/TrackQueue.qml @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -import QtQuick 2.8 +import QtQuick 2.9 import NosonApp 1.0 Item { diff --git a/gui/components/Units.qml b/gui/components/Units.qml index ed9c216c..b7b324ad 100644 --- a/gui/components/Units.qml +++ b/gui/components/Units.qml @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -import QtQuick 2.8 +import QtQuick 2.9 Item { property real scaleFactor: 1.0 diff --git a/gui/components/ViewButton/PlayAllButton.qml b/gui/components/ViewButton/PlayAllButton.qml index aeaff2b3..20db9974 100644 --- a/gui/components/ViewButton/PlayAllButton.qml +++ b/gui/components/ViewButton/PlayAllButton.qml @@ -15,8 +15,8 @@ * along with this program. If not, see . */ -import QtQuick 2.8 -import QtQuick.Controls 2.1 +import QtQuick 2.9 +import QtQuick.Controls 2.2 import "../" Icon { diff --git a/gui/components/ViewButton/QueueAllButton.qml b/gui/components/ViewButton/QueueAllButton.qml index d1ad07e9..bb9db366 100644 --- a/gui/components/ViewButton/QueueAllButton.qml +++ b/gui/components/ViewButton/QueueAllButton.qml @@ -15,8 +15,8 @@ * along with this program. If not, see . */ -import QtQuick 2.8 -import QtQuick.Controls 2.1 +import QtQuick 2.9 +import QtQuick.Controls 2.2 import "../" Icon { diff --git a/gui/components/ViewButton/ShuffleButton.qml b/gui/components/ViewButton/ShuffleButton.qml index a30dba60..3609877c 100644 --- a/gui/components/ViewButton/ShuffleButton.qml +++ b/gui/components/ViewButton/ShuffleButton.qml @@ -15,8 +15,8 @@ * along with this program. If not, see . */ -import QtQuick 2.8 -import QtQuick.Controls 2.1 +import QtQuick 2.9 +import QtQuick.Controls 2.2 import "../" Icon { diff --git a/gui/components/ZoneControls.qml b/gui/components/ZoneControls.qml index a9383620..757bd85c 100644 --- a/gui/components/ZoneControls.qml +++ b/gui/components/ZoneControls.qml @@ -15,8 +15,8 @@ * along with this program. If not, see . */ -import QtQuick 2.8 -import QtQuick.Controls 2.1 +import QtQuick 2.9 +import QtQuick.Controls 2.2 Item { property string controlledZone: "" diff --git a/gui/noson.qml b/gui/noson.qml index d35e64c9..469ae6f2 100644 --- a/gui/noson.qml +++ b/gui/noson.qml @@ -15,11 +15,11 @@ * along with this program. If not, see . */ -import QtQuick 2.8 +import QtQuick 2.9 import QtQuick.Layouts 1.3 -import QtQuick.Controls 2.1 -import QtQuick.Controls.Material 2.1 -import QtQuick.Controls.Universal 2.1 +import QtQuick.Controls 2.2 +import QtQuick.Controls.Material 2.2 +import QtQuick.Controls.Universal 2.2 import Qt.labs.settings 1.0 import QtGraphicalEffects 1.0 import NosonApp 1.0 @@ -914,19 +914,7 @@ ApplicationWindow { //// Shortcut { - sequence: "Esc" - enabled: noZone === false && stackView.depth > 1 - onActivated: { - if (stackView.depth > 1) { - if (stackView.currentItem.isRoot) - stackView.pop() - else - stackView.currentItem.goUpClicked() - } - } - } - Shortcut { - sequence: "Back" + sequences: ["Esc", "Back"] enabled: noZone === false && stackView.depth > 1 onActivated: { if (stackView.depth > 1) { diff --git a/gui/ui/AddService.qml b/gui/ui/AddService.qml index 05acba0e..ff39ebae 100644 --- a/gui/ui/AddService.qml +++ b/gui/ui/AddService.qml @@ -15,8 +15,8 @@ * along with this program. If not, see . */ -import QtQuick 2.8 -import QtQuick.Controls 2.1 +import QtQuick 2.9 +import QtQuick.Controls 2.2 import NosonApp 1.0 import "../components" import "../components/Delegates" diff --git a/gui/ui/AddToPlaylist.qml b/gui/ui/AddToPlaylist.qml index c96319c5..16eef8dc 100644 --- a/gui/ui/AddToPlaylist.qml +++ b/gui/ui/AddToPlaylist.qml @@ -18,8 +18,8 @@ * along with this program. If not, see . */ -import QtQuick 2.8 -import QtQuick.Controls 2.1 +import QtQuick 2.9 +import QtQuick.Controls 2.2 import NosonApp 1.0 import "../components" import "../components/Delegates" diff --git a/gui/ui/Alarms.qml b/gui/ui/Alarms.qml index d9177ffc..b7974188 100644 --- a/gui/ui/Alarms.qml +++ b/gui/ui/Alarms.qml @@ -15,9 +15,9 @@ * along with this program. If not, see . */ -import QtQuick 2.8 -import QtQuick.Controls 2.1 -import QtQml.Models 2.2 +import QtQuick 2.9 +import QtQuick.Controls 2.2 +import QtQml.Models 2.3 import NosonApp 1.0 import "../components" import "../components/Delegates" diff --git a/gui/ui/Albums.qml b/gui/ui/Albums.qml index ccd485a3..73926bf5 100644 --- a/gui/ui/Albums.qml +++ b/gui/ui/Albums.qml @@ -15,8 +15,8 @@ * along with this program. If not, see . */ -import QtQuick 2.8 -import QtQuick.Controls 2.1 +import QtQuick 2.9 +import QtQuick.Controls 2.2 import QtQuick.Layouts 1.3 import NosonApp 1.0 import "../components" diff --git a/gui/ui/ArtistView.qml b/gui/ui/ArtistView.qml index 52b3f239..993a8f48 100644 --- a/gui/ui/ArtistView.qml +++ b/gui/ui/ArtistView.qml @@ -15,8 +15,8 @@ * along with this program. If not, see . */ -import QtQuick 2.8 -import QtQuick.Controls 2.1 +import QtQuick 2.9 +import QtQuick.Controls 2.2 import NosonApp 1.0 import "../components" import "../components/Delegates" diff --git a/gui/ui/Artists.qml b/gui/ui/Artists.qml index ffb5ceb5..47d972a8 100644 --- a/gui/ui/Artists.qml +++ b/gui/ui/Artists.qml @@ -15,8 +15,8 @@ * along with this program. If not, see . */ -import QtQuick 2.8 -import QtQuick.Controls 2.1 +import QtQuick 2.9 +import QtQuick.Controls 2.2 import QtQuick.Layouts 1.3 import NosonApp 1.0 import "../components" diff --git a/gui/ui/ComposerView.qml b/gui/ui/ComposerView.qml index 6f24d4c4..49aa4a6d 100644 --- a/gui/ui/ComposerView.qml +++ b/gui/ui/ComposerView.qml @@ -15,8 +15,8 @@ * along with this program. If not, see . */ -import QtQuick 2.8 -import QtQuick.Controls 2.1 +import QtQuick 2.9 +import QtQuick.Controls 2.2 import NosonApp 1.0 import "../components" import "../components/Delegates" diff --git a/gui/ui/Composers.qml b/gui/ui/Composers.qml index 930e1217..cdd595b3 100644 --- a/gui/ui/Composers.qml +++ b/gui/ui/Composers.qml @@ -15,8 +15,8 @@ * along with this program. If not, see . */ -import QtQuick 2.8 -import QtQuick.Controls 2.1 +import QtQuick 2.9 +import QtQuick.Controls 2.2 import QtQuick.Layouts 1.3 import NosonApp 1.0 import "../components" diff --git a/gui/ui/Favorites.qml b/gui/ui/Favorites.qml index 0857f398..19ab2599 100644 --- a/gui/ui/Favorites.qml +++ b/gui/ui/Favorites.qml @@ -15,8 +15,8 @@ * along with this program. If not, see . */ -import QtQuick 2.8 -import QtQuick.Controls 2.1 +import QtQuick 2.9 +import QtQuick.Controls 2.2 import QtQuick.Layouts 1.3 import NosonApp 1.0 import "../components" diff --git a/gui/ui/Genres.qml b/gui/ui/Genres.qml index 5f986ee0..906c1d86 100644 --- a/gui/ui/Genres.qml +++ b/gui/ui/Genres.qml @@ -15,8 +15,8 @@ * along with this program. If not, see . */ -import QtQuick 2.8 -import QtQuick.Controls 2.1 +import QtQuick 2.9 +import QtQuick.Controls 2.2 import QtQuick.Layouts 1.3 import NosonApp 1.0 import "../components" diff --git a/gui/ui/Group.qml b/gui/ui/Group.qml index b8448d9f..f182b481 100644 --- a/gui/ui/Group.qml +++ b/gui/ui/Group.qml @@ -15,9 +15,9 @@ * along with this program. If not, see . */ -import QtQuick 2.8 -import QtQuick.Controls 2.1 -import QtQml.Models 2.2 +import QtQuick 2.9 +import QtQuick.Controls 2.2 +import QtQml.Models 2.3 import NosonApp 1.0 import "../components" import "../components/Delegates" diff --git a/gui/ui/Index.qml b/gui/ui/Index.qml index b431cadf..0b3f5dc3 100644 --- a/gui/ui/Index.qml +++ b/gui/ui/Index.qml @@ -15,8 +15,8 @@ * along with this program. If not, see . */ -import QtQuick 2.8 -import QtQuick.Controls 2.1 +import QtQuick 2.9 +import QtQuick.Controls 2.2 import NosonApp 1.0 import "../components" import "../components/Delegates" diff --git a/gui/ui/MusicServices.qml b/gui/ui/MusicServices.qml index e49e2bbd..a4988c68 100644 --- a/gui/ui/MusicServices.qml +++ b/gui/ui/MusicServices.qml @@ -15,8 +15,8 @@ * along with this program. If not, see . */ -import QtQuick 2.8 -import QtQuick.Controls 2.1 +import QtQuick 2.9 +import QtQuick.Controls 2.2 import NosonApp 1.0 import "../components" import "../components/Delegates" diff --git a/gui/ui/NoZoneState.qml b/gui/ui/NoZoneState.qml index 4ce35ef0..280b9cf5 100644 --- a/gui/ui/NoZoneState.qml +++ b/gui/ui/NoZoneState.qml @@ -15,9 +15,9 @@ * along with this program. If not, see . */ -import QtQuick 2.8 +import QtQuick 2.9 import QtQuick.Layouts 1.3 -import QtQuick.Controls 2.1 +import QtQuick.Controls 2.2 import QtGraphicalEffects 1.0 import NosonThumbnailer 1.0 diff --git a/gui/ui/NowPlaying.qml b/gui/ui/NowPlaying.qml index e838c98f..4c40c721 100644 --- a/gui/ui/NowPlaying.qml +++ b/gui/ui/NowPlaying.qml @@ -15,8 +15,8 @@ * along with this program. If not, see . */ -import QtQuick 2.8 -import QtQuick.Controls 2.1 +import QtQuick 2.9 +import QtQuick.Controls 2.2 import "../components" import "../components/Dialog" diff --git a/gui/ui/Playlists.qml b/gui/ui/Playlists.qml index 8ca4d5c5..412ed9d9 100644 --- a/gui/ui/Playlists.qml +++ b/gui/ui/Playlists.qml @@ -15,8 +15,8 @@ * along with this program. If not, see . */ -import QtQuick 2.8 -import QtQuick.Controls 2.1 +import QtQuick 2.9 +import QtQuick.Controls 2.2 import QtQuick.Layouts 1.3 import NosonApp 1.0 import "../components" diff --git a/gui/ui/QueueView.qml b/gui/ui/QueueView.qml index 762359e1..11ba1294 100644 --- a/gui/ui/QueueView.qml +++ b/gui/ui/QueueView.qml @@ -15,8 +15,8 @@ * along with this program. If not, see . */ -import QtQuick 2.8 -import QtQuick.Controls 2.1 +import QtQuick 2.9 +import QtQuick.Controls 2.2 import NosonApp 1.0 import "../components" import "../components/Dialog" diff --git a/gui/ui/Service.qml b/gui/ui/Service.qml index 1080b7f6..5b1b6815 100644 --- a/gui/ui/Service.qml +++ b/gui/ui/Service.qml @@ -15,8 +15,8 @@ * along with this program. If not, see . */ -import QtQuick 2.8 -import QtQuick.Controls 2.1 +import QtQuick 2.9 +import QtQuick.Controls 2.2 import NosonApp 1.0 import "../components" import "../components/Delegates" diff --git a/gui/ui/SongsView.qml b/gui/ui/SongsView.qml index 5d60f4bb..d0c67163 100644 --- a/gui/ui/SongsView.qml +++ b/gui/ui/SongsView.qml @@ -15,9 +15,9 @@ * along with this program. If not, see . */ -import QtQuick 2.8 -import QtQuick.Controls 2.1 -import QtQml.Models 2.2 +import QtQuick 2.9 +import QtQuick.Controls 2.2 +import QtQml.Models 2.3 import NosonApp 1.0 import "../components" import "../components/Delegates" diff --git a/gui/ui/ThisDevice.qml b/gui/ui/ThisDevice.qml index 3d32681e..64cf72dd 100644 --- a/gui/ui/ThisDevice.qml +++ b/gui/ui/ThisDevice.qml @@ -15,8 +15,8 @@ * along with this program. If not, see . */ -import QtQuick 2.8 -import QtQuick.Controls 2.1 +import QtQuick 2.9 +import QtQuick.Controls 2.2 import NosonMediaScanner 1.0 import "../components" import "../components/Delegates" diff --git a/gui/ui/ThisDevice/AddToQueue.qml b/gui/ui/ThisDevice/AddToQueue.qml index 8ac6a01a..85c3fa51 100644 --- a/gui/ui/ThisDevice/AddToQueue.qml +++ b/gui/ui/ThisDevice/AddToQueue.qml @@ -15,8 +15,8 @@ * along with this program. If not, see . */ -import QtQuick 2.8 -import QtQuick.Controls 2.1 +import QtQuick 2.9 +import QtQuick.Controls 2.2 MenuItem { text: qsTr("Add to queue") diff --git a/gui/ui/ThisDevice/Albums.qml b/gui/ui/ThisDevice/Albums.qml index 4c888138..1db5fc9d 100644 --- a/gui/ui/ThisDevice/Albums.qml +++ b/gui/ui/ThisDevice/Albums.qml @@ -15,8 +15,8 @@ * along with this program. If not, see . */ -import QtQuick 2.8 -import QtQuick.Controls 2.1 +import QtQuick 2.9 +import QtQuick.Controls 2.2 import QtQuick.Layouts 1.3 import NosonApp 1.0 import NosonMediaScanner 1.0 diff --git a/gui/ui/ThisDevice/ArtistView.qml b/gui/ui/ThisDevice/ArtistView.qml index 9ee1e573..d9c23cb3 100644 --- a/gui/ui/ThisDevice/ArtistView.qml +++ b/gui/ui/ThisDevice/ArtistView.qml @@ -15,8 +15,8 @@ * along with this program. If not, see . */ -import QtQuick 2.8 -import QtQuick.Controls 2.1 +import QtQuick 2.9 +import QtQuick.Controls 2.2 import NosonApp 1.0 import NosonMediaScanner 1.0 import "../../components" diff --git a/gui/ui/ThisDevice/Artists.qml b/gui/ui/ThisDevice/Artists.qml index 8a59a4bc..d60ded16 100644 --- a/gui/ui/ThisDevice/Artists.qml +++ b/gui/ui/ThisDevice/Artists.qml @@ -15,8 +15,8 @@ * along with this program. If not, see . */ -import QtQuick 2.8 -import QtQuick.Controls 2.1 +import QtQuick 2.9 +import QtQuick.Controls 2.2 import QtQuick.Layouts 1.3 import NosonApp 1.0 import NosonMediaScanner 1.0 diff --git a/gui/ui/ThisDevice/Genres.qml b/gui/ui/ThisDevice/Genres.qml index ca26c5c9..1366c295 100644 --- a/gui/ui/ThisDevice/Genres.qml +++ b/gui/ui/ThisDevice/Genres.qml @@ -15,8 +15,8 @@ * along with this program. If not, see . */ -import QtQuick 2.8 -import QtQuick.Controls 2.1 +import QtQuick 2.9 +import QtQuick.Controls 2.2 import QtQuick.Layouts 1.3 import NosonApp 1.0 import NosonMediaScanner 1.0 diff --git a/gui/ui/ThisDevice/PlayAllButton.qml b/gui/ui/ThisDevice/PlayAllButton.qml index 450163a8..80a0d73b 100644 --- a/gui/ui/ThisDevice/PlayAllButton.qml +++ b/gui/ui/ThisDevice/PlayAllButton.qml @@ -15,8 +15,8 @@ * along with this program. If not, see . */ -import QtQuick 2.8 -import QtQuick.Controls 2.1 +import QtQuick 2.9 +import QtQuick.Controls 2.2 import "../../components" Icon { diff --git a/gui/ui/ThisDevice/QueueAllButton.qml b/gui/ui/ThisDevice/QueueAllButton.qml index f37a5de4..9b71442a 100644 --- a/gui/ui/ThisDevice/QueueAllButton.qml +++ b/gui/ui/ThisDevice/QueueAllButton.qml @@ -15,8 +15,8 @@ * along with this program. If not, see . */ -import QtQuick 2.8 -import QtQuick.Controls 2.1 +import QtQuick 2.9 +import QtQuick.Controls 2.2 import "../../components" Icon { diff --git a/gui/ui/ThisDevice/ShuffleButton.qml b/gui/ui/ThisDevice/ShuffleButton.qml index cf8c8759..66b2841d 100644 --- a/gui/ui/ThisDevice/ShuffleButton.qml +++ b/gui/ui/ThisDevice/ShuffleButton.qml @@ -15,8 +15,8 @@ * along with this program. If not, see . */ -import QtQuick 2.8 -import QtQuick.Controls 2.1 +import QtQuick 2.9 +import QtQuick.Controls 2.2 import "../../components" Icon { diff --git a/gui/ui/ThisDevice/SongsView.qml b/gui/ui/ThisDevice/SongsView.qml index ff32add8..7ed9fa65 100644 --- a/gui/ui/ThisDevice/SongsView.qml +++ b/gui/ui/ThisDevice/SongsView.qml @@ -15,9 +15,9 @@ * along with this program. If not, see . */ -import QtQuick 2.8 -import QtQuick.Controls 2.1 -import QtQml.Models 2.2 +import QtQuick 2.9 +import QtQuick.Controls 2.2 +import QtQml.Models 2.3 import NosonApp 1.0 import NosonMediaScanner 1.0 import "../../components" diff --git a/gui/ui/Welcome.qml b/gui/ui/Welcome.qml index 5919ced5..3f33f656 100644 --- a/gui/ui/Welcome.qml +++ b/gui/ui/Welcome.qml @@ -18,8 +18,8 @@ * along with this program. If not, see . */ -import QtQuick 2.8 -import QtQuick.Controls 2.1 +import QtQuick 2.9 +import QtQuick.Controls 2.2 import "../components" MusicPage { diff --git a/gui/ui/Zones.qml b/gui/ui/Zones.qml index 8219645b..725f29d8 100644 --- a/gui/ui/Zones.qml +++ b/gui/ui/Zones.qml @@ -15,9 +15,9 @@ * along with this program. If not, see . */ -import QtQuick 2.8 -import QtQuick.Controls 2.1 -import QtQml.Models 2.2 +import QtQuick 2.9 +import QtQuick.Controls 2.2 +import QtQml.Models 2.3 import NosonApp 1.0 import NosonThumbnailer 1.0 import "../components"