Merge remote-tracking branch 'origin/dev' into 5.11

 Conflicts:
	src/corelib/tools/qvarlengtharray.qdoc
	src/corelib/tools/qvector.qdoc

Resolved documentation changes in favor of 017569f702b6dd0,
which keeps the move overloads along with its const-ref sibling.

Change-Id: I0835b0b3211a418e5e50defc4cf315f0964fab79

11 files changed, 2 insertions, 2 deletions

diff --git a/examples/corelib/corelib.pro b/examples/corelib/corelib.pro
index a32b8ba51a..014e8af608 100644
--- a/examples/corelib/corelib.pro
+++ b/examples/corelib/corelib.pro
@@ -3,7 +3,7 @@ CONFIG += no_docs_target
 
 SUBDIRS = \
     ipc \
-    json \
     mimetypes \
+    serialization \
     threads \
     tools
diff --git a/examples/corelib/json/savegame/character.cpp b/examples/corelib/serialization/savegame/character.cpp
index 046cde3091..046cde3091 100644
--- a/examples/corelib/json/savegame/character.cpp
+++ b/examples/corelib/serialization/savegame/character.cpp
diff --git a/examples/corelib/json/savegame/character.h b/examples/corelib/serialization/savegame/character.h
index cbf06d7fd6..cbf06d7fd6 100644
--- a/examples/corelib/json/savegame/character.h
+++ b/examples/corelib/serialization/savegame/character.h
diff --git a/examples/corelib/json/savegame/doc/src/savegame.qdoc b/examples/corelib/serialization/savegame/doc/src/savegame.qdoc
index 06e70680c6..06e70680c6 100644
--- a/examples/corelib/json/savegame/doc/src/savegame.qdoc
+++ b/examples/corelib/serialization/savegame/doc/src/savegame.qdoc
diff --git a/examples/corelib/json/savegame/game.cpp b/examples/corelib/serialization/savegame/game.cpp
index 4caec71a03..4caec71a03 100644
--- a/examples/corelib/json/savegame/game.cpp
+++ b/examples/corelib/serialization/savegame/game.cpp
diff --git a/examples/corelib/json/savegame/game.h b/examples/corelib/serialization/savegame/game.h
index 3da9c148be..3da9c148be 100644
--- a/examples/corelib/json/savegame/game.h
+++ b/examples/corelib/serialization/savegame/game.h
diff --git a/examples/corelib/json/savegame/level.cpp b/examples/corelib/serialization/savegame/level.cpp
index 8eda107f46..8eda107f46 100644
--- a/examples/corelib/json/savegame/level.cpp
+++ b/examples/corelib/serialization/savegame/level.cpp
diff --git a/examples/corelib/json/savegame/level.h b/examples/corelib/serialization/savegame/level.h
index 393524abfd..393524abfd 100644
--- a/examples/corelib/json/savegame/level.h
+++ b/examples/corelib/serialization/savegame/level.h
diff --git a/examples/corelib/json/savegame/main.cpp b/examples/corelib/serialization/savegame/main.cpp
index d091684211..d091684211 100644
--- a/examples/corelib/json/savegame/main.cpp
+++ b/examples/corelib/serialization/savegame/main.cpp
diff --git a/examples/corelib/json/savegame/savegame.pro b/examples/corelib/serialization/savegame/savegame.pro
index 6706444506..15a38c32ef 100644
--- a/examples/corelib/json/savegame/savegame.pro
+++ b/examples/corelib/serialization/savegame/savegame.pro
@@ -8,7 +8,7 @@ CONFIG -= app_bundle
 TEMPLATE = app
 
 # install
-target.path = $$[QT_INSTALL_EXAMPLES]/corelib/json/savegame
+target.path = $$[QT_INSTALL_EXAMPLES]/corelib/serialization/savegame
 INSTALLS += target
 
 SOURCES += main.cpp \
diff --git a/examples/corelib/json/json.pro b/examples/corelib/serialization/serialization.pro
index af4d3e6f0f..af4d3e6f0f 100644
--- a/examples/corelib/json/json.pro
+++ b/examples/corelib/serialization/serialization.pro