From 3604280b4103df44cbe561c1adcacf28d4ea96ab Mon Sep 17 00:00:00 2001
From: David Faure <david.faure@kdab.com>
Date: Fri, 1 Nov 2013 10:06:50 +0100
Subject: 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>
---
 src/corelib/io/qstandardpaths.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'src/corelib/io/qstandardpaths.cpp')

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"
-- 
cgit v1.2.3