12 files changed, 175 insertions, 47 deletions
diff --git a/src/corelib/doc/images/javaiterators1.svg b/src/corelib/doc/images/javaiterators1.svg
index 468dbe5371c..c10329ab480 100644
--- a/src/corelib/doc/images/javaiterators1.svg
+++ b/src/corelib/doc/images/javaiterators1.svg
@@ -12,6 +12,11 @@
   svg .text-style { font: 20px arial; fill: black }
   svg .fill-style { stroke: none; fill: red }
 
+  svg.dark .box-style { stroke: #f2f2f2; fill: black }
+  svg.dark .line-style { stroke: red; fill: none }
+  svg.dark .text-style { font: 20px arial; fill: #f2f2f2 }
+  svg.dark .fill-style { stroke: none; fill: red }
+
   [data-theme="dark"] svg .box-style { stroke: #f2f2f2; fill: black }
   [data-theme="dark"] svg .line-style { stroke: red; fill: none }
   [data-theme="dark"] svg .text-style { font: 20px arial; fill: #f2f2f2 }
@@ -24,36 +29,53 @@
 </style>
 
 <g transform="translate(10.5, 10.5)">
-<path d="m 0,0 h 80 v 60 h -80 z" class="box-style" />
-<text x="35" y="36" class="text-style">A</text>
-<path d="M 0,60 v 30" class="line-style" />
-<path d="M 0,60 l -5,10 l 10,0 z" class="fill-style" />
+<path d="m 0,0 h 80 v 60 h -80 z" stroke="black" fill="white"
+      class="box-style" />
+<text x="35" y="36" font-family="arial" font-size="20px"
+      class="text-style">A</text>
+<path d="M 0,60 v 30" stroke="red"
+      class="line-style" />
+<path d="M 0,60 l -5,10 l 10,0 z" stroke="red" fill="red"
+      class="fill-style" />
 </g>
 
 <g transform="translate(90.5, 10.5)">
-<path d="m 0,0 h 80 v 60 h -80 z" class="box-style" />
-<text x="35" y="36" class="text-style">B</text>
-<path d="M 0,60 v 30" class="line-style" />
-<path d="M 0,60 l -5,10 l 10,0 z" class="fill-style" />
+<path d="m 0,0 h 80 v 60 h -80 z" stroke="black" fill="white"
+      class="box-style" />
+<text x="35" y="36" font-family="arial" font-size="20px"
+      class="text-style">B</text>
+<path d="M 0,60 v 30" stroke="red"
+      class="line-style" />
+<path d="M 0,60 l -5,10 l 10,0 z" stroke="red" fill="red"
+      class="fill-style" />
 </g>
 
 <g transform="translate(170.5, 10.5)">
-<path d="m 0,0 h 80 v 60 h -80 z" class="box-style" />
-<text x="35" y="36" class="text-style">C</text>
-<path d="M 0,60 v 30" class="line-style" />
-<path d="M 0,60 l -5,10 l 10,0 z" class="fill-style" />
+<path d="m 0,0 h 80 v 60 h -80 z" stroke="black" fill="white"
+      class="box-style" />
+<text x="35" y="36" font-family="arial" font-size="20px"
+      class="text-style">C</text>
+<path d="M 0,60 v 30" stroke="red"
+      class="line-style" />
+<path d="M 0,60 l -5,10 l 10,0 z" stroke="red" fill="red"
+      class="fill-style" />
 </g>
 
 <g transform="translate(250.5, 10.5)">
-<path d="m 0,0 h 80 v 60 h -80 z" class="box-style" />
-<text x="35" y="36" class="text-style">D</text>
-<path d="M 0,60 v 30" class="line-style" />
-<path d="M 0,60 l -5,10 l 10,0 z" class="fill-style" />
+<path d="m 0,0 h 80 v 60 h -80 z" stroke="black" fill="white"
+      class="box-style" />
+<text x="35" y="36" font-family="arial" font-size="20px"
+      class="text-style">D</text>
+<path d="M 0,60 v 30" stroke="red"
+      class="line-style" />
+<path d="M 0,60 l -5,10 l 10,0 z" stroke="red" fill="red"
+      class="fill-style" />
 </g>
 
 <g transform="translate(330.5, 10.5)">
-<path d="M 0,60 v 30" class="line-style" />
-<path d="M 0,60 l -5,10 l 10,0 z" class="fill-style" />
+<path d="M 0,60 v 30" stroke="red"
+      class="line-style" />
+<path d="M 0,60 l -5,10 l 10,0 z" stroke="red" fill="red"
+      class="fill-style" />
 </g>
-
 </svg>
diff --git a/src/corelib/doc/images/javaiterators2.svg b/src/corelib/doc/images/javaiterators2.svg
index df4c6b352a6..3b41b3f8730 100644
--- a/src/corelib/doc/images/javaiterators2.svg
+++ b/src/corelib/doc/images/javaiterators2.svg
@@ -15,6 +15,14 @@
   svg .text-style { font: 20px arial; fill: black }
   svg .small-text-style { font: 12px monospace; fill: black }
 
+  svg.dark .box-style { stroke: #f2f2f2; fill: black }
+  svg.dark .line-style { stroke: red; fill: none }
+  svg.dark .fill-style { stroke: none; fill: red }
+  svg.dark .np-line-style { stroke: #4080ff; fill: none; stroke-width: 1.5 }
+  svg.dark .np-fill-style { stroke: none; fill: #4080ff }
+  svg.dark .text-style { font: 20px arial; fill: #f2f2f2 }
+  svg.dark .small-text-style { font: 12px monospace; fill: #f2f2f2 }
+
   [data-theme="dark"] svg .box-style { stroke: #f2f2f2; fill: black }
   [data-theme="dark"] svg .line-style { stroke: red; fill: none }
   [data-theme="dark"] svg .fill-style { stroke: none; fill: red }
@@ -33,31 +41,46 @@
 </style>
 
 <g transform="translate(10.5, 10.5)">
-<path d="m 0,0 h 80 v 60 h -80 z" class="box-style" />
-<text x="35" y="36" class="text-style">A</text>
+<path d="m 0,0 h 80 v 60 h -80 z" stroke="black" fill="white"
+      class="box-style" />
+<text x="35" y="36" font-family="arial" font-size="20px"
+      class="text-style">A</text>
 </g>
 
 <g transform="translate(90.5, 10.5)">
-<path d="m 0,0 h 80 v 60 h -80 z" class="box-style" />
-<text x="35" y="36" class="text-style">B</text>
-<path d="M 0,60 c 0,30 50,40 80,30" class="np-line-style" />
-<path d="M 0,60 l -2,14 l 11,-4 z" class="np-fill-style" />
-<text x="-15" y="110" class="small-text-style">previous()</text>
+<path d="m 0,0 h 80 v 60 h -80 z" stroke="black" fill="white"
+      class="box-style" />
+<text x="35" y="36" font-family="arial" font-size="20px"
+      class="text-style">B</text>
+<path d="M 0,60 c 0,30 50,40 80,30" stroke="blue" fill="none"
+      class="np-line-style" />
+<path d="M 0,60 l -2,14 l 11,-4 z" stroke="none" fill="blue"
+      class="np-fill-style" />
+<text x="-15" y="110"
+      class="small-text-style">previous()</text>
 </g>
 
 <g transform="translate(170.5, 10.5)">
-<path d="m 0,0 h 80 v 60 h -80 z" class="box-style" />
-<text x="35" y="36" class="text-style">C</text>
-<path d="M 0,60 v 50" class="line-style" />
-<path d="M 0,60 l -5,10 l 10,0 z" class="fill-style" />
-<text x="30" y="110" class="small-text-style">next()</text>
+<path d="m 0,0 h 80 v 60 h -80 z" stroke="black" fill="white"
+      class="box-style" />
+<text x="35" y="36" font-family="arial" font-size="20px"
+      class="text-style">C</text>
+<path d="M 0,60 v 50" stroke="red"
+      class="line-style" />
+<path d="M 0,60 l -5,10 l 10,0 z" stroke="none" fill="red"
+      class="fill-style" />
+<text x="30" y="110"
+      class="small-text-style">next()</text>
 </g>
 
 <g transform="translate(250.5, 10.5)">
-<path d="m 0,0 h 80 v 60 h -80 z" class="box-style" />
-<text x="35" y="36" class="text-style">D</text>
-<path d="M 0,60 c 0,30 -50,40 -80,30" class="np-line-style" />
-<path d="M 0,60 l 2,14 l -11,-4 z" class="np-fill-style" />
+<path d="m 0,0 h 80 v 60 h -80 z" stroke="black" fill="white"
+      class="box-style" />
+<text x="35" y="36" font-family="arial" font-size="20px"
+      class="text-style">D</text>
+<path d="M 0,60 c 0,30 -50,40 -80,30" stroke="blue" fill="none"
+      class="np-line-style" />
+<path d="M 0,60 l 2,14 l -11,-4 z" stroke="none" fill="blue"
+      class="np-fill-style" />
 </g>
-
 </svg>
diff --git a/src/corelib/doc/images/stliterators1.svg b/src/corelib/doc/images/stliterators1.svg
new file mode 100644
index 00000000000..478211c78d7
--- /dev/null
+++ b/src/corelib/doc/images/stliterators1.svg
@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.1"
+   width="420"
+   height="110"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+
+<style>
+  svg .box-style { stroke: black; fill: white }
+  svg .line-style { stroke: red; fill: none }
+  svg .text-style { font: 20px arial; fill: black }
+  svg .fill-style { stroke: none; fill: red }
+  svg .fn-text-style { font: 14px monospace; fill: black }
+
+  svg.dark .box-style { stroke: #f2f2f2; fill: black }
+  svg.dark .line-style { stroke: red; fill: none }
+  svg.dark .text-style { font: 20px arial; fill: #f2f2f2 }
+  svg.dark .fill-style { stroke: none; fill: red }
+  svg.dark .fn-text-style { font: 14px monospace; fill: #f2f2f2 }
+
+  [data-theme="dark"] svg .box-style { stroke: #f2f2f2; fill: black }
+  [data-theme="dark"] svg .line-style { stroke: red; fill: none }
+  [data-theme="dark"] svg .text-style { font: 20px arial; fill: #f2f2f2 }
+  [data-theme="dark"] svg .fill-style { stroke: none; fill: red }
+  [data-theme="dark"] svg .fn-text-style { font: 14px monospace; fill: #f2f2f2 }
+
+  [data-theme="light"] svg .box-style { stroke: black; fill: white }
+  [data-theme="light"] svg .line-style { stroke: red; fill: none }
+  [data-theme="light"] svg .text-style { font: 20px arial; fill: black }
+  [data-theme="light"] svg .fill-style { stroke: none; fill: red }
+  [data-theme="light"] svg .fn-text-style { font: 14px monospace; fill: black }
+</style>
+
+<g transform="translate(10.5, 10.5)">
+<path d="m 0,0 h 80 v 60 h -80 z" stroke="black" fill="white"
+      class="box-style" />
+<text x="35" y="36" font-family="arial" font-size="20px"
+      class="text-style">A</text>
+<path d="M 40,60 v 30" stroke="red"
+      class="line-style" />
+<path d="M 40,60 l -5,10 l 10,0 z" stroke="none" fill="red"
+      class="fill-style" />
+</g>
+
+<g transform="translate(90.5, 10.5)">
+<path d="m 0,0 h 80 v 60 h -80 z" stroke="black" fill="white"
+      class="box-style" />
+<text x="35" y="36" font-family="arial" font-size="20px"
+      class="text-style">B</text>
+<path d="M 40,60 v 30" stroke="red"
+      class="line-style" />
+<path d="M 40,60 l -5,10 l 10,0 z" stroke="none" fill="red"
+      class="fill-style" />
+</g>
+
+<g transform="translate(170.5, 10.5)">
+<path d="m 0,0 h 80 v 60 h -80 z" stroke="black" fill="white"
+      class="box-style" />
+<text x="35" y="36" font-family="arial" font-size="20px"
+      class="text-style">C</text>
+<path d="M 40,60 v 30" stroke="red"
+      class="line-style" />
+<path d="M 40,60 l -5,10 l 10,0 z" stroke="none" fill="red"
+      class="fill-style" />
+</g>
+
+<g transform="translate(250.5, 10.5)">
+<path d="m 0,0 h 80 v 60 h -80 z" stroke="black" fill="white"
+      class="box-style" />
+<text x="35" y="36" font-family="arial" font-size="20px"
+      class="text-style">D</text>
+<path d="M 40,60 v 30" stroke="red"
+      class="line-style" />
+<path d="M 40,60 l -5,10 l 10,0 z" stroke="none" fill="red"
+      class="fill-style" />
+</g>
+
+<g transform="translate(330.5, 10.5)">
+<path d="m 0,0 h 80 v 60 h -80 z" stroke="black" fill="white"
+      stroke-dasharray="3,3"
+      class="box-style" />
+<text x="20" y="36" font-family="monospace" font-size="14px"
+      class="fn-text-style">end()</text>
+<path d="M 40,60 v 30" stroke="red"
+      class="line-style" />
+<path d="M 40,60 l -5,10 l 10,0 z" stroke="none" fill="red"
+      class="fill-style" />
+</g>
+</svg>
diff --git a/src/corelib/doc/src/cmake/cmake-configure-variables.qdoc b/src/corelib/doc/src/cmake/cmake-configure-variables.qdoc
index b8e5e038a33..7cd3f91b901 100644
--- a/src/corelib/doc/src/cmake/cmake-configure-variables.qdoc
+++ b/src/corelib/doc/src/cmake/cmake-configure-variables.qdoc
@@ -525,7 +525,6 @@ To prevent this, set \c QT_NO_SET_XCODE_BUNDLE_IDENTIFIER to \c TRUE.
 \summary {Enables verbose mode of deployment tools.}
 
 \cmakevariablesince 6.3
-\preliminarycmakevariable
 
 Enables verbose mode of the \l androiddeployqt deployment tool when it is called
 internally at build time, usually during target finalization.
@@ -545,7 +544,6 @@ must be set before the first \c{find_package(Qt6)} call to have that effect.
 \summary {Name of the file to include for setting up deployment support.}
 
 \cmakevariablesince 6.3
-\preliminarycmakevariable
 \note The value of this variable should never be modified by project code.
 
 This configure-phase variable is set by the Core package. It is intended to be
diff --git a/src/corelib/doc/src/cmake/cmake-properties.qdoc b/src/corelib/doc/src/cmake/cmake-properties.qdoc
index 821862494a2..c7b1a27a4b4 100644
--- a/src/corelib/doc/src/cmake/cmake-properties.qdoc
+++ b/src/corelib/doc/src/cmake/cmake-properties.qdoc
@@ -665,7 +665,6 @@ UTF-8 input). Use the \l QT_NO_CAST_FROM_ASCII and
 \summary {Specifies the default Qt resource prefix.}
 
 \cmakepropertysince 6.0
-\preliminarycmakeproperty
 
 When using \l{qt6_add_resources}{qt_add_resources} without a \c PREFIX
 argument, then the value of this target property will be used as
@@ -773,7 +772,6 @@ CMake properties:
 \brief Sets the FOLDER property for Qt-internal targets.
 
 \cmakepropertysince 6.5
-\preliminarycmakeproperty
 
 Name of the \l FOLDER for internal targets that are added by Qt's CMake
 commands.
diff --git a/src/corelib/doc/src/cmake/qt_deploy_translations.qdoc b/src/corelib/doc/src/cmake/qt_deploy_translations.qdoc
index 43ff23a35a1..e6d3edbbdc4 100644
--- a/src/corelib/doc/src/cmake/qt_deploy_translations.qdoc
+++ b/src/corelib/doc/src/cmake/qt_deploy_translations.qdoc
@@ -17,7 +17,6 @@ can only be called from a deployment script. It cannot be called directly by the
 project during the configure stage.
 
 \cmakecommandsince 6.5
-\preliminarycmakecommand
 \note This command does not usually need to be called directly. It is used
       internally by other higher level commands, but projects wishing to
       implement more customized deployment logic may find it useful.
diff --git a/src/corelib/doc/src/cmake/qt_extract_metatypes.qdoc b/src/corelib/doc/src/cmake/qt_extract_metatypes.qdoc
index 7ec8d90f9b1..24112b1cf87 100644
--- a/src/corelib/doc/src/cmake/qt_extract_metatypes.qdoc
+++ b/src/corelib/doc/src/cmake/qt_extract_metatypes.qdoc
@@ -11,7 +11,6 @@
 \summary {Extracts metatypes from a Qt target and generates an associated metatypes.json file.}
 
 \cmakecommandsince 6.0
-\preliminarycmakecommand
 
 \section1 Synopsis
 
diff --git a/src/corelib/doc/src/cmake/qt_finalize_project.qdoc b/src/corelib/doc/src/cmake/qt_finalize_project.qdoc
index 5506712691e..f60b850fcdb 100644
--- a/src/corelib/doc/src/cmake/qt_finalize_project.qdoc
+++ b/src/corelib/doc/src/cmake/qt_finalize_project.qdoc
@@ -9,7 +9,6 @@
 \keyword qt6_finalize_project
 
 \summary {Handles various common platform-specific tasks associated with a Qt project.}
-\preliminarycmakecommand
 
 \include cmake-find-package-core.qdocinc
 
diff --git a/src/corelib/doc/src/containers.qdoc b/src/corelib/doc/src/containers.qdoc
index 874ab807609..38ce2188e13 100644
--- a/src/corelib/doc/src/containers.qdoc
+++ b/src/corelib/doc/src/containers.qdoc
@@ -275,7 +275,7 @@
     The diagram below shows the valid iterator positions as red
     arrows for a list containing four items:
 
-    \image stliterators1.png
+    \image stliterators1.svg STL-style iterators point to items
 
     Iterating backward with an STL-style iterator is done with reverse iterators:
 
diff --git a/src/corelib/doc/src/java-style-iterators.qdoc b/src/corelib/doc/src/java-style-iterators.qdoc
index a0e5c53d633..fc1378bb718 100644
--- a/src/corelib/doc/src/java-style-iterators.qdoc
+++ b/src/corelib/doc/src/java-style-iterators.qdoc
@@ -70,7 +70,7 @@
     \l{QListIterator::next()}{next()} and
     \l{QListIterator::previous()}{previous()} on an iterator:
 
-    \image javaiterators2.png Iterating to the next and previous items
+    \image javaiterators2.svg Iterating to the next and previous items
 
     The following table summarizes the QListIterator API:
 
diff --git a/src/corelib/text/qregularexpression.cpp b/src/corelib/text/qregularexpression.cpp
index 5cc8e8681bb..0c65e18ec10 100644
--- a/src/corelib/text/qregularexpression.cpp
+++ b/src/corelib/text/qregularexpression.cpp
@@ -952,7 +952,7 @@ void QRegularExpressionPrivate::getPatternInfo()
 namespace {
 struct PcreJitStackFree
 {
-    void operator()(pcre2_jit_stack_16 *stack)
+    void operator()(pcre2_jit_stack_16 *stack) const
     {
         if (stack)
             pcre2_jit_stack_free_16(stack);
diff --git a/src/corelib/thread/qfuture.qdoc b/src/corelib/thread/qfuture.qdoc
index f3f32e20adc..5e97086694b 100644
--- a/src/corelib/thread/qfuture.qdoc
+++ b/src/corelib/thread/qfuture.qdoc
@@ -786,7 +786,7 @@
     between the second and third result, and returns the second result; and
     so on.
 
-    \image javaiterators1.png
+    \image javaiterators1.svg
 
     Here's how to iterate over the elements in reverse order: