diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-12-24 10:30:20 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-12-24 10:30:20 +0100 |
| commit | d588ec795bf905d6d4a4827ad74f3d01315e40bf (patch) | |
| tree | 67227f80379d77962602b758093251b593ee0c08 /examples/quick/dialogs/systemdialogs/FileDialogs.qml | |
| parent | 13e88fe2b9b1680cb161a249289c3ba998f08c0c (diff) | |
| parent | fdc18a5f25ba1c4cf35e1fa6f21272167bde36a9 (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
src/quick/items/qquickrectangle.cpp
Change-Id: Ia40bc0f2f08b5be68e32eb1e1f118445d20e44fc
Diffstat (limited to 'examples/quick/dialogs/systemdialogs/FileDialogs.qml')
| -rw-r--r-- | examples/quick/dialogs/systemdialogs/FileDialogs.qml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/examples/quick/dialogs/systemdialogs/FileDialogs.qml b/examples/quick/dialogs/systemdialogs/FileDialogs.qml index bfc160fa45..d6ee1a13ca 100644 --- a/examples/quick/dialogs/systemdialogs/FileDialogs.qml +++ b/examples/quick/dialogs/systemdialogs/FileDialogs.qml @@ -173,7 +173,7 @@ Rectangle { text: "go to /tmp" anchors.verticalCenter: parent.verticalCenter // TODO: QTBUG-29814 This isn't portable, but we don't expose QDir::tempPath to QML yet. - onClicked: fileDialog.folder = "/tmp" // file:///tmp would also be OK + onClicked: fileDialog.folder = (Qt.platform.os === "windows" ? "/c:/temp" : "/tmp") } } } |