Menu renamed to ContextMenu

Change-Id: Ie2563ec9c5a3c4d8a47503cafc5eddd40fada67b
Reviewed-by: Tomasz Olszak <olszak.tomasz@gmail.com>

diff --git a/examples/touch/content/ContextMenuPage.qml b/examples/touch/content/ContextMenuPage.qml
index 73174a8..1856f23 100644 (file)
--- a/examples/touch/content/ContextMenuPage.qml
+++ b/examples/touch/content/ContextMenuPage.qml
@@ -36,7 +36,7 @@ Item {
     height: parent.height
 
 
-    Menu {
+    ContextMenu {
         id: menu
         anchorItem: center
         anchorPoint: Qt.point(center.width/2, center.height/2)

diff --git a/src/controls/Menu.qml b/src/controls/ContextMenu.qml
similarity index 100%
rename from src/controls/Menu.qml
rename to src/controls/ContextMenu.qml

diff --git a/src/controls/controls.pro b/src/controls/controls.pro
index 3b9408d..1438a88 100644 (file)
--- a/src/controls/controls.pro
+++ b/src/controls/controls.pro
@@ -4,7 +4,7 @@ TARGETPATH = QtQuick/Controls/Tizen
 QML_FILES += \
     Switch.qml \
     DetailButton.qml\
-    Menu.qml\
+    ContextMenu.qml\
     SplitView.qml\
     ScrollDecorator.qml
 

diff --git a/src/controls/qmldir b/src/controls/qmldir
index 67c63c2..dce7ace 100644 (file)
--- a/src/controls/qmldir
+++ b/src/controls/qmldir
@@ -2,6 +2,6 @@ module QtQuick.Controls.Tizen
 
 Switch 1.0 Switch.qml
 DetailButton 1.0 DetailButton.qml
-Menu 1.0 Menu.qml
+ContextMenu 1.0 ContextMenu.qml
 SplitView 1.0 SplitView.qml
 ScrollDecorator 1.0 ScrollDecorator.qml