aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorluigi1111 <luigi1111w@gmail.com>2020-07-08 13:35:55 -0500
committerluigi1111 <luigi1111w@gmail.com>2020-07-08 13:35:55 -0500
commitbe5e6772a4035984b8f259680f0a31642872b1b8 (patch)
tree46dfa3a55f89e8c44dff1cae8377170a7f800516
parentc8693902723166c8611146b9e14fdb090818db82 (diff)
parent53066ae92b6d3796e7771c4c670322ef37fba648 (diff)
downloadmonzero-gui-be5e6772a4035984b8f259680f0a31642872b1b8.tar.gz
monzero-gui-be5e6772a4035984b8f259680f0a31642872b1b8.tar.xz
monzero-gui-be5e6772a4035984b8f259680f0a31642872b1b8.zip
Merge pull request #2948
53066ae QML: fix some Qt 5.15 warnings (selsta)
-rw-r--r--MiddlePanel.qml4
-rw-r--r--components/DatePicker.qml2
-rw-r--r--pages/Account.qml2
-rw-r--r--pages/History.qml4
-rw-r--r--pages/Receive.qml2
5 files changed, 7 insertions, 7 deletions
diff --git a/MiddlePanel.qml b/MiddlePanel.qml
index 28255c8b..3a31152e 100644
--- a/MiddlePanel.qml
+++ b/MiddlePanel.qml
@@ -265,11 +265,11 @@ Rectangle {
Connections {
ignoreUnknownSignals: false
target: transferView
- onPaymentClicked : {
+ function paymentClicked(address, paymentId, amount, mixinCount, priority, description) {
console.log("MiddlePanel: paymentClicked")
paymentClicked(address, paymentId, amount, mixinCount, priority, description)
}
- onSweepUnmixableClicked : {
+ function onSweepUnmixableClicked() {
console.log("MiddlePanel: sweepUnmixableClicked")
sweepUnmixableClicked()
}
diff --git a/components/DatePicker.qml b/components/DatePicker.qml
index 8b276c88..8a79b2e8 100644
--- a/components/DatePicker.qml
+++ b/components/DatePicker.qml
@@ -117,7 +117,7 @@ Item {
Connections {
target: datePicker
- onCurrentDateChanged: {
+ function onCurrentDateChanged() {
dateInput.setDate(datePicker.currentDate)
}
}
diff --git a/pages/Account.qml b/pages/Account.qml
index d3c058b6..1fc0039a 100644
--- a/pages/Account.qml
+++ b/pages/Account.qml
@@ -186,7 +186,7 @@ Rectangle {
delegate: Rectangle {
id: tableItem2
height: subaddressAccountListRow.subaddressAccountListItemHeight
- width: parent.width
+ width: parent ? parent.width : undefined
Layout.fillWidth: true
color: "transparent"
diff --git a/pages/History.qml b/pages/History.qml
index 82d4abfb..4746e637 100644
--- a/pages/History.qml
+++ b/pages/History.qml
@@ -569,8 +569,8 @@ Rectangle {
delegate: Rectangle {
id: delegate
property bool collapsed: root.txDataCollapsed.indexOf(hash) >= 0 ? true : false
- anchors.left: parent.left
- anchors.right: parent.right
+ anchors.left: parent ? parent.left : undefined
+ anchors.right: parent ? parent.right : undefined
height: {
if(!collapsed) return 60;
if(isout && delegate.address !== "") return 320;
diff --git a/pages/Receive.qml b/pages/Receive.qml
index 3ed70b0f..a1fd4bd4 100644
--- a/pages/Receive.qml
+++ b/pages/Receive.qml
@@ -105,7 +105,7 @@ Rectangle {
delegate: Rectangle {
id: tableItem2
height: subaddressListRow.subaddressListItemHeight
- width: parent.width
+ width: parent ? parent.width : undefined
Layout.fillWidth: true
color: "transparent"