1 files changed, 12 insertions, 9 deletions
diff --git a/src/corelib/io/qsettings_p.h b/src/corelib/io/qsettings_p.h
index 639605d8c4..d18c96a06c 100644
--- a/src/corelib/io/qsettings_p.h
+++ b/src/corelib/io/qsettings_p.h
@@ -109,6 +109,8 @@ private:
 };
 #endif
 
+Q_DECLARE_TYPEINFO(QSettingsKey, Q_MOVABLE_TYPE);
+
 typedef QMap<QSettingsKey, QByteArray> UnparsedSettingsMap;
 typedef QMap<QSettingsKey, QVariant> ParsedSettingsMap;
 
@@ -247,6 +249,7 @@ protected:
     QString groupPrefix;
     bool fallbacks;
     bool pendingChanges;
+    bool atomicSyncOnly = true;
     mutable QSettings::Status status;
 };
 
@@ -258,17 +261,17 @@ public:
     QConfFileSettingsPrivate(const QString &fileName, QSettings::Format format);
     ~QConfFileSettingsPrivate();
 
-    void remove(const QString &key) Q_DECL_OVERRIDE;
-    void set(const QString &key, const QVariant &value) Q_DECL_OVERRIDE;
-    bool get(const QString &key, QVariant *value) const Q_DECL_OVERRIDE;
+    void remove(const QString &key) override;
+    void set(const QString &key, const QVariant &value) override;
+    bool get(const QString &key, QVariant *value) const override;
 
-    QStringList children(const QString &prefix, ChildSpec spec) const Q_DECL_OVERRIDE;
+    QStringList children(const QString &prefix, ChildSpec spec) const override;
 
-    void clear() Q_DECL_OVERRIDE;
-    void sync() Q_DECL_OVERRIDE;
-    void flush() Q_DECL_OVERRIDE;
-    bool isWritable() const Q_DECL_OVERRIDE;
-    QString fileName() const Q_DECL_OVERRIDE;
+    void clear() override;
+    void sync() override;
+    void flush() override;
+    bool isWritable() const override;
+    QString fileName() const override;
 
     bool readIniFile(const QByteArray &data, UnparsedSettingsMap *unparsedIniSections);
     static bool readIniSection(const QSettingsKey &section, const QByteArray &data,