Merge remote-tracking branch 'origin/tqtc/lts-6.2.8' into tqtc/lts-6.2-opensource

Conflicts solved in a file:
	src/corelib/io/qstandardpaths_android.cpp

Change-Id: Ie8cef36c1379679ca358df50c56b3c25aa15c5d6

7 files changed, 17 insertions, 18 deletions

diff --git a/examples/corelib/serialization/savegame/character.cpp b/examples/corelib/serialization/savegame/character.cpp
index 046cde3091..266fe3b921 100644
--- a/examples/corelib/serialization/savegame/character.cpp
+++ b/examples/corelib/serialization/savegame/character.cpp
@@ -53,10 +53,8 @@
 #include <QMetaEnum>
 #include <QTextStream>
 
-Character::Character() :
-    mLevel(0),
-    mClassType(Warrior) {
-}
+Character::Character()
+    = default;
 
 Character::Character(const QString &name,
                      int level,
diff --git a/examples/corelib/serialization/savegame/character.h b/examples/corelib/serialization/savegame/character.h
index cbf06d7fd6..2cabcd17b4 100644
--- a/examples/corelib/serialization/savegame/character.h
+++ b/examples/corelib/serialization/savegame/character.h
@@ -58,7 +58,7 @@
 //! [0]
 class Character
 {
-    Q_GADGET;
+    Q_GADGET
 
 public:
     enum ClassType {
@@ -84,8 +84,8 @@ public:
     void print(int indentation = 0) const;
 private:
     QString mName;
-    int mLevel;
-    ClassType mClassType;
+    int mLevel = 0;
+    ClassType mClassType = Warrior;
 };
 //! [0]
 
diff --git a/examples/corelib/serialization/savegame/game.cpp b/examples/corelib/serialization/savegame/game.cpp
index bb7c2013f2..02c0851869 100644
--- a/examples/corelib/serialization/savegame/game.cpp
+++ b/examples/corelib/serialization/savegame/game.cpp
@@ -168,8 +168,8 @@ void Game::read(const QJsonObject &json)
         QJsonArray levelArray = json["levels"].toArray();
         mLevels.clear();
         mLevels.reserve(levelArray.size());
-        for (int levelIndex = 0; levelIndex < levelArray.size(); ++levelIndex) {
-            QJsonObject levelObject = levelArray[levelIndex].toObject();
+        for (const QJsonValue &v : levelArray) {
+            QJsonObject levelObject = v.toObject();
             Level level;
             level.read(levelObject);
             mLevels.append(level);
diff --git a/examples/corelib/serialization/savegame/game.h b/examples/corelib/serialization/savegame/game.h
index dfcb27eb1c..2934d5184e 100644
--- a/examples/corelib/serialization/savegame/game.h
+++ b/examples/corelib/serialization/savegame/game.h
@@ -51,12 +51,12 @@
 #ifndef GAME_H
 #define GAME_H
 
-#include <QJsonObject>
-#include <QList>
-
 #include "character.h"
 #include "level.h"
 
+#include <QJsonObject>
+#include <QList>
+
 //! [0]
 class Game
 {
diff --git a/examples/corelib/serialization/savegame/level.cpp b/examples/corelib/serialization/savegame/level.cpp
index ea6ef147b9..6351fbf733 100644
--- a/examples/corelib/serialization/savegame/level.cpp
+++ b/examples/corelib/serialization/savegame/level.cpp
@@ -82,8 +82,8 @@ void Level::read(const QJsonObject &json)
         QJsonArray npcArray = json["npcs"].toArray();
         mNpcs.clear();
         mNpcs.reserve(npcArray.size());
-        for (int npcIndex = 0; npcIndex < npcArray.size(); ++npcIndex) {
-            QJsonObject npcObject = npcArray[npcIndex].toObject();
+        for (const QJsonValue &v : npcArray) {
+            QJsonObject npcObject = v.toObject();
             Character npc;
             npc.read(npcObject);
             mNpcs.append(npc);
diff --git a/examples/corelib/serialization/savegame/level.h b/examples/corelib/serialization/savegame/level.h
index ecffde8f22..ec1873ed33 100644
--- a/examples/corelib/serialization/savegame/level.h
+++ b/examples/corelib/serialization/savegame/level.h
@@ -51,17 +51,17 @@
 #ifndef LEVEL_H
 #define LEVEL_H
 
+#include "character.h"
+
 #include <QJsonObject>
 #include <QList>
 
-#include "character.h"
-
 //! [0]
 class Level
 {
 public:
     Level() = default;
-    Level(const QString &name);
+    explicit Level(const QString &name);
 
     QString name() const;
 
diff --git a/examples/corelib/serialization/savegame/main.cpp b/examples/corelib/serialization/savegame/main.cpp
index d091684211..6115627574 100644
--- a/examples/corelib/serialization/savegame/main.cpp
+++ b/examples/corelib/serialization/savegame/main.cpp
@@ -48,10 +48,11 @@
 **
 ****************************************************************************/
 
+#include "game.h"
+
 #include <QCoreApplication>
 #include <QTextStream>
 
-#include "game.h"
 //! [0]
 int main(int argc, char *argv[])
 {