@@ -64,6 +64,7 @@ Item {
65 anchors.fill: parent
65 anchors.fill: parent
66 readOnly: true
66 readOnly: true
@@ -82,9 +83,9 @@ Item {
82 onActivated: log.text = "Activated " + action + "\n" + log.text
83 onActivated: log.text = "Activated " + action + "\n" + log.text
85− onCloseClicked: log.text = "Close\n" + log.text
86+ onCloseClicked: { log.text = "Close\n" + log.text }
86− onMinimizeClicked: log.text = "Minimize\n" + log.text
87+ onMinimizeClicked: { log.text = "Minimize\n" + log.text }
87− onMaximizeClicked: log.text = "Maximize\n" + log.text
88+ onMaximizeClicked: { log.text = "Maximize\n" + log.text }
90 SignalSpy {
91 SignalSpy {
@@ -103,9 +104,9 @@ Item {
105 function test_windowControlButtons_data() {
106 function test_windowControlButtons_data() {
106− return [ { tag: "close", controlName: "closeWindowButton", signal: "close"},
107+ return [ { tag: "close", controlName: "closeWindowButton", signal: "closeClicked"},
107− { tag: "minimize", controlName: "minimizeWindowButton", signal: "minimize"},
108+ { tag: "minimize", controlName: "minimizeWindowButton", signal: "minimizeClicked"},
108− { tag: "maximize", controlName: "maximizeWindowButton", signal: "maximize"}];
109+ { tag: "maximize", controlName: "maximizeWindowButton", signal: "maximizeClicked"}];
111 function test_windowControlButtons(data) {
112 function test_windowControlButtons(data) {
@@ -158,17 +159,14 @@ Item {
159 var menuBar = findChild(decoration, "menuBar");
160 var menuBar = findChild(decoration, "menuBar");
160 verify(menuBar);
161 verify(menuBar);
161− verify(menuBar.enableMnemonic === false, "Menubar should not show shortcuts")
163 keyPress(Qt.Key_Alt, Qt.NoModifier);
163 keyPress(Qt.Key_Alt, Qt.NoModifier);
164 tryCompare(menuLoader, "opacity", 1);
164 tryCompare(menuLoader, "opacity", 1);
165 tryCompare(titleLabel, "opacity", 0);
165 tryCompare(titleLabel, "opacity", 0);
166− compare(menuBar.enableMnemonic, true, "Menubar should show shortcuts when long alt pressed");
168 keyRelease(Qt.Key_Alt, Qt.NoModifier);
167 keyRelease(Qt.Key_Alt, Qt.NoModifier);
169 tryCompare(menuLoader, "opacity", 0);
168 tryCompare(menuLoader, "opacity", 0);
170 tryCompare(titleLabel, "opacity", 1);
169 tryCompare(titleLabel, "opacity", 1);
171− compare(menuBar.enableMnemonic, false, "Menubar should not show shortcuts after long alt pressed");