diff options
| author | David Faure <david.faure@kdab.com> | 2013-11-01 10:06:50 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-11-05 09:45:27 +0100 |
| commit | 3604280b4103df44cbe561c1adcacf28d4ea96ab (patch) | |
| tree | ee68c4aae442bc756c068d561c2d6a33869aaa96 /src/corelib/io/qstandardpaths.cpp | |
| parent | 2ff0746e97acf37600b104838c96468f00953737 (diff) | |
QStandardPaths: Add GenericConfigLocation to the documentation
The actual feature comes from a merge from the stable branch.
Change-Id: Id067fb2b26cb3c6b78c7705b77bd741e3bd8f090
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/corelib/io/qstandardpaths.cpp')
| -rw-r--r-- | src/corelib/io/qstandardpaths.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/corelib/io/qstandardpaths.cpp b/src/corelib/io/qstandardpaths.cpp index b32f5ac576..5e2428527c 100644 --- a/src/corelib/io/qstandardpaths.cpp +++ b/src/corelib/io/qstandardpaths.cpp @@ -188,6 +188,9 @@ QT_BEGIN_NAMESPACE \row \li ConfigLocation \li "~/Library/Preferences" \li "C:/Users/<USER>/AppData/Local/<APPNAME>", "C:/ProgramData/<APPNAME>" + \row \li GenericConfigLocation + \li "~/Library/Preferences" + \li "C:/Users/<USER>/AppData/Local", "C:/ProgramData" \row \li DownloadLocation \li "~/Documents" \li "C:/Users/<USER>/Documents" @@ -240,6 +243,9 @@ QT_BEGIN_NAMESPACE \row \li ConfigLocation \li "<APPROOT>/data/Settings" \li "~/.config", "/etc/xdg" + \row \li GenericConfigLocation + \li "<APPROOT>/data/Settings" + \li "~/.config", "/etc/xdg" \row \li DownloadLocation \li "<APPROOT>/shared/downloads" \li "~/Downloads" |