diff options
| author | Tomasz Olszak <olszak.tomasz@gmail.com> | 2013-06-12 14:11:13 +0200 |
|---|---|---|
| committer | Tomasz Olszak <olszak.tomasz@gmail.com> | 2013-06-12 18:38:22 +0200 |
| commit | 58da3309cced9658f6328d1c845c77564c03f6e3 (patch) | |
| tree | 45093c93d272ffaf41f72ac67a74cc8d38f79ea2 | |
| parent | a8c6bb242199e6178d9636720094e5f693fa8318 (diff) | |
| download | qtquickcontrols-tizen-58da3309cced9658f6328d1c845c77564c03f6e3.tar.gz qtquickcontrols-tizen-58da3309cced9658f6328d1c845c77564c03f6e3.tar.bz2 qtquickcontrols-tizen-58da3309cced9658f6328d1c845c77564c03f6e3.zip | |
Menu renamed to ContextMenu
Change-Id: Ie2563ec9c5a3c4d8a47503cafc5eddd40fada67b
Reviewed-by: Tomasz Olszak <olszak.tomasz@gmail.com>
| -rw-r--r-- | examples/touch/content/ContextMenuPage.qml | 2 | ||||
| -rw-r--r-- | src/controls/ContextMenu.qml (renamed from src/controls/Menu.qml) | 0 | ||||
| -rw-r--r-- | src/controls/controls.pro | 2 | ||||
| -rw-r--r-- | src/controls/qmldir | 2 |
4 files changed, 3 insertions, 3 deletions
diff --git a/examples/touch/content/ContextMenuPage.qml b/examples/touch/content/ContextMenuPage.qml index 73174a8..1856f23 100644 --- 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 index a1167ff..a1167ff 100644 --- a/src/controls/Menu.qml +++ b/src/controls/ContextMenu.qml diff --git a/src/controls/controls.pro b/src/controls/controls.pro index 3b9408d..1438a88 100644 --- 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 --- 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 |