diff options
| author | Sergio Ahumada <sahumada@blackberry.com> | 2014-05-06 10:41:28 +0200 |
|---|---|---|
| committer | Sergio Ahumada <sahumada@blackberry.com> | 2014-05-06 10:43:56 +0200 |
| commit | 57ec8ef7265365c39662c9602b2d9976b025622a (patch) | |
| tree | 57c121e17c2ae2c9bfc1cf6f996574a77a250402 | |
| parent | fe9a74f52280dd1584018ed0c6a94564e49a387a (diff) | |
| parent | 723cd96c92955fb90a02625d323ac18c62fda6be (diff) | |
| download | qtquickcontrols-57ec8ef7265365c39662c9602b2d9976b025622a.tar.gz | |
Merge remote-tracking branch 'origin/release' into stable
Change-Id: Ic5c4ea467890e1033e33161a6cf7f83cf5adb01c
| -rw-r--r-- | src/controls/qquickmenu.cpp | 3 | ||||
| -rw-r--r-- | src/dialogs/DefaultFileDialog.qml | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/controls/qquickmenu.cpp b/src/controls/qquickmenu.cpp index bb4c79b6..8982b46c 100644 --- a/src/controls/qquickmenu.cpp +++ b/src/controls/qquickmenu.cpp @@ -268,6 +268,9 @@ QQuickMenu::~QQuickMenu() item->setParentMenu(0); } + if (platformItem()) + platformItem()->setMenu(0); + delete m_platformMenu; m_platformMenu = 0; } diff --git a/src/dialogs/DefaultFileDialog.qml b/src/dialogs/DefaultFileDialog.qml index af5d7b0b..7ebd443a 100644 --- a/src/dialogs/DefaultFileDialog.qml +++ b/src/dialogs/DefaultFileDialog.qml @@ -316,12 +316,11 @@ AbstractFileDialog { x: 4 height: parent.height - 2 source: "images/folder.png" - property var isDir: view.model.get(styleData.row, "fileIsDir") - visible: isDir !== undefined && isDir } Text { id: pathText text: styleData.value + onTextChanged: fileIcon.visible = view.model.isFolder(styleData.row) anchors { left: parent.left right: parent.right |