diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-07-19 01:00:40 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-07-19 01:00:41 +0200 |
| commit | 8f0790dd90f3fcaefa1a74ca1ce9bce84064eb10 (patch) | |
| tree | abc028924edde03ed173c2ba16e25daca38d7acd /src/corelib/io | |
| parent | 82aabafadad2010f0f20abeeb7234057e3c10e9f (diff) | |
| parent | 69ef6e821287d324459336dd1292d19d272386b8 (diff) | |
Merge remote-tracking branch 'origin/5.13' into dev
Change-Id: I999ba23a27cd897017d15c6ffe41ea8cd008ffb9
Diffstat (limited to 'src/corelib/io')
| -rw-r--r-- | src/corelib/io/qstandardpaths.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/io/qstandardpaths.cpp b/src/corelib/io/qstandardpaths.cpp index dbf650d5f6..f56fef7f8e 100644 --- a/src/corelib/io/qstandardpaths.cpp +++ b/src/corelib/io/qstandardpaths.cpp @@ -297,7 +297,7 @@ QT_BEGIN_NAMESPACE \li "<APPROOT>/tmp" \row \li HomeLocation \li "<APPROOT>/files" - \li "<APPROOT>" (not writable) + \li system defined \row \li DataLocation \li "<APPROOT>/files", "<USER>/<APPNAME>/files" \li "<APPROOT>/Library/Application Support" |