Make it work with Qt 5.9 again

This commit is contained in:
Michael Zanetti 2022-02-21 00:52:06 +01:00
parent e8f9e83abd
commit 4b6241db19
15 changed files with 18 additions and 17 deletions

View File

@ -1,6 +1,6 @@
import QtQuick 2.9 import QtQuick 2.9
import Nymea 1.0 import Nymea 1.0
import QtQuick.Controls 2.3 import QtQuick.Controls 2.2
import QtQuick.Layouts 1.2 import QtQuick.Layouts 1.2
Dialog { Dialog {

View File

@ -1,6 +1,6 @@
import QtQuick 2.8 import QtQuick 2.8
import QtQuick.Layouts 1.2 import QtQuick.Layouts 1.2
import QtQuick.Controls 2.3 import QtQuick.Controls 2.2
RowLayout { RowLayout {
id: root id: root

View File

@ -77,7 +77,7 @@ ColumnLayout {
placeholderText: root.signup ? qsTr("Pick a password") : qsTr("Password") placeholderText: root.signup ? qsTr("Pick a password") : qsTr("Password")
error: root.showErrors && !root.isValidPassword error: root.showErrors && !root.isValidPassword
palette.toolTipBase: Style.tooltipBackgroundColor // palette.toolTipBase: Style.tooltipBackgroundColor
ToolTip.visible: root.signup && focus && !root.isValidPassword ToolTip.visible: root.signup && focus && !root.isValidPassword
ToolTip.delay: 1000 ToolTip.delay: 1000
ToolTip.onVisibleChanged: print("Tooltip visible changed:", ToolTip.visible, focus, root.isValidPassword) ToolTip.onVisibleChanged: print("Tooltip visible changed:", ToolTip.visible, focus, root.isValidPassword)

View File

@ -260,6 +260,7 @@ WizardPageBase {
callback: function() { callback: function() {
var nymeaHost = hostsProxy.get(index); var nymeaHost = hostsProxy.get(index);
var connectionInfoDialog = Qt.createComponent("/ui/components/ConnectionInfoDialog.qml") var connectionInfoDialog = Qt.createComponent("/ui/components/ConnectionInfoDialog.qml")
print("**", connectionInfoDialog.errorString())
var popup = connectionInfoDialog.createObject(app,{nymeaHost: nymeaHost}) var popup = connectionInfoDialog.createObject(app,{nymeaHost: nymeaHost})
popup.open() popup.open()
} }

View File

@ -29,7 +29,7 @@
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
import QtQuick 2.4 import QtQuick 2.4
import QtQuick.Controls 2.3 import QtQuick.Controls 2.2
import QtQuick.Layouts 1.3 import QtQuick.Layouts 1.3
import "../../components" import "../../components"
import Nymea 1.0 import Nymea 1.0

View File

@ -29,7 +29,7 @@
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
import QtQuick 2.4 import QtQuick 2.4
import QtQuick.Controls 2.3 import QtQuick.Controls 2.2
import QtQuick.Layouts 1.3 import QtQuick.Layouts 1.3
import "../../components" import "../../components"
import Nymea 1.0 import Nymea 1.0

View File

@ -1,6 +1,6 @@
import QtQuick 2.3 import QtQuick 2.3
import QtQuick.Layouts 1.2 import QtQuick.Layouts 1.2
import QtQuick.Controls 2.3 import QtQuick.Controls 2.2
import QtCharts 2.3 import QtCharts 2.3
import Nymea 1.0 import Nymea 1.0
import "qrc:/ui/components/" import "qrc:/ui/components/"

View File

@ -1,6 +1,6 @@
import QtQuick 2.0 import QtQuick 2.0
import QtQuick.Layouts 1.2 import QtQuick.Layouts 1.2
import QtQuick.Controls 2.3 import QtQuick.Controls 2.2
import QtGraphicalEffects 1.0 import QtGraphicalEffects 1.0
import Nymea 1.0 import Nymea 1.0
import "qrc:/ui/components" import "qrc:/ui/components"

View File

@ -1,7 +1,7 @@
import QtQuick 2.0 import QtQuick 2.0
import QtCharts 2.3 import QtCharts 2.3
import QtQuick.Layouts 1.2 import QtQuick.Layouts 1.2
import QtQuick.Controls 2.3 import QtQuick.Controls 2.2
import Nymea 1.0 import Nymea 1.0
import "qrc:/ui/components" import "qrc:/ui/components"

View File

@ -71,8 +71,8 @@ ChartView {
for (var i = 0; i < consumers.count; i++) { for (var i = 0; i < consumers.count; i++) {
var consumer = consumers.get(i) var consumer = consumers.get(i)
colorMap[consumer] = root.colors[i % root.colors.length] colorMap[consumer] = root.colors[i % root.colors.length]
let currentPowerState = consumer.stateByName("currentPower") var currentPowerState = consumer.stateByName("currentPower")
let slice = consumersBalanceSeries.append(consumer.name, currentPowerState.value) var slice = consumersBalanceSeries.append(consumer.name, currentPowerState.value)
slice.color = root.colors[i % root.colors.length] slice.color = root.colors[i % root.colors.length]
currentPowerState.valueChanged.connect(function() { currentPowerState.valueChanged.connect(function() {
slice.value = currentPowerState.value slice.value = currentPowerState.value

View File

@ -1,6 +1,6 @@
import QtQuick 2.3 import QtQuick 2.3
import QtQuick.Layouts 1.2 import QtQuick.Layouts 1.2
import QtQuick.Controls 2.3 import QtQuick.Controls 2.2
import Nymea 1.0 import Nymea 1.0
import "qrc:/ui/components" import "qrc:/ui/components"

View File

@ -1,6 +1,6 @@
import QtQuick 2.3 import QtQuick 2.3
import QtQuick.Layouts 1.2 import QtQuick.Layouts 1.2
import QtQuick.Controls 2.3 import QtQuick.Controls 2.2
import QtCharts 2.3 import QtCharts 2.3
import Nymea 1.0 import Nymea 1.0
import "qrc:/ui/components/" import "qrc:/ui/components/"

View File

@ -1,7 +1,7 @@
import QtQuick 2.0 import QtQuick 2.0
import QtCharts 2.3 import QtCharts 2.2
import QtQuick.Layouts 1.2 import QtQuick.Layouts 1.2
import QtQuick.Controls 2.3 import QtQuick.Controls 2.2
import QtGraphicalEffects 1.0 import QtGraphicalEffects 1.0
import Nymea 1.0 import Nymea 1.0
import "qrc:/ui/components" import "qrc:/ui/components"

View File

@ -1,7 +1,7 @@
import QtQuick 2.0 import QtQuick 2.0
import QtCharts 2.3 import QtCharts 2.2
import QtQuick.Layouts 1.2 import QtQuick.Layouts 1.2
import QtQuick.Controls 2.3 import QtQuick.Controls 2.2
import Nymea 1.0 import Nymea 1.0
import "qrc:/ui/components" import "qrc:/ui/components"

View File

@ -1,7 +1,7 @@
pragma Singleton pragma Singleton
import QtQuick 2.9 import QtQuick 2.9
import Nymea 1.0 import Nymea 1.0
import QtCharts 2.3 import QtCharts 2.2
Item { Item {
id: root id: root