diff options
| author | David Faure <david.faure@kdab.com> | 2015-01-06 11:44:22 +0100 |
|---|---|---|
| committer | David Faure <david.faure@kdab.com> | 2015-01-09 12:15:59 +0100 |
| commit | 4c980aedc17c1da8f7160989fbb845ea72b36f44 (patch) | |
| tree | 31ad4926d76d3a92585cd473a2ea5e01bc1e6f82 /src/corelib/io/qstandardpaths_win.cpp | |
| parent | 3b9629e8bdbf23bb793c88f967b2cfe2b8256278 (diff) | |
QStandardPaths: add AppConfigLocation.
ConfigLocation was erroneously inconsistent, by adding the org name
and app name on Windows (unintentionally) and not on Unix (while having
subdirs in ~/.config is actually common practice for some XDG desktops)
Therefore this adds AppConfigLocation, which always has the org name
and app name (while GenericConfigLocation never does).
[ChangeLog][QtCore][QStandardPaths] Added QStandardPaths::AppConfigLocation,
for application-specific configuration directory. ConfigLocation was inconsistent.
Task-number: QTBUG-38872
Task-number: QTBUG-38845
Change-Id: I80fb98f296436261f3996c9df87571c29b06ab35
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/corelib/io/qstandardpaths_win.cpp')
| -rw-r--r-- | src/corelib/io/qstandardpaths_win.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/corelib/io/qstandardpaths_win.cpp b/src/corelib/io/qstandardpaths_win.cpp index 5e56db3797..8fe4be0d5c 100644 --- a/src/corelib/io/qstandardpaths_win.cpp +++ b/src/corelib/io/qstandardpaths_win.cpp @@ -98,6 +98,7 @@ QString QStandardPaths::writableLocation(StandardLocation type) switch (type) { case ConfigLocation: // same as AppLocalDataLocation, on Windows case GenericConfigLocation: // same as GenericDataLocation on Windows + case AppConfigLocation: case AppDataLocation: case AppLocalDataLocation: case GenericDataLocation: @@ -195,6 +196,7 @@ QStringList QStandardPaths::standardLocations(StandardLocation type) switch (type) { case ConfigLocation: // same as AppLocalDataLocation, on Windows (oversight, but too late to fix it) case GenericConfigLocation: // same as GenericDataLocation, on Windows + case AppConfigLocation: // same as AppLocalDataLocation, that one on purpose case AppDataLocation: case AppLocalDataLocation: case GenericDataLocation: |