Revert "downgrade requirements to qt-5.8"

This reverts commit bff37c8.
janbar · May 4, 2020 · 6f213dc · 6f213dc
1 parent d3d51ff
commit 6f213dc
Show file tree

Hide file tree

Showing 94 changed files with 200 additions and 211 deletions.
diff --git 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
@@ -18,8 +18,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-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
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-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
@@ -15,8 +15,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-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
@@ -18,7 +18,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-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
@@ -15,8 +15,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-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
@@ -15,8 +15,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-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
@@ -15,9 +15,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-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
@@ -15,9 +15,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-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
@@ -15,9 +15,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-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
@@ -15,9 +15,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-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
@@ -15,8 +15,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-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
@@ -15,8 +15,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-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
@@ -15,8 +15,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-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
@@ -15,8 +15,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-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
@@ -15,8 +15,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-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
@@ -15,8 +15,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-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
@@ -15,10 +15,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-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
@@ -15,10 +15,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-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
@@ -15,8 +15,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-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
@@ -15,8 +15,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-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
@@ -15,10 +15,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-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
@@ -15,8 +15,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-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
@@ -15,8 +15,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-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
@@ -15,8 +15,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-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
@@ -17,8 +17,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-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
@@ -15,8 +15,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-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
@@ -17,8 +17,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-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
@@ -15,8 +15,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-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
@@ -18,8 +18,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-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
@@ -18,8 +18,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-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
@@ -15,8 +15,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-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
@@ -18,8 +18,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-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
@@ -18,8 +18,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-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
@@ -17,8 +17,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.8
-import QtQuick.Controls 2.1
+import QtQuick 2.9
+import QtQuick.Controls 2.2
 
 MenuItem {
     text: qsTr("Remove")