diff options
author | Liang Qi <liang.qi@qt.io> | 2016-08-18 09:47:06 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2016-08-18 09:47:21 +0200 |
commit | 5df9fb29e13800932e00800059ba431a95de160b (patch) | |
tree | 096a61564b0f5ee4a62549f2685cbe6a9b2261bf /src/imports/settings | |
parent | b03c85de2ab337858b44bf0a21692d7b544313a5 (diff) | |
parent | 4840bc0c207aa09b4332842c67e65bc92f43d3bd (diff) |
Merge remote-tracking branch 'origin/5.6' into 5.7
Change-Id: I20c622263f40c322954328e4d10a8071db3ca6d1
Diffstat (limited to 'src/imports/settings')
-rw-r--r-- | src/imports/settings/qqmlsettings.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/imports/settings/qqmlsettings.cpp b/src/imports/settings/qqmlsettings.cpp index bc097e4575..cd6fcbc718 100644 --- a/src/imports/settings/qqmlsettings.cpp +++ b/src/imports/settings/qqmlsettings.cpp @@ -214,7 +214,7 @@ QT_BEGIN_NAMESPACE instance, even if they are referring to the same setting in the same category. The information is stored in the system registry on Windows, and in XML - preferences files on OS X. On other Unix systems, in the absence of a + preferences files on \macos. On other Unix systems, in the absence of a standard, INI text files are used. See \l QSettings documentation for more details. |