@@ -64,6 +64,7 @@ Item {
6464 id: log
6565 anchors.fill: parent
6666 readOnly: true
67+ color: "black"
6768 }
6869 }
6970
@@ -82,9 +83,9 @@ Item {
8283 onActivated: log.text = "Activated " + action + "\n" + log.text
8384 }
8485
85− onCloseClicked: log.text = "Close\n" + log.text
86− onMinimizeClicked: log.text = "Minimize\n" + log.text
87− onMaximizeClicked: log.text = "Maximize\n" + log.text
86+ onCloseClicked: { log.text = "Close\n" + log.text }
87+ onMinimizeClicked: { log.text = "Minimize\n" + log.text }
88+ onMaximizeClicked: { log.text = "Maximize\n" + log.text }
8889 }
8990
9091 SignalSpy {
@@ -103,9 +104,9 @@ Item {
103104 }
104105
105106 function test_windowControlButtons_data() {
106− return [ { tag: "close", controlName: "closeWindowButton", signal: "close"},
107− { tag: "minimize", controlName: "minimizeWindowButton", signal: "minimize"},
108− { tag: "maximize", controlName: "maximizeWindowButton", signal: "maximize"}];
107+ return [ { tag: "close", controlName: "closeWindowButton", signal: "closeClicked"},
108+ { tag: "minimize", controlName: "minimizeWindowButton", signal: "minimizeClicked"},
109+ { tag: "maximize", controlName: "maximizeWindowButton", signal: "maximizeClicked"}];
109110 }
110111
111112 function test_windowControlButtons(data) {
@@ -158,17 +159,14 @@ Item {
158159
159160 var menuBar = findChild(decoration, "menuBar");
160161 verify(menuBar);
161− verify(menuBar.enableMnemonic === false, "Menubar should not show shortcuts")
162162
163163 keyPress(Qt.Key_Alt, Qt.NoModifier);
164164 tryCompare(menuLoader, "opacity", 1);
165165 tryCompare(titleLabel, "opacity", 0);
166− compare(menuBar.enableMnemonic, true, "Menubar should show shortcuts when long alt pressed");
167166
168167 keyRelease(Qt.Key_Alt, Qt.NoModifier);
169168 tryCompare(menuLoader, "opacity", 0);
170169 tryCompare(titleLabel, "opacity", 1);
171− compare(menuBar.enableMnemonic, false, "Menubar should not show shortcuts after long alt pressed");
172170 }
173171 }
174172}