summaryrefslogtreecommitdiffstats
path: root/src/libs
diff options
context:
space:
mode:
Diffstat (limited to 'src/libs')
-rw-r--r--src/libs/installer/permissionsettings.cpp26
-rw-r--r--src/libs/installer/permissionsettings.h14
2 files changed, 30 insertions, 10 deletions
diff --git a/src/libs/installer/permissionsettings.cpp b/src/libs/installer/permissionsettings.cpp
index 6d5abdfe6..235c6667b 100644
--- a/src/libs/installer/permissionsettings.cpp
+++ b/src/libs/installer/permissionsettings.cpp
@@ -1,6 +1,6 @@
/**************************************************************************
**
-** Copyright (C) 2017 The Qt Company Ltd.
+** Copyright (C) 2022 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/
**
** This file is part of the Qt Installer Framework.
@@ -37,6 +37,30 @@ using namespace QInstaller;
\internal
*/
+PermissionSettings::PermissionSettings(const QString &organization, const QString &application, QObject *parent)
+ : QSettings(organization, application, parent)
+{
+ setIniCodec("UTF-8"); // to workaround QTBUG-102334
+}
+
+PermissionSettings::PermissionSettings(Scope scope, const QString &organization, const QString &application, QObject *parent)
+ : QSettings(scope, organization, application, parent)
+{
+ setIniCodec("UTF-8"); // QTBUG-102334
+}
+
+PermissionSettings::PermissionSettings(Format format, Scope scope, const QString &organization, const QString &application, QObject *parent)
+ : QSettings(format, scope, organization, application, parent)
+{
+ setIniCodec("UTF-8"); // QTBUG-102334
+}
+
+PermissionSettings::PermissionSettings(const QString &fileName, Format format, QObject *parent)
+ : QSettings(fileName, format, parent)
+{
+ setIniCodec("UTF-8"); // QTBUG-102334
+}
+
PermissionSettings::~PermissionSettings()
{
if (!fileName().isEmpty()) {
diff --git a/src/libs/installer/permissionsettings.h b/src/libs/installer/permissionsettings.h
index 3847c91db..2621624c2 100644
--- a/src/libs/installer/permissionsettings.h
+++ b/src/libs/installer/permissionsettings.h
@@ -1,6 +1,6 @@
/**************************************************************************
**
-** Copyright (C) 2017 The Qt Company Ltd.
+** Copyright (C) 2022 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/
**
** This file is part of the Qt Installer Framework.
@@ -37,16 +37,12 @@ class PermissionSettings : public QSettings
{
public:
explicit PermissionSettings(const QString &organization,
- const QString &application = QString(), QObject *parent = 0)
- : QSettings(organization, application, parent) {}
+ const QString &application = QString(), QObject *parent = 0);
PermissionSettings(Scope scope, const QString &organization,
- const QString &application = QString(), QObject *parent = 0)
- : QSettings(scope, organization, application, parent) {}
+ const QString &application = QString(), QObject *parent = 0);
PermissionSettings(Format format, Scope scope, const QString &organization,
- const QString &application = QString(), QObject *parent = 0)
- : QSettings(format, scope, organization, application, parent) {}
- PermissionSettings(const QString &fileName, Format format, QObject *parent = 0)
- : QSettings(fileName, format, parent) {}
+ const QString &application = QString(), QObject *parent = 0);
+ PermissionSettings(const QString &fileName, Format format, QObject *parent = 0);
~PermissionSettings();
};