summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaroline Chao <caroline.chao@digia.com>2013-03-19 22:25:26 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-03-20 10:31:51 +0100
commit86a72e7abb79237fddcb85b07e9ea0b9b5f0a945 (patch)
tree8c35d1396927fbd17906bf87a431d5ed4d30d964
parente1e7e4212bcb43aab7a578df5c718ad311ea61f6 (diff)
downloadqtquickcontrols-86a72e7abb79237fddcb85b07e9ea0b9b5f0a945.tar.gz
Tests: Fix manual tests using deprecated ContextMenu
Change-Id: I24d99862113ea427afef0af95b96996d750ebe5c Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
-rw-r--r--tests/manual/ContextMenu.qml4
-rw-r--r--tests/manual/WindowContextMenu.qml2
2 files changed, 3 insertions, 3 deletions
diff --git a/tests/manual/ContextMenu.qml b/tests/manual/ContextMenu.qml
index 6310ef7d..2786bc83 100644
--- a/tests/manual/ContextMenu.qml
+++ b/tests/manual/ContextMenu.qml
@@ -63,7 +63,7 @@ Rectangle {
text : "Click to set color"
}
- ContextMenu {
+ Menu {
id : editMenu
MenuItem { text : "orange" ; onTriggered: selectedColor = text }
MenuItem { text : "lightsteelblue" ; onTriggered: selectedColor = text }
@@ -76,7 +76,7 @@ Rectangle {
id: mouse
anchors.fill: parent
acceptedButtons : Qt.LeftButton
- onClicked: editMenu.showPopup(mouseX, mouseY, 0)
+ onClicked: editMenu.popup()
}
}
}
diff --git a/tests/manual/WindowContextMenu.qml b/tests/manual/WindowContextMenu.qml
index 9989ae03..ec9af904 100644
--- a/tests/manual/WindowContextMenu.qml
+++ b/tests/manual/WindowContextMenu.qml
@@ -54,7 +54,7 @@ Window {
text : editMenu.selectedIndex >= 0 ? editMenu.items[editMenu.selectedIndex].text : "No selection"
}
- ContextMenu {
+ Menu {
id : editMenu
MenuItem {