diff --git a/aseba/launcher/src/qml/ApplicationSelectionView.qml b/aseba/launcher/src/qml/ApplicationSelectionView.qml index d850cfc0f..73a433e8e 100644 --- a/aseba/launcher/src/qml/ApplicationSelectionView.qml +++ b/aseba/launcher/src/qml/ApplicationSelectionView.qml @@ -1,4 +1,4 @@ -import QtQuick 2.0 +import QtQuick 2.12 Item { id:item1 diff --git a/aseba/launcher/src/qml/Applications.qml b/aseba/launcher/src/qml/Applications.qml index 470c4d3c1..eb7307134 100644 --- a/aseba/launcher/src/qml/Applications.qml +++ b/aseba/launcher/src/qml/Applications.qml @@ -1,4 +1,4 @@ -import QtQuick 2.0 +import QtQuick 2.12 ListModel { id: appsModel diff --git a/aseba/launcher/src/qml/BatteryIndicator.qml b/aseba/launcher/src/qml/BatteryIndicator.qml index d4c9eed12..04e1672f9 100644 --- a/aseba/launcher/src/qml/BatteryIndicator.qml +++ b/aseba/launcher/src/qml/BatteryIndicator.qml @@ -1,4 +1,4 @@ -import QtQuick 2.0 +import QtQuick 2.12 Item { width: icon.width diff --git a/aseba/launcher/src/qml/BottomEasingStackView.qml b/aseba/launcher/src/qml/BottomEasingStackView.qml index b3527fd3e..e46e2a7f6 100644 --- a/aseba/launcher/src/qml/BottomEasingStackView.qml +++ b/aseba/launcher/src/qml/BottomEasingStackView.qml @@ -1,5 +1,5 @@ -import QtQuick 2.6 -import QtQuick.Controls 2.4 +import QtQuick 2.12 +import QtQuick.Controls 2.12 StackView { id: main_layout diff --git a/aseba/launcher/src/qml/DeviceContextMenu.qml b/aseba/launcher/src/qml/DeviceContextMenu.qml index 4389907bb..c51f17b8c 100644 --- a/aseba/launcher/src/qml/DeviceContextMenu.qml +++ b/aseba/launcher/src/qml/DeviceContextMenu.qml @@ -1,6 +1,6 @@ -import QtQuick 2.0 -import QtQuick.Controls 2.4 -import QtGraphicalEffects 1.0 +import QtQuick 2.12 +import QtQuick.Controls 2.12 +import QtGraphicalEffects 1.12 Item { id: component diff --git a/aseba/launcher/src/qml/EditableDeviceNameInput.qml b/aseba/launcher/src/qml/EditableDeviceNameInput.qml index 5474cfcea..dd8e27ec0 100644 --- a/aseba/launcher/src/qml/EditableDeviceNameInput.qml +++ b/aseba/launcher/src/qml/EditableDeviceNameInput.qml @@ -1,7 +1,7 @@ -import QtQuick.Controls 2.2 +import QtQuick.Controls 2.12 import QtQuick.Controls.Styles 1.4 -import QtGraphicalEffects 1.0 -import QtQuick 2.11 +import QtGraphicalEffects 1.12 +import QtQuick 2.12 TextField { diff --git a/aseba/launcher/src/qml/FirmwareUpdateDialog.qml b/aseba/launcher/src/qml/FirmwareUpdateDialog.qml index 6b75ff5a8..248e3aa7b 100644 --- a/aseba/launcher/src/qml/FirmwareUpdateDialog.qml +++ b/aseba/launcher/src/qml/FirmwareUpdateDialog.qml @@ -1,5 +1,5 @@ -import QtQuick 2.2 -import QtQuick.Dialogs 1.1 +import QtQuick 2.12 +import QtQuick.Dialogs 1.3 MessageDialog { property string oldVersion diff --git a/aseba/launcher/src/qml/InverseMouseArea.qml b/aseba/launcher/src/qml/InverseMouseArea.qml index 9639a8ad7..898a0ef99 100644 --- a/aseba/launcher/src/qml/InverseMouseArea.qml +++ b/aseba/launcher/src/qml/InverseMouseArea.qml @@ -4,7 +4,7 @@ License: Apache */ -import QtQuick 2.0 +import QtQuick 2.12 Item { id : component diff --git a/aseba/launcher/src/qml/SettingsMenu.qml b/aseba/launcher/src/qml/SettingsMenu.qml index cdf942052..513f27d38 100644 --- a/aseba/launcher/src/qml/SettingsMenu.qml +++ b/aseba/launcher/src/qml/SettingsMenu.qml @@ -1,6 +1,6 @@ -import QtQuick.Controls 2.3 +import QtQuick.Controls 2.12 -import QtQuick 2.11 +import QtQuick 2.12 Rectangle { color: "#535353" diff --git a/aseba/launcher/src/qml/Style.qml b/aseba/launcher/src/qml/Style.qml index 95a03e914..04a1aae21 100644 --- a/aseba/launcher/src/qml/Style.qml +++ b/aseba/launcher/src/qml/Style.qml @@ -1,5 +1,5 @@ pragma Singleton -import QtQuick 2.0 +import QtQuick 2.12 QtObject { property int window_margin: 30 diff --git a/aseba/launcher/src/qml/SvgButton.qml b/aseba/launcher/src/qml/SvgButton.qml index 920117ce1..621bc872b 100644 --- a/aseba/launcher/src/qml/SvgButton.qml +++ b/aseba/launcher/src/qml/SvgButton.qml @@ -1,5 +1,5 @@ -import QtQuick 2.11 -import QtGraphicalEffects 1.0 +import QtQuick 2.12 +import QtGraphicalEffects 1.12 Item { id:button diff --git a/aseba/launcher/src/qml/ThymioSelectionDeviceDelegate.qml b/aseba/launcher/src/qml/ThymioSelectionDeviceDelegate.qml index 4b09b0842..9f9995ac1 100644 --- a/aseba/launcher/src/qml/ThymioSelectionDeviceDelegate.qml +++ b/aseba/launcher/src/qml/ThymioSelectionDeviceDelegate.qml @@ -1,5 +1,5 @@ -import QtQuick 2.0 -import QtQuick.Controls 2.3 +import QtQuick 2.12 +import QtQuick.Controls 2.12 import org.mobsya 1.0 Item { diff --git a/aseba/launcher/src/qml/ThymioSelectionView.qml b/aseba/launcher/src/qml/ThymioSelectionView.qml index b28c03fab..1fb66baf3 100644 --- a/aseba/launcher/src/qml/ThymioSelectionView.qml +++ b/aseba/launcher/src/qml/ThymioSelectionView.qml @@ -1,6 +1,6 @@ -import QtQuick 2.11 -import QtQuick.Controls 2.3 -import QtQuick.Layouts 1.3 +import QtQuick 2.12 +import QtQuick.Controls 2.12 +import QtQuick.Layouts 1.12 import org.mobsya 1.0 Item { diff --git a/aseba/launcher/src/qml/WindowButtons.qml b/aseba/launcher/src/qml/WindowButtons.qml index 5e6b88750..c1ca11440 100644 --- a/aseba/launcher/src/qml/WindowButtons.qml +++ b/aseba/launcher/src/qml/WindowButtons.qml @@ -1,5 +1,5 @@ -import QtQuick 2.0 -import QtQuick.Controls 2.4 +import QtQuick 2.12 +import QtQuick.Controls 2.12 Item { anchors.topMargin: 30 diff --git a/aseba/launcher/src/qml/components/Button.qml b/aseba/launcher/src/qml/components/Button.qml index c6564fb0e..558928207 100644 --- a/aseba/launcher/src/qml/components/Button.qml +++ b/aseba/launcher/src/qml/components/Button.qml @@ -1,4 +1,4 @@ -import QtQuick 2.0 +import QtQuick 2.12 Rectangle { property alias text: text1.text diff --git a/aseba/launcher/src/qml/main.qml b/aseba/launcher/src/qml/main.qml index 4c03f0f87..736888d99 100644 --- a/aseba/launcher/src/qml/main.qml +++ b/aseba/launcher/src/qml/main.qml @@ -1,5 +1,5 @@ -import QtQuick 2.6 -import QtQuick.Controls 2.4 +import QtQuick 2.12 +import QtQuick.Controls 2.12 import "wirelessconfigurator" Item { diff --git a/aseba/launcher/src/qml/remoteconnection/RemoteConnectionDialog.qml b/aseba/launcher/src/qml/remoteconnection/RemoteConnectionDialog.qml index 47c949bee..bf396a4dd 100644 --- a/aseba/launcher/src/qml/remoteconnection/RemoteConnectionDialog.qml +++ b/aseba/launcher/src/qml/remoteconnection/RemoteConnectionDialog.qml @@ -1,6 +1,6 @@ -import QtQuick 2.3 +import QtQuick 2.12 import QtQuick.Layouts 1.12 -import QtQuick.Controls 2.5 +import QtQuick.Controls 2.12 import QtQuick.Controls.Styles 1.4 import "../components" import ".." diff --git a/aseba/launcher/src/qml/remoteconnection/TitleBar.qml b/aseba/launcher/src/qml/remoteconnection/TitleBar.qml index d83116262..6dac7a895 100644 --- a/aseba/launcher/src/qml/remoteconnection/TitleBar.qml +++ b/aseba/launcher/src/qml/remoteconnection/TitleBar.qml @@ -1,4 +1,4 @@ -import QtQuick 2.0 +import QtQuick 2.12 import ".." Rectangle { diff --git a/aseba/launcher/src/qml/webview.qml b/aseba/launcher/src/qml/webview.qml index a3b891572..e7a432ee6 100644 --- a/aseba/launcher/src/qml/webview.qml +++ b/aseba/launcher/src/qml/webview.qml @@ -1,4 +1,4 @@ -import QtQuick 2.0 +import QtQuick 2.12 import QtWebEngine 1.7 import QtQuick.Window 2.12 import QtQml 2.12 diff --git a/aseba/launcher/src/qml/webview_native.qml b/aseba/launcher/src/qml/webview_native.qml index 406538f5b..c78241247 100644 --- a/aseba/launcher/src/qml/webview_native.qml +++ b/aseba/launcher/src/qml/webview_native.qml @@ -1,4 +1,4 @@ -import QtQuick 2.0 +import QtQuick 2.12 import QtWebView 1.1 import QtQuick.Window 2.12 Window { diff --git a/aseba/launcher/src/qml/wirelessconfigurator/ChannelButton.qml b/aseba/launcher/src/qml/wirelessconfigurator/ChannelButton.qml index 52c77b9ac..3f16e76bf 100644 --- a/aseba/launcher/src/qml/wirelessconfigurator/ChannelButton.qml +++ b/aseba/launcher/src/qml/wirelessconfigurator/ChannelButton.qml @@ -1,4 +1,4 @@ -import QtQuick 2.0 +import QtQuick 2.12 import ".." Rectangle { diff --git a/aseba/launcher/src/qml/wirelessconfigurator/ChannelSelector.qml b/aseba/launcher/src/qml/wirelessconfigurator/ChannelSelector.qml index 004b1721a..7dcd6c328 100644 --- a/aseba/launcher/src/qml/wirelessconfigurator/ChannelSelector.qml +++ b/aseba/launcher/src/qml/wirelessconfigurator/ChannelSelector.qml @@ -1,4 +1,4 @@ -import QtQuick 2.0 +import QtQuick 2.12 ListView { id:view diff --git a/aseba/launcher/src/qml/wirelessconfigurator/NetworkIdInput.qml b/aseba/launcher/src/qml/wirelessconfigurator/NetworkIdInput.qml index 3bb4ffece..aacf2e0e1 100644 --- a/aseba/launcher/src/qml/wirelessconfigurator/NetworkIdInput.qml +++ b/aseba/launcher/src/qml/wirelessconfigurator/NetworkIdInput.qml @@ -1,5 +1,5 @@ -import QtQuick 2.0 -import QtQuick.Controls 2.5 +import QtQuick 2.12 +import QtQuick.Controls 2.12 import QtQuick.Controls.Styles 1.4 import ".." diff --git a/aseba/launcher/src/qml/wirelessconfigurator/TitleBar.qml b/aseba/launcher/src/qml/wirelessconfigurator/TitleBar.qml index 52cee712c..e7dbf248d 100644 --- a/aseba/launcher/src/qml/wirelessconfigurator/TitleBar.qml +++ b/aseba/launcher/src/qml/wirelessconfigurator/TitleBar.qml @@ -1,4 +1,4 @@ -import QtQuick 2.0 +import QtQuick 2.12 import ".." Rectangle { diff --git a/aseba/launcher/src/qml/wirelessconfigurator/WirelessConfigurator.qml b/aseba/launcher/src/qml/wirelessconfigurator/WirelessConfigurator.qml index 2edadf959..935395120 100644 --- a/aseba/launcher/src/qml/wirelessconfigurator/WirelessConfigurator.qml +++ b/aseba/launcher/src/qml/wirelessconfigurator/WirelessConfigurator.qml @@ -1,4 +1,4 @@ -import QtQuick 2.10 +import QtQuick 2.12 import QtQuick.Layouts 1.12 import org.mobsya 1.0 import "../components" diff --git a/aseba/launcher/src/qml/wirelessconfigurator/WirelessWizardWarningDialog.qml b/aseba/launcher/src/qml/wirelessconfigurator/WirelessWizardWarningDialog.qml index d120d395a..50a2f54e2 100644 --- a/aseba/launcher/src/qml/wirelessconfigurator/WirelessWizardWarningDialog.qml +++ b/aseba/launcher/src/qml/wirelessconfigurator/WirelessWizardWarningDialog.qml @@ -1,5 +1,5 @@ -import QtQuick 2.2 -import QtQuick.Dialogs 1.1 +import QtQuick 2.12 +import QtQuick.Dialogs 1.3 MessageDialog { property string oldVersion