diff options
author | DeepBlueV7.X <nicolas.werner@hotmail.de> | 2020-11-15 17:07:05 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-11-15 17:07:05 +0100 |
commit | 3ec8a291b6aea9f9c0a069b10ebc122a8baec129 (patch) | |
tree | 73eb46c17c84d3e547787f61875413f3f9357018 /resources/qml | |
parent | Merge pull request #325 from trilene/webrtc-video (diff) | |
parent | Make compatible with qt 5.12 (diff) | |
download | nheko-3ec8a291b6aea9f9c0a069b10ebc122a8baec129.tar.xz |
Merge pull request #327 from kamathmanu/qtBackwardsCompatability
Make compatible with qt 5.12
Diffstat (limited to 'resources/qml')
-rw-r--r-- | resources/qml/ActiveCallBar.qml | 6 | ||||
-rw-r--r-- | resources/qml/MessageView.qml | 6 | ||||
-rw-r--r-- | resources/qml/TimelineView.qml | 12 |
3 files changed, 12 insertions, 12 deletions
diff --git a/resources/qml/ActiveCallBar.qml b/resources/qml/ActiveCallBar.qml index 2a83a8e1..282cac81 100644 --- a/resources/qml/ActiveCallBar.qml +++ b/resources/qml/ActiveCallBar.qml @@ -50,7 +50,9 @@ Rectangle { } Connections { - function onCallStateChanged(state) { + target: TimelineManager + + onCallStateChanged: { switch (state) { case WebRTCState.INITIATING: callStateLabel.text = qsTr("Initiating..."); @@ -73,8 +75,6 @@ Rectangle { stackLayout.currentIndex = 0; } } - - target: TimelineManager } Timer { diff --git a/resources/qml/MessageView.qml b/resources/qml/MessageView.qml index 09220a71..af0c0aca 100644 --- a/resources/qml/MessageView.qml +++ b/resources/qml/MessageView.qml @@ -180,13 +180,13 @@ ListView { } Connections { - function onMovementEnded() { + target: chat + + onMovementEnded: { if (y + height + 2 * chat.spacing > chat.contentY + chat.height && y < chat.contentY + chat.height) chat.model.currentIndex = index; } - - target: chat } } diff --git a/resources/qml/TimelineView.qml b/resources/qml/TimelineView.qml index 9d00442c..95143b18 100644 --- a/resources/qml/TimelineView.qml +++ b/resources/qml/TimelineView.qml @@ -128,25 +128,25 @@ Page { } Connections { - function onNewDeviceVerificationRequest(flow, transactionId, userId, deviceId, isRequest) { + target: TimelineManager + + onNewDeviceVerificationRequest: { var dialog = deviceVerificationDialog.createObject(timelineRoot, { "flow": flow }); dialog.show(); } - - target: TimelineManager } Connections { - function onOpenProfile(profile) { + target: TimelineManager.timeline + + onOpenProfile: { var userProfile = userProfileComponent.createObject(timelineRoot, { "profile": profile }); userProfile.show(); } - - target: TimelineManager.timeline } Label { |