From 4b6241db195383fbb19161fe6a0356efc7a4969e Mon Sep 17 00:00:00 2001 From: Michael Zanetti Date: Mon, 21 Feb 2022 00:52:06 +0100 Subject: [PATCH] Make it work with Qt 5.9 again --- nymea-app/ui/components/ConnectionInfoDialog.qml | 2 +- nymea-app/ui/components/NymeaSpinBox.qml | 2 +- nymea-app/ui/components/PasswordTextField.qml | 2 +- nymea-app/ui/connection/NewConnectionWizard.qml | 1 + nymea-app/ui/connection/wifisetup/ConnectWiFiPage.qml | 2 +- nymea-app/ui/connection/wifisetup/WirelessSetupPage.qml | 2 +- nymea-app/ui/mainviews/energy/ConsumerStats.qml | 2 +- nymea-app/ui/mainviews/energy/ConsumersBarChart.qml | 2 +- nymea-app/ui/mainviews/energy/ConsumersHistory.qml | 2 +- nymea-app/ui/mainviews/energy/ConsumersPieChart.qml | 4 ++-- nymea-app/ui/mainviews/energy/EnergySettingsPage.qml | 2 +- nymea-app/ui/mainviews/energy/PowerBalanceStats.qml | 2 +- .../ui/mainviews/energy/PowerConsumptionBalanceHistory.qml | 4 ++-- .../ui/mainviews/energy/PowerProductionBalanceHistory.qml | 4 ++-- nymea-app/ui/utils/NymeaUtils.qml | 2 +- 15 files changed, 18 insertions(+), 17 deletions(-) diff --git a/nymea-app/ui/components/ConnectionInfoDialog.qml b/nymea-app/ui/components/ConnectionInfoDialog.qml index fded3852..bbe7fad3 100644 --- a/nymea-app/ui/components/ConnectionInfoDialog.qml +++ b/nymea-app/ui/components/ConnectionInfoDialog.qml @@ -1,6 +1,6 @@ import QtQuick 2.9 import Nymea 1.0 -import QtQuick.Controls 2.3 +import QtQuick.Controls 2.2 import QtQuick.Layouts 1.2 Dialog { diff --git a/nymea-app/ui/components/NymeaSpinBox.qml b/nymea-app/ui/components/NymeaSpinBox.qml index f0fa03d1..77d12938 100644 --- a/nymea-app/ui/components/NymeaSpinBox.qml +++ b/nymea-app/ui/components/NymeaSpinBox.qml @@ -1,6 +1,6 @@ import QtQuick 2.8 import QtQuick.Layouts 1.2 -import QtQuick.Controls 2.3 +import QtQuick.Controls 2.2 RowLayout { id: root diff --git a/nymea-app/ui/components/PasswordTextField.qml b/nymea-app/ui/components/PasswordTextField.qml index 286d6e31..0af67a4c 100644 --- a/nymea-app/ui/components/PasswordTextField.qml +++ b/nymea-app/ui/components/PasswordTextField.qml @@ -77,7 +77,7 @@ ColumnLayout { placeholderText: root.signup ? qsTr("Pick a password") : qsTr("Password") error: root.showErrors && !root.isValidPassword - palette.toolTipBase: Style.tooltipBackgroundColor +// palette.toolTipBase: Style.tooltipBackgroundColor ToolTip.visible: root.signup && focus && !root.isValidPassword ToolTip.delay: 1000 ToolTip.onVisibleChanged: print("Tooltip visible changed:", ToolTip.visible, focus, root.isValidPassword) diff --git a/nymea-app/ui/connection/NewConnectionWizard.qml b/nymea-app/ui/connection/NewConnectionWizard.qml index b09514f9..6b0a5d5c 100644 --- a/nymea-app/ui/connection/NewConnectionWizard.qml +++ b/nymea-app/ui/connection/NewConnectionWizard.qml @@ -260,6 +260,7 @@ WizardPageBase { callback: function() { var nymeaHost = hostsProxy.get(index); var connectionInfoDialog = Qt.createComponent("/ui/components/ConnectionInfoDialog.qml") + print("**", connectionInfoDialog.errorString()) var popup = connectionInfoDialog.createObject(app,{nymeaHost: nymeaHost}) popup.open() } diff --git a/nymea-app/ui/connection/wifisetup/ConnectWiFiPage.qml b/nymea-app/ui/connection/wifisetup/ConnectWiFiPage.qml index 915dba6a..0d494203 100644 --- a/nymea-app/ui/connection/wifisetup/ConnectWiFiPage.qml +++ b/nymea-app/ui/connection/wifisetup/ConnectWiFiPage.qml @@ -29,7 +29,7 @@ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ import QtQuick 2.4 -import QtQuick.Controls 2.3 +import QtQuick.Controls 2.2 import QtQuick.Layouts 1.3 import "../../components" import Nymea 1.0 diff --git a/nymea-app/ui/connection/wifisetup/WirelessSetupPage.qml b/nymea-app/ui/connection/wifisetup/WirelessSetupPage.qml index 25340696..d99e4aae 100644 --- a/nymea-app/ui/connection/wifisetup/WirelessSetupPage.qml +++ b/nymea-app/ui/connection/wifisetup/WirelessSetupPage.qml @@ -29,7 +29,7 @@ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ import QtQuick 2.4 -import QtQuick.Controls 2.3 +import QtQuick.Controls 2.2 import QtQuick.Layouts 1.3 import "../../components" import Nymea 1.0 diff --git a/nymea-app/ui/mainviews/energy/ConsumerStats.qml b/nymea-app/ui/mainviews/energy/ConsumerStats.qml index c5c793bd..6033bed1 100644 --- a/nymea-app/ui/mainviews/energy/ConsumerStats.qml +++ b/nymea-app/ui/mainviews/energy/ConsumerStats.qml @@ -1,6 +1,6 @@ import QtQuick 2.3 import QtQuick.Layouts 1.2 -import QtQuick.Controls 2.3 +import QtQuick.Controls 2.2 import QtCharts 2.3 import Nymea 1.0 import "qrc:/ui/components/" diff --git a/nymea-app/ui/mainviews/energy/ConsumersBarChart.qml b/nymea-app/ui/mainviews/energy/ConsumersBarChart.qml index 2000f714..c2c8d560 100644 --- a/nymea-app/ui/mainviews/energy/ConsumersBarChart.qml +++ b/nymea-app/ui/mainviews/energy/ConsumersBarChart.qml @@ -1,6 +1,6 @@ import QtQuick 2.0 import QtQuick.Layouts 1.2 -import QtQuick.Controls 2.3 +import QtQuick.Controls 2.2 import QtGraphicalEffects 1.0 import Nymea 1.0 import "qrc:/ui/components" diff --git a/nymea-app/ui/mainviews/energy/ConsumersHistory.qml b/nymea-app/ui/mainviews/energy/ConsumersHistory.qml index 7f654eff..0f225698 100644 --- a/nymea-app/ui/mainviews/energy/ConsumersHistory.qml +++ b/nymea-app/ui/mainviews/energy/ConsumersHistory.qml @@ -1,7 +1,7 @@ import QtQuick 2.0 import QtCharts 2.3 import QtQuick.Layouts 1.2 -import QtQuick.Controls 2.3 +import QtQuick.Controls 2.2 import Nymea 1.0 import "qrc:/ui/components" diff --git a/nymea-app/ui/mainviews/energy/ConsumersPieChart.qml b/nymea-app/ui/mainviews/energy/ConsumersPieChart.qml index ea3c1aa9..186523ab 100644 --- a/nymea-app/ui/mainviews/energy/ConsumersPieChart.qml +++ b/nymea-app/ui/mainviews/energy/ConsumersPieChart.qml @@ -71,8 +71,8 @@ ChartView { for (var i = 0; i < consumers.count; i++) { var consumer = consumers.get(i) colorMap[consumer] = root.colors[i % root.colors.length] - let currentPowerState = consumer.stateByName("currentPower") - let slice = consumersBalanceSeries.append(consumer.name, currentPowerState.value) + var currentPowerState = consumer.stateByName("currentPower") + var slice = consumersBalanceSeries.append(consumer.name, currentPowerState.value) slice.color = root.colors[i % root.colors.length] currentPowerState.valueChanged.connect(function() { slice.value = currentPowerState.value diff --git a/nymea-app/ui/mainviews/energy/EnergySettingsPage.qml b/nymea-app/ui/mainviews/energy/EnergySettingsPage.qml index 5b3d791d..57f7bc19 100644 --- a/nymea-app/ui/mainviews/energy/EnergySettingsPage.qml +++ b/nymea-app/ui/mainviews/energy/EnergySettingsPage.qml @@ -1,6 +1,6 @@ import QtQuick 2.3 import QtQuick.Layouts 1.2 -import QtQuick.Controls 2.3 +import QtQuick.Controls 2.2 import Nymea 1.0 import "qrc:/ui/components" diff --git a/nymea-app/ui/mainviews/energy/PowerBalanceStats.qml b/nymea-app/ui/mainviews/energy/PowerBalanceStats.qml index 4d2628cf..f8e37d31 100644 --- a/nymea-app/ui/mainviews/energy/PowerBalanceStats.qml +++ b/nymea-app/ui/mainviews/energy/PowerBalanceStats.qml @@ -1,6 +1,6 @@ import QtQuick 2.3 import QtQuick.Layouts 1.2 -import QtQuick.Controls 2.3 +import QtQuick.Controls 2.2 import QtCharts 2.3 import Nymea 1.0 import "qrc:/ui/components/" diff --git a/nymea-app/ui/mainviews/energy/PowerConsumptionBalanceHistory.qml b/nymea-app/ui/mainviews/energy/PowerConsumptionBalanceHistory.qml index e0e01562..18541e72 100644 --- a/nymea-app/ui/mainviews/energy/PowerConsumptionBalanceHistory.qml +++ b/nymea-app/ui/mainviews/energy/PowerConsumptionBalanceHistory.qml @@ -1,7 +1,7 @@ import QtQuick 2.0 -import QtCharts 2.3 +import QtCharts 2.2 import QtQuick.Layouts 1.2 -import QtQuick.Controls 2.3 +import QtQuick.Controls 2.2 import QtGraphicalEffects 1.0 import Nymea 1.0 import "qrc:/ui/components" diff --git a/nymea-app/ui/mainviews/energy/PowerProductionBalanceHistory.qml b/nymea-app/ui/mainviews/energy/PowerProductionBalanceHistory.qml index bd8a5ad1..07d275fb 100644 --- a/nymea-app/ui/mainviews/energy/PowerProductionBalanceHistory.qml +++ b/nymea-app/ui/mainviews/energy/PowerProductionBalanceHistory.qml @@ -1,7 +1,7 @@ import QtQuick 2.0 -import QtCharts 2.3 +import QtCharts 2.2 import QtQuick.Layouts 1.2 -import QtQuick.Controls 2.3 +import QtQuick.Controls 2.2 import Nymea 1.0 import "qrc:/ui/components" diff --git a/nymea-app/ui/utils/NymeaUtils.qml b/nymea-app/ui/utils/NymeaUtils.qml index 53ef3aa5..91026c30 100644 --- a/nymea-app/ui/utils/NymeaUtils.qml +++ b/nymea-app/ui/utils/NymeaUtils.qml @@ -1,7 +1,7 @@ pragma Singleton import QtQuick 2.9 import Nymea 1.0 -import QtCharts 2.3 +import QtCharts 2.2 Item { id: root