From ffbf8d724f39e9c8d05ae2049e8b79a61570e235 Mon Sep 17 00:00:00 2001
From: J-P Nurmi <jpnurmi@digia.com>
Date: Wed, 12 Jun 2013 23:48:01 +0200
Subject: Support StandardKeys for Action/MenuItem::shortcut

Change-Id: I2054a59fcda26795721e5d7d04cc644220da372b
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
Reviewed-by: Caroline Chao <caroline.chao@digia.com>
---
 examples/quick/controls/gallery/main.qml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'examples')

diff --git a/examples/quick/controls/gallery/main.qml b/examples/quick/controls/gallery/main.qml
index ec00627b..32e04efd 100644
--- a/examples/quick/controls/gallery/main.qml
+++ b/examples/quick/controls/gallery/main.qml
@@ -42,7 +42,7 @@
 
 
 
-import QtQuick 2.1
+import QtQuick 2.2
 import QtQuick.Controls 1.0
 import QtQuick.Layouts 1.0
 import QtQuick.Dialogs 1.0
@@ -73,7 +73,7 @@ ApplicationWindow {
     Action {
         id: openAction
         text: "&Open"
-        shortcut: "Ctrl+O"
+        shortcut: StandardKey.Open
         iconSource: "images/document-open.png"
         onTriggered: fileDialog.open()
         tooltip: "Open an image"
@@ -82,7 +82,7 @@ ApplicationWindow {
     Action {
         id: copyAction
         text: "&Copy"
-        shortcut: "Ctrl+C"
+        shortcut: StandardKey.Copy
         iconName: "edit-copy"
         enabled: (!!activeFocusItem && !!activeFocusItem["copy"])
         onTriggered: activeFocusItem.copy()
@@ -91,7 +91,7 @@ ApplicationWindow {
     Action {
         id: cutAction
         text: "Cu&t"
-        shortcut: "Ctrl+X"
+        shortcut: StandardKey.Cut
         iconName: "edit-cut"
         enabled: (!!activeFocusItem && !!activeFocusItem["cut"])
         onTriggered: activeFocusItem.cut()
@@ -100,7 +100,7 @@ ApplicationWindow {
     Action {
         id: pasteAction
         text: "&Paste"
-        shortcut: "Ctrl+V"
+        shortcut: StandardKey.Paste
         iconName: "edit-paste"
         enabled: (!!activeFocusItem && !!activeFocusItem["paste"])
         onTriggered: activeFocusItem.paste()
@@ -185,7 +185,7 @@ ApplicationWindow {
             MenuItem { action: openAction }
             MenuItem {
                 text: "Close"
-                shortcut: "Ctrl+Q"
+                shortcut: StandardKey.Quit
                 onTriggered: Qt.quit()
             }
         }
-- 
cgit v1.2.1