summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Jan Mulder <jlmulder@xs4all.nl>2017-10-29 08:44:06 +0100
committerGravatar Dirk Hohndel <dirk@hohndel.org>2017-11-19 12:20:43 -0800
commitf3d978b8a5fb6511aa0c1c611cf9b0394fdc125b (patch)
tree4efcdadfbadbff767ec06d56363c2da2f0381a23
parent3b5375d553a0e7d328d732457989a4ca97bab4fc (diff)
downloadsubsurface-f3d978b8a5fb6511aa0c1c611cf9b0394fdc125b.tar.gz
QML UI: QtQuick to 2.6
Upgrade QtQuick to 2.6. Seeing a small artifact in the application header, lets see what happens when upgrading more includes. Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
-rw-r--r--map-widget/qml/MapWidget.qml2
-rw-r--r--map-widget/qml/MapWidgetContextMenu.qml2
-rw-r--r--map-widget/qml/MapWidgetError.qml2
-rw-r--r--mobile-widgets/qml/About.qml2
-rw-r--r--mobile-widgets/qml/CloudCredentials.qml2
-rw-r--r--mobile-widgets/qml/DiveDetails.qml2
-rw-r--r--mobile-widgets/qml/DiveDetailsEdit.qml2
-rw-r--r--mobile-widgets/qml/DiveDetailsView.qml2
-rw-r--r--mobile-widgets/qml/Log.qml2
-rw-r--r--mobile-widgets/qml/Settings.qml2
-rw-r--r--mobile-widgets/qml/SsrfButton.qml2
-rw-r--r--mobile-widgets/qml/SsrfCheckBox.qml2
-rw-r--r--mobile-widgets/qml/SsrfSwitch.qml2
-rw-r--r--mobile-widgets/qml/StartPage.qml2
-rw-r--r--mobile-widgets/qml/ThemeTest.qml2
15 files changed, 15 insertions, 15 deletions
diff --git a/map-widget/qml/MapWidget.qml b/map-widget/qml/MapWidget.qml
index c7904fc5f..646d2f993 100644
--- a/map-widget/qml/MapWidget.qml
+++ b/map-widget/qml/MapWidget.qml
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: GPL-2.0
-import QtQuick 2.0
+import QtQuick 2.6
import QtLocation 5.3
import QtPositioning 5.3
import org.subsurfacedivelog.mobile 1.0
diff --git a/map-widget/qml/MapWidgetContextMenu.qml b/map-widget/qml/MapWidgetContextMenu.qml
index 17450a729..a7cb568b3 100644
--- a/map-widget/qml/MapWidgetContextMenu.qml
+++ b/map-widget/qml/MapWidgetContextMenu.qml
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: GPL-2.0
-import QtQuick 2.0
+import QtQuick 2.6
Item {
id: container
diff --git a/map-widget/qml/MapWidgetError.qml b/map-widget/qml/MapWidgetError.qml
index 346e95f07..2091a64ed 100644
--- a/map-widget/qml/MapWidgetError.qml
+++ b/map-widget/qml/MapWidgetError.qml
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: GPL-2.0
-import QtQuick 2.0
+import QtQuick 2.6
Item {
Text {
diff --git a/mobile-widgets/qml/About.qml b/mobile-widgets/qml/About.qml
index 2bf51b61d..18baed037 100644
--- a/mobile-widgets/qml/About.qml
+++ b/mobile-widgets/qml/About.qml
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: GPL-2.0
-import QtQuick 2.3
+import QtQuick 2.6
import QtQuick.Layouts 1.1
import org.kde.kirigami 2.2 as Kirigami
import org.subsurfacedivelog.mobile 1.0
diff --git a/mobile-widgets/qml/CloudCredentials.qml b/mobile-widgets/qml/CloudCredentials.qml
index 2d45b4f23..7841549ed 100644
--- a/mobile-widgets/qml/CloudCredentials.qml
+++ b/mobile-widgets/qml/CloudCredentials.qml
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: GPL-2.0
-import QtQuick 2.3
+import QtQuick 2.6
import QtQuick.Controls 2.0 as Controls
import QtQuick.Window 2.2
import QtQuick.Dialogs 1.2
diff --git a/mobile-widgets/qml/DiveDetails.qml b/mobile-widgets/qml/DiveDetails.qml
index 4f2f70829..19d0de34a 100644
--- a/mobile-widgets/qml/DiveDetails.qml
+++ b/mobile-widgets/qml/DiveDetails.qml
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: GPL-2.0
-import QtQuick 2.4
+import QtQuick 2.6
import QtQuick.Controls 2.0
import QtQuick.Dialogs 1.2
import QtQuick.Layouts 1.2
diff --git a/mobile-widgets/qml/DiveDetailsEdit.qml b/mobile-widgets/qml/DiveDetailsEdit.qml
index be31babab..8c9bcd250 100644
--- a/mobile-widgets/qml/DiveDetailsEdit.qml
+++ b/mobile-widgets/qml/DiveDetailsEdit.qml
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: GPL-2.0
-import QtQuick 2.3
+import QtQuick 2.6
import QtQuick.Controls 2.0 as Controls
import QtQuick.Dialogs 1.2
import QtQuick.Layouts 1.1
diff --git a/mobile-widgets/qml/DiveDetailsView.qml b/mobile-widgets/qml/DiveDetailsView.qml
index c0afc6779..cfe270dbd 100644
--- a/mobile-widgets/qml/DiveDetailsView.qml
+++ b/mobile-widgets/qml/DiveDetailsView.qml
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: GPL-2.0
-import QtQuick 2.3
+import QtQuick 2.6
/*
import QtWebView 1.0
*/
diff --git a/mobile-widgets/qml/Log.qml b/mobile-widgets/qml/Log.qml
index 8ac894774..46a5098b7 100644
--- a/mobile-widgets/qml/Log.qml
+++ b/mobile-widgets/qml/Log.qml
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: GPL-2.0
-import QtQuick 2.3
+import QtQuick 2.6
import QtQuick.Window 2.2
import QtQuick.Dialogs 1.2
import QtQuick.Layouts 1.1
diff --git a/mobile-widgets/qml/Settings.qml b/mobile-widgets/qml/Settings.qml
index 2410b082d..3899919bd 100644
--- a/mobile-widgets/qml/Settings.qml
+++ b/mobile-widgets/qml/Settings.qml
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: GPL-2.0
-import QtQuick 2.3
+import QtQuick 2.6
import QtQuick.Controls 2.0 as Controls
import QtQuick.Window 2.2
import QtQuick.Dialogs 1.2
diff --git a/mobile-widgets/qml/SsrfButton.qml b/mobile-widgets/qml/SsrfButton.qml
index 1b9e86198..c9441995e 100644
--- a/mobile-widgets/qml/SsrfButton.qml
+++ b/mobile-widgets/qml/SsrfButton.qml
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: GPL-2.0
-import QtQuick 2.3
+import QtQuick 2.6
import QtQuick.Controls 2.2
import org.kde.kirigami 2.2 as Kirigami
diff --git a/mobile-widgets/qml/SsrfCheckBox.qml b/mobile-widgets/qml/SsrfCheckBox.qml
index 9002c02e0..f308a1ee3 100644
--- a/mobile-widgets/qml/SsrfCheckBox.qml
+++ b/mobile-widgets/qml/SsrfCheckBox.qml
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: GPL-2.0
-import QtQuick 2.3
+import QtQuick 2.6
import QtQuick.Controls 2.2
import org.kde.kirigami 2.2 as Kirigami
diff --git a/mobile-widgets/qml/SsrfSwitch.qml b/mobile-widgets/qml/SsrfSwitch.qml
index baa492065..fbf587f73 100644
--- a/mobile-widgets/qml/SsrfSwitch.qml
+++ b/mobile-widgets/qml/SsrfSwitch.qml
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: GPL-2.0
-import QtQuick 2.3
+import QtQuick 2.6
import QtQuick.Controls 2.2
import org.kde.kirigami 2.2 as Kirigami
diff --git a/mobile-widgets/qml/StartPage.qml b/mobile-widgets/qml/StartPage.qml
index b8617c38f..7b364b6f7 100644
--- a/mobile-widgets/qml/StartPage.qml
+++ b/mobile-widgets/qml/StartPage.qml
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: GPL-2.0
-import QtQuick 2.5
+import QtQuick 2.6
import QtQuick.Layouts 1.1
import QtQuick.Controls 2.0 as Controls
import org.kde.kirigami 2.2 as Kirigami
diff --git a/mobile-widgets/qml/ThemeTest.qml b/mobile-widgets/qml/ThemeTest.qml
index aff45bb32..1e51ead76 100644
--- a/mobile-widgets/qml/ThemeTest.qml
+++ b/mobile-widgets/qml/ThemeTest.qml
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: GPL-2.0
-import QtQuick 2.5
+import QtQuick 2.6
import QtQuick.Layouts 1.1
import QtQuick.Controls 2.0 as Controls
import QtQuick.Window 2.2