diff options
| author | Gabriel de Dietrich <gabriel.dedietrich@digia.com> | 2013-09-18 15:19:06 +0200 |
|---|---|---|
| committer | Gabriel de Dietrich <gabriel.dedietrich@digia.com> | 2013-09-18 15:19:06 +0200 |
| commit | 46f3cc477fc00aae887f085e063d6cb10bfdcd4c (patch) | |
| tree | 0585601759ccbae2ed2abecedaf16e06b80676d0 /examples/quick/controls | |
| parent | 4c184095d378622fb0c3bb1692b331b3cc04e010 (diff) | |
| parent | 04e000d2b1719696581bb4ae6ec21e39236ef38c (diff) | |
Merge branch 'stable' into dev
Conflicts:
src/controls/qquickaction.cpp
Change-Id: I85255ba5c27c0d8ea023d0867e5963d43f8f1ddb
Diffstat (limited to 'examples/quick/controls')
| -rw-r--r-- | examples/quick/controls/gallery/main.qml | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/examples/quick/controls/gallery/main.qml b/examples/quick/controls/gallery/main.qml index 3da3aa015..4631b37c5 100644 --- a/examples/quick/controls/gallery/main.qml +++ b/examples/quick/controls/gallery/main.qml @@ -111,20 +111,20 @@ ApplicationWindow { Action { id: a1 - text: "Align Left" + text: "Align &Left" checkable: true Component.onCompleted: checked = true } Action { id: a2 - text: "Center" + text: "&Center" checkable: true } Action { id: a3 - text: "Align Right" + text: "Align &Right" checkable: true } } @@ -138,18 +138,18 @@ ApplicationWindow { MenuItem { action: pasteAction } MenuSeparator {} Menu { - title: "Text Format" + title: "Text &Format" MenuItem { action: a1 } MenuItem { action: a2 } MenuItem { action: a3 } MenuSeparator { } - MenuItem { text: "Allow Hyphenation"; checkable: true } + MenuItem { text: "Allow &Hyphenation"; checkable: true } } Menu { - title: "Font Style" - MenuItem { text: "Bold"; checkable: true } - MenuItem { text: "Italic"; checkable: true } - MenuItem { text: "Underline"; checkable: true } + title: "Font &Style" + MenuItem { text: "&Bold"; checkable: true } + MenuItem { text: "&Italic"; checkable: true } + MenuItem { text: "&Underline"; checkable: true } } } |