2 files changed, 14 insertions, 0 deletions
diff --git a/resources/qml/device-verification/DeviceVerification.qml b/resources/qml/device-verification/DeviceVerification.qml
index 19e0c7dd..2c9486ae 100644
--- a/resources/qml/device-verification/DeviceVerification.qml
+++ b/resources/qml/device-verification/DeviceVerification.qml
@@ -267,7 +267,11 @@ ApplicationWindow {
model: 7
delegate: Rectangle {
color: "transparent"
+<<<<<<< HEAD
implicitHeight: Qt.application.font.pixelSize * 3
+=======
+ implicitHeight: Qt.application.font.pixelSize * 8
+>>>>>>> Add DeviceVerificationFlow dummy and verification test button
implicitWidth: col.width
ColumnLayout {
id: col
@@ -410,7 +414,11 @@ ApplicationWindow {
property string title: "Verification timed out"
ColumnLayout {
spacing: 16
+<<<<<<< HEAD
Label {
+=======
+ Text {
+>>>>>>> Add DeviceVerificationFlow dummy and verification test button
Layout.maximumWidth: 400
Layout.fillHeight: true
Layout.fillWidth: true
diff --git a/src/timeline/TimelineViewManager.cpp b/src/timeline/TimelineViewManager.cpp
index 8447619a..afd1acb6 100644
--- a/src/timeline/TimelineViewManager.cpp
+++ b/src/timeline/TimelineViewManager.cpp
@@ -467,3 +467,9 @@ TimelineViewManager::startDummyVerification()
{
emit deviceVerificationRequest(new DeviceVerificationFlow(this));
}
+
+void
+TimelineViewManager::startDummyVerification()
+{
+ emit deviceVerificationRequest(new DeviceVerificationFlow(this));
+}
|
