From d8b7c03cc5b82276c74b6f210dc18a324ede3105 Mon Sep 17 00:00:00 2001 From: MohammadHossein Qanbari Date: Tue, 5 Sep 2023 11:11:22 +0200 Subject: doc: Remove QSettings' paths for embedded linux MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Embedded Linux is just Linux nowadays. Fixes: QTBUG-116715 Pick-to: 6.6 6.5 6.2 5.15 Change-Id: I1f64d27550db6f711c7f1f578e85cad12d0973aa Reviewed-by: Mårten Nordheim Reviewed-by: Samuli Piippo --- src/corelib/io/qsettings.cpp | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'src/corelib') diff --git a/src/corelib/io/qsettings.cpp b/src/corelib/io/qsettings.cpp index be0f2536dc..6cc0fb3f70 100644 --- a/src/corelib/io/qsettings.cpp +++ b/src/corelib/io/qsettings.cpp @@ -2194,8 +2194,8 @@ void QConfFileSettingsPrivate::ensureSectionParsed(QConfFile *confFile, following files are used by default: \list 1 - \li \c{$HOME/.config/MySoft/Star Runner.conf} (Qt for Embedded Linux: \c{$HOME/Settings/MySoft/Star Runner.conf}) - \li \c{$HOME/.config/MySoft.conf} (Qt for Embedded Linux: \c{$HOME/Settings/MySoft.conf}) + \li \c{$HOME/.config/MySoft/Star Runner.conf} + \li \c{$HOME/.config/MySoft.conf} \li for each directory in $XDG_CONFIG_DIRS: \c{/MySoft/Star Runner.conf} \li for each directory in $XDG_CONFIG_DIRS: \c{/MySoft.conf} \endlist @@ -2232,8 +2232,8 @@ void QConfFileSettingsPrivate::ensureSectionParsed(QConfFile *confFile, used on Unix, \macos, and iOS: \list 1 - \li \c{$HOME/.config/MySoft/Star Runner.ini} (Qt for Embedded Linux: \c{$HOME/Settings/MySoft/Star Runner.ini}) - \li \c{$HOME/.config/MySoft.ini} (Qt for Embedded Linux: \c{$HOME/Settings/MySoft.ini}) + \li \c{$HOME/.config/MySoft/Star Runner.ini} + \li \c{$HOME/.config/MySoft.ini} \li for each directory in $XDG_CONFIG_DIRS: \c{/MySoft/Star Runner.ini} \li for each directory in $XDG_CONFIG_DIRS: \c{/MySoft.ini} \endlist @@ -3414,8 +3414,6 @@ QSettings::Format QSettings::defaultFormat() \row \li SystemScope \li \c FOLDERID_ProgramData \row \li{1,2} Unix \li{1,2} NativeFormat, IniFormat \li UserScope \li \c $HOME/.config \row \li SystemScope \li \c /etc/xdg - \row \li{1,2} Qt for Embedded Linux \li{1,2} NativeFormat, IniFormat \li UserScope \li \c $HOME/Settings - \row \li SystemScope \li \c /etc/xdg \row \li{1,2} \macos and iOS \li{1,2} IniFormat \li UserScope \li \c $HOME/.config \row \li SystemScope \li \c /etc/xdg \endtable -- cgit v1.2.3