Create a menuItem element for accessibility for top Menu

Change-Id: I2361f04af2a98642905196efec23f104897fa40e
Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>

7 files changed, 36 insertions, 13 deletions

diff --git a/tests/manual/wasm/a11y/qml_basic_item/MeetingInviteesPage.qml b/tests/manual/wasm/a11y/qml_basic_item/MeetingInviteesPage.qml
index 3921e420f6..66e5a96d4d 100644
--- a/tests/manual/wasm/a11y/qml_basic_item/MeetingInviteesPage.qml
+++ b/tests/manual/wasm/a11y/qml_basic_item/MeetingInviteesPage.qml
@@ -7,7 +7,7 @@ import QtQuick.Controls
 GroupBox {
     id: grpBox
     title: "Add Invitees"
-
+    height: parent.height - 10
     property alias nextButton: nextButton
     property alias dateAndTime: dateAndTime
     property string inviteesNameEmail
diff --git a/tests/manual/wasm/a11y/qml_basic_item/MeetingSchedulerPage.qml b/tests/manual/wasm/a11y/qml_basic_item/MeetingSchedulerPage.qml
index d932539c56..15f04c2700 100644
--- a/tests/manual/wasm/a11y/qml_basic_item/MeetingSchedulerPage.qml
+++ b/tests/manual/wasm/a11y/qml_basic_item/MeetingSchedulerPage.qml
@@ -13,6 +13,7 @@ GroupBox {
     property int calendarWeek: calendar.value
     property string meetingDescription: description.text
     property alias description: description
+    height: parent.height-10
     ColumnLayout {
         anchors.fill: parent
         spacing: 10
diff --git a/tests/manual/wasm/a11y/qml_basic_item/MeetingSummary.qml b/tests/manual/wasm/a11y/qml_basic_item/MeetingSummary.qml
index 38e9ba0d7d..f321995679 100644
--- a/tests/manual/wasm/a11y/qml_basic_item/MeetingSummary.qml
+++ b/tests/manual/wasm/a11y/qml_basic_item/MeetingSummary.qml
@@ -7,6 +7,7 @@ import QtQuick.Layouts
 GroupBox {
     id: root
     title: "Summary"
+    height: parent.height-10
     property string meetingOccurrence: "Once"
     property string onlineOfflineStatus: "offline"
     property int roomNumber: 0
diff --git a/tests/manual/wasm/a11y/qml_basic_item/MeetingTabs.qml b/tests/manual/wasm/a11y/qml_basic_item/MeetingTabs.qml
index ea9f7fbfc1..063235477a 100644
--- a/tests/manual/wasm/a11y/qml_basic_item/MeetingTabs.qml
+++ b/tests/manual/wasm/a11y/qml_basic_item/MeetingTabs.qml
@@ -6,7 +6,14 @@ import QtQuick.Controls
 
 Item {
     id: root
-    width: parent.width
+    width: parent.width -10
+    height:parent.height -10
+    property color itemColor: "lightgrey"
+        Rectangle {
+            width: parent.width
+            height: parent.height
+            color: itemColor
+        }
     enum Types {
         Invitees,
         Scheduler,
@@ -17,21 +24,24 @@ Item {
     property alias currentIndex: meetingTabs.currentIndex
     TabBar {
         id: meetingTabs
-        width: parent.width - 20
+        width: parent.width
         TabButton {
             text: qsTr("Meeting Invitees")
+            width:meetingTabs.width/3
             Accessible.role: Accessible.PageTab
             Accessible.name: text
             Accessible.description: "Tab to add meeting invitees"
         }
         TabButton {
             text: qsTr("Meeting Scheduler")
+            width:meetingTabs.width/3
             Accessible.role: Accessible.PageTab
             Accessible.name: text
             Accessible.description: "Tab to add a schedule"
         }
         TabButton {
             text: qsTr("Summary")
+            width:meetingTabs.width/3
             Accessible.role: Accessible.PageTab
             Accessible.name: text
             Accessible.description: "Tab to add meeting summary"
diff --git a/tests/manual/wasm/a11y/qml_basic_item/WasmListView.qml b/tests/manual/wasm/a11y/qml_basic_item/WasmListView.qml
index b72f18d55b..9cda71060c 100644
--- a/tests/manual/wasm/a11y/qml_basic_item/WasmListView.qml
+++ b/tests/manual/wasm/a11y/qml_basic_item/WasmListView.qml
@@ -59,7 +59,7 @@ Rectangle {
             }
         }
         delegate: Rectangle {
-            width: parent.width
+            width: wasmList.width
             height: 50
             color: index % 2 === 0 ? "#F5F5F5" : "#FFFFFF"
 
diff --git a/tests/manual/wasm/a11y/qml_basic_item/WasmMenu.qml b/tests/manual/wasm/a11y/qml_basic_item/WasmMenu.qml
index af1aec6a0d..a3a3359466 100644
--- a/tests/manual/wasm/a11y/qml_basic_item/WasmMenu.qml
+++ b/tests/manual/wasm/a11y/qml_basic_item/WasmMenu.qml
@@ -10,9 +10,10 @@ MenuBar {
     signal showDate
     signal showAboutDialog
     Menu {
-        title: "&Chrono"
+        title: "Chrono"
+
         MenuItem {
-            text: "&Date"
+            text: "Date"
             Accessible.role: Accessible.ButtonMenu
             Accessible.name: text
             Accessible.description: text
@@ -21,7 +22,7 @@ MenuBar {
             }
         }
         MenuItem {
-            text: "&Time"
+            text: "Time"
             Accessible.role: Accessible.ButtonMenu
             Accessible.name: text
             Accessible.description: text
@@ -31,10 +32,10 @@ MenuBar {
         }
     }
     Menu {
-        title: "&Help"
+        title: "Help"
 
         MenuItem {
-            text: "&about"
+            text: "About"
             Accessible.role: Accessible.ButtonMenu
             Accessible.name: text
             Accessible.description: text
@@ -43,4 +44,11 @@ MenuBar {
             }
         }
     }
+    delegate: MenuBarItem {
+           id: menuBarItem
+           Accessible.role: Accessible.ButtonMenu
+           Accessible.name: menuBarItem.text
+           Accessible.description: menuBarItem.text
+
+       }
 }
diff --git a/tests/manual/wasm/a11y/qml_basic_item/main.qml b/tests/manual/wasm/a11y/qml_basic_item/main.qml
index 3e6e53b1de..1dec0602e5 100644
--- a/tests/manual/wasm/a11y/qml_basic_item/main.qml
+++ b/tests/manual/wasm/a11y/qml_basic_item/main.qml
@@ -71,24 +71,27 @@ ApplicationWindow {
     }
 
     Rectangle {
-        width: parent.width - 40
-        height: parent.height - wasmToolbar.height - wasmMenu.height - 40
+        width: parent.width - 30
+        height: parent.height - wasmToolbar.height - wasmMenu.height - 30
         border.color: "black"
         border.width: 1
+        id:outerRect
         anchors {
             left: parent.left
             leftMargin: 20
             top: wasmToolbar.bottom
             topMargin: 10
+            bottomMargin: 10
         }
 
         MeetingTabs {
             id: meetingTabs
+            parent:outerRect
             anchors {
                 centerIn: parent
             }
-            height: parent.height - 10
-            width: parent.width - 10
+            height: parent.height - 20
+            width: parent.width - 20
         }
     }
 }