Page MenuHomePhorge
Files F109098

D57.1731154943.diff
No OneTemporary
Actions

Size
2 KB
Referenced Files
None
Subscribers
None

D57.1731154943.diff
View Options

diff --git a/src/contents/ui/device-mgmt/Device.qml b/src/contents/ui/device-mgmt/Device.qml
--- a/src/contents/ui/device-mgmt/Device.qml
+++ b/src/contents/ui/device-mgmt/Device.qml
@@ -51,6 +51,7 @@
property var sheet: Kirigami.OverlaySheet {
id: popup
title: l10n.get('device-set-trust-level-dialog-title')
+ parent: applicationWindow().overlay
property var setTrustLevelPromise: null
property var conn: Connections {
diff --git a/src/tests/quick-tests/tst_DeviceList.qml b/src/tests/quick-tests/tst_DeviceList.qml
--- a/src/tests/quick-tests/tst_DeviceList.qml
+++ b/src/tests/quick-tests/tst_DeviceList.qml
@@ -38,6 +38,7 @@
KazvDM.DeviceList {
id: deviceList
+ anchors.fill: parent
}
TestCase {
@@ -52,7 +53,7 @@
function test_deviceList() {
verify(deviceList.model === 2);
deviceList.currentIndex = 0;
- verify(findChild(deviceList.itemAtIndex(0)));
+ verify(deviceList.itemAtIndex(0));
verify(findChild(deviceList.itemAtIndex(0), 'deviceIdLabel').text === 'some-id');
deviceList.currentIndex = 1;
tryVerify(() => findChild(deviceList.itemAtIndex(1)), 1000);
diff --git a/src/tests/quick-tests/tst_DevicePopup.qml b/src/tests/quick-tests/tst_DevicePopup.qml
--- a/src/tests/quick-tests/tst_DevicePopup.qml
+++ b/src/tests/quick-tests/tst_DevicePopup.qml
@@ -6,7 +6,7 @@
import QtQuick 2.3
import QtTest 1.0
-
+import moe.kazv.mxc.kazv 0.0 as MK
import '../../contents/ui/device-mgmt' as KazvDM
import 'test-helpers.js' as Helpers
@@ -39,7 +39,9 @@
device.sheet.open();
tryVerify(() => device.sheet.getNewTrustLevel() === 'unseen', 1000);
const buttons = findChild(device.sheet, 'trustLevelChoices');
- buttons.parent = device; // force showing, the OverlaySheet does not seem to show properly
+ if (MK.KazvUtil.kfQtMajorVersion === 5) {
+ buttons.parent = device; // force showing, the OverlaySheet does not seem to show properly
+ }
const button = findChild(buttons, 'trustLevelChoice_verified');
mouseClick(button);
tryVerify(() => device.sheet.getNewTrustLevel() === 'verified', 1000);

File Metadata

Mime Type
text/plain
Expires
Sat, Nov 9, 4:22 AM (19 h, 29 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
36741
Default Alt Text
D57.1731154943.diff (2 KB)

Event Timeline