diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-02-02 11:57:48 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-02-02 11:57:48 +0100 |
| commit | f115ae7001d65477a615bb5f78b08bc0b0004181 (patch) | |
| tree | 83a6fdbee3d8d557584ae708fbdbad4e1c85335b /src/widgets | |
| parent | 15ae7949661c6d7f401c83af5bdbb63a2ec46a2a (diff) | |
| parent | b44df9937e4b15596b994f8e20822b83ac4bed29 (diff) | |
Merge remote-tracking branch 'origin/5.9' into 5.10
Conflicts:
tests/auto/corelib/tools/qdatetime/tst_qdatetime.cpp
Change-Id: Ia28ea4f29d308ba3aa16c2a86ffc57049c6ea590
Diffstat (limited to 'src/widgets')
| -rw-r--r-- | src/widgets/dialogs/qfiledialog.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/widgets/dialogs/qfiledialog.cpp b/src/widgets/dialogs/qfiledialog.cpp index 8d37969be4..cb2c534b24 100644 --- a/src/widgets/dialogs/qfiledialog.cpp +++ b/src/widgets/dialogs/qfiledialog.cpp @@ -2830,7 +2830,10 @@ void QFileDialogPrivate::init(const QUrl &directory, const QString &nameFilter, if (!nameFilter.isEmpty()) q->setNameFilter(nameFilter); q->setDirectoryUrl(workingDirectory(directory)); - q->selectFile(initialSelection(directory)); + if (directory.isLocalFile()) + q->selectFile(initialSelection(directory)); + else + q->selectUrl(directory); #ifndef QT_NO_SETTINGS // Try to restore from the FileDialog settings group; if it fails, fall back |