Merge branch 'xenial_-_qt-5-12' into xenial_-_qt-5-12_-_wayland
commitf15337e64d4ebdf368dadf7fe06dfec0346cb89b
authorRatchanan Srirattanamet <ratchanan@ubports.com>
dateFri 2 Oct 2020, 18:44 (6 years ago)
parente239322f69372c
qml/Components/Dialogs.qml+8
@@ -271,6 +271,14 @@ MouseArea {
271271 topLevelSurfaceList.closeAllWindows();
272272 }
273273 }
274+ Button {
275+ width: parent.width
276+ text: i18n.tr("Screenshot")
277+ onClicked: {
278+ powerDialog.hide();
279+ itemGrabber.capture(shell);
280+ }
281+ }
274282 Button {
275283 width: parent.width
276284 text: i18n.tr("Cancel")
tests/qmltests/tst_OrientedShell.qml+3
@@ -1586,6 +1586,9 @@ Rectangle {
15861586 keyClick(data.key);
15871587 tryCompare(buttons[2], "activeFocus", true);
15881588
1589+ keyClick(data.key);
1590+ tryCompare(buttons[3], "activeFocus", true);
1591+
15891592 keyClick(data.key);
15901593 tryCompare(buttons[0], "activeFocus", true);
15911594