From 875f9c8531a7ba37d717b2cbe1617fa67a5d3672 Mon Sep 17 00:00:00 2001 From: Michael Zanetti Date: Wed, 30 Jun 2021 19:46:57 +0200 Subject: [PATCH] Fix some imports that would prevent it from working on Qt 5.9 --- nymea-app/ui/components/SelectionTabs.qml | 2 +- nymea-app/ui/components/WizardPageBase.qml | 2 +- nymea-app/ui/connection/NewConnectionWizard.qml | 2 +- nymea-app/ui/mainviews/DashboardView.qml | 2 +- nymea-app/ui/thingconfiguration/SetupWizard.qml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/nymea-app/ui/components/SelectionTabs.qml b/nymea-app/ui/components/SelectionTabs.qml index f4dcc0c8..03e19c4d 100644 --- a/nymea-app/ui/components/SelectionTabs.qml +++ b/nymea-app/ui/components/SelectionTabs.qml @@ -1,6 +1,6 @@ import QtQuick 2.9 import QtQuick.Layouts 1.2 -import QtQuick.Controls 2.9 +import QtQuick.Controls 2.2 import Nymea 1.0 Rectangle { diff --git a/nymea-app/ui/components/WizardPageBase.qml b/nymea-app/ui/components/WizardPageBase.qml index 1634a9a1..ffff1aaf 100644 --- a/nymea-app/ui/components/WizardPageBase.qml +++ b/nymea-app/ui/components/WizardPageBase.qml @@ -1,5 +1,5 @@ import QtQuick 2.9 -import QtQuick.Controls 2.9 +import QtQuick.Controls 2.2 import QtQuick.Layouts 1.2 import "../components" import Nymea 1.0 diff --git a/nymea-app/ui/connection/NewConnectionWizard.qml b/nymea-app/ui/connection/NewConnectionWizard.qml index c06edeac..3b84dea4 100644 --- a/nymea-app/ui/connection/NewConnectionWizard.qml +++ b/nymea-app/ui/connection/NewConnectionWizard.qml @@ -1,5 +1,5 @@ import QtQuick 2.3 -import QtQuick.Controls 2.3 +import QtQuick.Controls 2.2 import QtQuick.Layouts 1.2 import "../components" import Nymea 1.0 diff --git a/nymea-app/ui/mainviews/DashboardView.qml b/nymea-app/ui/mainviews/DashboardView.qml index e22f3caf..d2047cfe 100644 --- a/nymea-app/ui/mainviews/DashboardView.qml +++ b/nymea-app/ui/mainviews/DashboardView.qml @@ -34,7 +34,7 @@ import QtQuick.Controls.Material 2.1 import QtQuick.Layouts 1.2 import QtCharts 2.2 import Nymea 1.0 -import Qt.labs.settings 1.1 +import Qt.labs.settings 1.0 import "../components" import "dashboard" diff --git a/nymea-app/ui/thingconfiguration/SetupWizard.qml b/nymea-app/ui/thingconfiguration/SetupWizard.qml index a0103243..36cbcbbb 100644 --- a/nymea-app/ui/thingconfiguration/SetupWizard.qml +++ b/nymea-app/ui/thingconfiguration/SetupWizard.qml @@ -578,7 +578,7 @@ Page { ' import QtQuick 2.8; import QtWebView 1.1; - import QtQuick.Controls 2.9 + import QtQuick.Controls 2.2 import Nymea 1.0; Rectangle {