diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-01-06 16:30:24 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-01-06 16:30:24 +0100 |
| commit | bf76ab58e60421a69f1e5b995de3f9bee89788fd (patch) | |
| tree | aadc42b6230a2f41e47da92528f687628a898117 | |
| parent | 90195c673a4a81a2e30665b54373519c69573b60 (diff) | |
| parent | 6644897dc61f4a15141534c893fd08b12df89bbe (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: I1c758e93a570b3b522c64b9d2f6e482a6cf0d48a
| -rw-r--r-- | examples/quick/controls/gallery/content/ChildWindow.qml | 6 | ||||
| -rw-r--r-- | src/controls/Label.qml | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/examples/quick/controls/gallery/content/ChildWindow.qml b/examples/quick/controls/gallery/content/ChildWindow.qml index 21f2489a8..a645e4766 100644 --- a/examples/quick/controls/gallery/content/ChildWindow.qml +++ b/examples/quick/controls/gallery/content/ChildWindow.qml @@ -59,7 +59,7 @@ Window { color: syspal.window anchors.fill: parent - Text { + Label { id: dimensionsText anchors.horizontalCenter: parent.horizontalCenter anchors.top: parent.top @@ -67,7 +67,7 @@ Window { horizontalAlignment: Text.AlignHCenter } - Text { + Label { id: availableDimensionsText anchors.horizontalCenter: parent.horizontalCenter anchors.top: dimensionsText.bottom @@ -75,7 +75,7 @@ Window { horizontalAlignment: Text.AlignHCenter } - Text { + Label { id: closeText anchors.horizontalCenter: parent.horizontalCenter anchors.top: availableDimensionsText.bottom diff --git a/src/controls/Label.qml b/src/controls/Label.qml index 01f2a1629..8a1020111 100644 --- a/src/controls/Label.qml +++ b/src/controls/Label.qml @@ -88,4 +88,6 @@ Text { id: pal colorGroup: enabled ? SystemPalette.Active : SystemPalette.Disabled } + Accessible.name: text + Accessible.role: Accessible.StaticText } |