diff options
| author | Shawn Rutledge <shawn.rutledge@digia.com> | 2014-01-13 15:16:01 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-01-16 19:21:10 +0100 |
| commit | cf2b04f6da6fb4d6a7da924a0796bfa8fda25398 (patch) | |
| tree | 469a31a773633ff38af73ab347b54cd6b0f61136 /src | |
| parent | 5d15f9704783e5eafc9ba77740aae85aeac01d24 (diff) | |
QtQuick.Dialogs FileDialog: don't go astray into qrc:/ on Android
Was due to string->URL conversion when setting FolderListModel.folder.
Task-number: QTBUG-36006
Change-Id: Ia768d8a5473b3d4c22ef9be7c8b3cf28d3956f6f
Reviewed-by: Liang Qi <liang.qi@digia.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/imports/dialogs/DefaultFileDialog.qml | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/src/imports/dialogs/DefaultFileDialog.qml b/src/imports/dialogs/DefaultFileDialog.qml index 0a5eabddf2..627a719f60 100644 --- a/src/imports/dialogs/DefaultFileDialog.qml +++ b/src/imports/dialogs/DefaultFileDialog.qml @@ -53,7 +53,13 @@ AbstractFileDialog { currentPathField.visible = false } } - onFolderChanged: view.model.folder = folder + onFolderChanged: { + var str = new String(folder) + if (str.indexOf("qrc:") === 0) + folder = "file:" + str.slice(4) + if (view.model.folder != folder) + view.model.folder = folder + } property real __textX: titleBar.height property SystemPalette __palette @@ -61,12 +67,15 @@ AbstractFileDialog { property int __lastClickedIdx: -1 function __dirDown(path) { - view.model.folder = path + view.model.folder = "file://" + path __lastClickedIdx = -1 __selectedIndices = [] } function __dirUp() { - view.model.folder = view.model.parentFolder + if (view.model.parentFolder == "") + view.model.folder = "file:///" + else + view.model.folder = view.model.parentFolder __lastClickedIdx = -1 __selectedIndices = [] } |