diff options
author | Niels Weber <niels.weber@digia.com> | 2015-01-22 13:16:05 +0100 |
---|---|---|
committer | Jarek Kobus <jaroslaw.kobus@theqtcompany.com> | 2015-01-26 15:43:56 +0100 |
commit | ba2ba310c3b65e4fdf48dc2fd672e572a0a9b295 (patch) | |
tree | 3fd0c8b24534e233f77b3f06495a6b831af59e8f /src/libs/installer/qsettingswrapper.cpp | |
parent | db423c387a601305a9851a8e72fa3d46aaabaa9d (diff) |
Set correct permissions for ini files
This is necessary due to a behavior change in QSettings/Qt 5
that now creates ini files with more restrictive permissions
than before.
Task-number: QTIFW-589
Task-number: QTBUG-44086
Change-Id: I296ad4b312a933cbda7dd5c1f644294f83e1850d
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
Diffstat (limited to 'src/libs/installer/qsettingswrapper.cpp')
-rw-r--r-- | src/libs/installer/qsettingswrapper.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/libs/installer/qsettingswrapper.cpp b/src/libs/installer/qsettingswrapper.cpp index 1f19ad1e0..1a5f166d6 100644 --- a/src/libs/installer/qsettingswrapper.cpp +++ b/src/libs/installer/qsettingswrapper.cpp @@ -33,8 +33,8 @@ **************************************************************************/ #include "qsettingswrapper.h" +#include "permissionsettings.h" -#include <QSettings> #include <QStringList> namespace QInstaller { @@ -88,7 +88,7 @@ public: QString m_organization; QSettings::Scope m_scope; QSettings::Format m_format; - QSettings settings; + PermissionSettings settings; }; @@ -318,8 +318,8 @@ QVariant QSettingsWrapper::value(const QString ¶m1, const QVariant ¶m2) bool QSettingsWrapper::createSocket() const { if ((d->m_format != QSettings::NativeFormat) && (d->m_format != QSettings::IniFormat)) { - Q_ASSERT_X(false, Q_FUNC_INFO, "Settings wrapper does not support any different format " - "then QSettingsWrapper::NativeFormat and QSettingsWrapper::IniFormat."); + Q_ASSERT_X(false, Q_FUNC_INFO, "Settings wrapper only supports QSettingsWrapper::NativeFormat" + " and QSettingsWrapper::IniFormat."); } return (const_cast<QSettingsWrapper *>(this))->connectToServer(QVariantList() << d->m_application << d->m_organization << d->m_scope << d->m_format << d->m_filename); |