20 files changed, 9 insertions, 8 deletions
diff --git a/src/labs/platform/qquicklabsplatformcolordialog.cpp b/src/labs/platform/qquicklabsplatformcolordialog.cpp
index 72f63f5f3f..e4ce7e9944 100644
--- a/src/labs/platform/qquicklabsplatformcolordialog.cpp
+++ b/src/labs/platform/qquicklabsplatformcolordialog.cpp
@@ -14,7 +14,7 @@ QT_BEGIN_NAMESPACE
 //! \nativetype QQuickLabsPlatformColorDialog
     \inqmlmodule Qt.labs.platform
     \since 5.8
-    \deprecated [6.9] Use \l{QtQuick.Dialogs::ColorDialog} instead.
+    \deprecated [6.9] Use \l [QtQuickDialogs] {ColorDialog}{QtQuick.Dialogs ColorDialog} instead.
     \brief A native color dialog.
 
     The ColorDialog type provides a QML API for native platform color dialogs.
diff --git a/src/labs/platform/qquicklabsplatformdialog.cpp b/src/labs/platform/qquicklabsplatformdialog.cpp
index 11450c43a5..290494cfca 100644
--- a/src/labs/platform/qquicklabsplatformdialog.cpp
+++ b/src/labs/platform/qquicklabsplatformdialog.cpp
@@ -19,7 +19,7 @@ QT_BEGIN_NAMESPACE
 //! \nativetype QQuickLabsPlatformDialog
     \inqmlmodule Qt.labs.platform
     \since 5.8
-    \deprecated [6.11] Use \l {QtQuick.Dialogs::Dialog} instead.
+    \deprecated [6.11] Use \l [QtQuickDialogs] {Dialog}{QtQuick.Dialogs Dialog} instead.
     \brief The base class of native dialogs.
 
     The Dialog type provides common QML API for native platform dialogs.
diff --git a/src/labs/platform/qquicklabsplatformfiledialog.cpp b/src/labs/platform/qquicklabsplatformfiledialog.cpp
index c58e1cb2da..ef72024b2e 100644
--- a/src/labs/platform/qquicklabsplatformfiledialog.cpp
+++ b/src/labs/platform/qquicklabsplatformfiledialog.cpp
@@ -18,7 +18,7 @@ using namespace Qt::StringLiterals;
 //!     \nativetype QQuickLabsPlatformFileDialog
     \inqmlmodule Qt.labs.platform
     \since 5.8
-    \deprecated [6.9] Use \l{QtQuick.Dialogs::FileDialog} instead.
+    \deprecated [6.9] Use \l [QtQuickDialogs] {FileDialog}{QtQuick.Dialogs FileDialog} instead.
     \brief A native file dialog.
 
     The FileDialog type provides a QML API for native platform file dialogs.
diff --git a/src/labs/platform/qquicklabsplatformfolderdialog.cpp b/src/labs/platform/qquicklabsplatformfolderdialog.cpp
index c5e0ba040a..ebdd73568c 100644
--- a/src/labs/platform/qquicklabsplatformfolderdialog.cpp
+++ b/src/labs/platform/qquicklabsplatformfolderdialog.cpp
@@ -14,7 +14,7 @@ QT_BEGIN_NAMESPACE
 //!     \nativetype QQuickLabsPlatformFolderDialog
     \inqmlmodule Qt.labs.platform
     \since 5.8
-    \deprecated [6.9] Use \l{QtQuick.Dialogs::FolderDialog} instead.
+    \deprecated [6.9] Use \l [QtQuickDialogs] {FolderDialog}{QtQuick.Dialogs FolderDialog} instead.
     \brief A native folder dialog.
 
     The FolderDialog type provides a QML API for native platform folder dialogs.
diff --git a/src/labs/platform/qquicklabsplatformfontdialog.cpp b/src/labs/platform/qquicklabsplatformfontdialog.cpp
index 4d17d8af9e..9894fd9688 100644
--- a/src/labs/platform/qquicklabsplatformfontdialog.cpp
+++ b/src/labs/platform/qquicklabsplatformfontdialog.cpp
@@ -14,7 +14,7 @@ QT_BEGIN_NAMESPACE
 //!     \nativetype QQuickLabsPlatformFontDialog
     \inqmlmodule Qt.labs.platform
     \since 5.8
-    \deprecated [6.9] Use \l{QtQuick.Dialogs::FontDialog} instead.
+    \deprecated [6.9] Use \l [QtQuickDialogs] {FontDialog}{QtQuick.Dialogs FontDialog} instead.
     \brief A native font dialog.
 
     The FontDialog type provides a QML API for native platform font dialogs.
diff --git a/src/labs/platform/qquicklabsplatformmessagedialog.cpp b/src/labs/platform/qquicklabsplatformmessagedialog.cpp
index 66b54b959b..f43014193b 100644
--- a/src/labs/platform/qquicklabsplatformmessagedialog.cpp
+++ b/src/labs/platform/qquicklabsplatformmessagedialog.cpp
@@ -16,7 +16,7 @@ QT_BEGIN_NAMESPACE
 //!     \nativetype QQuickLabsPlatformMessageDialog
     \inqmlmodule Qt.labs.platform
     \since 5.8
-    \deprecated [6.9] Use \l{QtQuick.Dialogs::MessageDialog} instead.
+    \deprecated [6.9] Use \l [QtQuickDialogs] {MessageDialog}{QtQuick.Dialogs MessageDialog} instead.
     \brief A native message dialog.
 
     The MessageDialog type provides a QML API for native platform message dialogs.
diff --git a/src/quick/platform/android/jar/build.gradle b/src/quick/platform/android/jar/build.gradle
index ea6d06c257..9e152d13c3 100644
--- a/src/quick/platform/android/jar/build.gradle
+++ b/src/quick/platform/android/jar/build.gradle
@@ -23,7 +23,7 @@ repositories {
 }
 
 android {
-    compileSdk 34
+    compileSdk 36
 
     defaultConfig {
         minSdkVersion 28
diff --git a/src/quickcontrols/ios/Switch.qml b/src/quickcontrols/ios/Switch.qml
index 93afe9092a..9d02c6e219 100644
--- a/src/quickcontrols/ios/Switch.qml
+++ b/src/quickcontrols/ios/Switch.qml
@@ -35,7 +35,8 @@ T.Switch {
             states: [
                 {"light": Application.styleHints.colorScheme === Qt.Light},
                 {"dark": Application.styleHints.colorScheme === Qt.Dark},
-                {"checked": control.checked}
+                {"checked": control.checked},
+                {"highcontrast": Application.styleHints.accessibility.contrastPreference === Qt.HighContrast}
             ]
         }
 
diff --git a/src/quickcontrols/ios/images/switch-indicator-checked-dark-highcontrast.png b/src/quickcontrols/ios/images/switch-indicator-checked-dark-highcontrast.png
new file mode 100644
index 0000000000..f2ebde954a
--- /dev/null
+++ b/src/quickcontrols/ios/images/switch-indicator-checked-dark-highcontrast.png
diff --git a/src/quickcontrols/ios/images/switch-indicator-checked-dark-highcontrast@2x.png b/src/quickcontrols/ios/images/switch-indicator-checked-dark-highcontrast@2x.png
new file mode 100644
index 0000000000..53e56c72f5
--- /dev/null
+++ b/src/quickcontrols/ios/images/switch-indicator-checked-dark-highcontrast@2x.png
diff --git a/src/quickcontrols/ios/images/switch-indicator-checked-dark-highcontrast@3x.png b/src/quickcontrols/ios/images/switch-indicator-checked-dark-highcontrast@3x.png
new file mode 100644
index 0000000000..57ee35683b
--- /dev/null
+++ b/src/quickcontrols/ios/images/switch-indicator-checked-dark-highcontrast@3x.png
diff --git a/src/quickcontrols/ios/images/switch-indicator-checked-light-highcontrast.png b/src/quickcontrols/ios/images/switch-indicator-checked-light-highcontrast.png
new file mode 100644
index 0000000000..7d61d8ce2c
--- /dev/null
+++ b/src/quickcontrols/ios/images/switch-indicator-checked-light-highcontrast.png
diff --git a/src/quickcontrols/ios/images/switch-indicator-checked-light-highcontrast@2x.png b/src/quickcontrols/ios/images/switch-indicator-checked-light-highcontrast@2x.png
new file mode 100644
index 0000000000..5532073093
--- /dev/null
+++ b/src/quickcontrols/ios/images/switch-indicator-checked-light-highcontrast@2x.png
diff --git a/src/quickcontrols/ios/images/switch-indicator-checked-light-highcontrast@3x.png b/src/quickcontrols/ios/images/switch-indicator-checked-light-highcontrast@3x.png
new file mode 100644
index 0000000000..0d86bc715d
--- /dev/null
+++ b/src/quickcontrols/ios/images/switch-indicator-checked-light-highcontrast@3x.png
diff --git a/src/quickcontrols/ios/images/switch-indicator-dark-highcontrast.png b/src/quickcontrols/ios/images/switch-indicator-dark-highcontrast.png
new file mode 100644
index 0000000000..fecd0fcc84
--- /dev/null
+++ b/src/quickcontrols/ios/images/switch-indicator-dark-highcontrast.png
diff --git a/src/quickcontrols/ios/images/switch-indicator-dark-highcontrast@2x.png b/src/quickcontrols/ios/images/switch-indicator-dark-highcontrast@2x.png
new file mode 100644
index 0000000000..982e3e64f8
--- /dev/null
+++ b/src/quickcontrols/ios/images/switch-indicator-dark-highcontrast@2x.png
diff --git a/src/quickcontrols/ios/images/switch-indicator-dark-highcontrast@3x.png b/src/quickcontrols/ios/images/switch-indicator-dark-highcontrast@3x.png
new file mode 100644
index 0000000000..b951beca2d
--- /dev/null
+++ b/src/quickcontrols/ios/images/switch-indicator-dark-highcontrast@3x.png
diff --git a/src/quickcontrols/ios/images/switch-indicator-light-highcontrast.png b/src/quickcontrols/ios/images/switch-indicator-light-highcontrast.png
new file mode 100644
index 0000000000..926dd1fead
--- /dev/null
+++ b/src/quickcontrols/ios/images/switch-indicator-light-highcontrast.png
diff --git a/src/quickcontrols/ios/images/switch-indicator-light-highcontrast@2x.png b/src/quickcontrols/ios/images/switch-indicator-light-highcontrast@2x.png
new file mode 100644
index 0000000000..565deaf251
--- /dev/null
+++ b/src/quickcontrols/ios/images/switch-indicator-light-highcontrast@2x.png
diff --git a/src/quickcontrols/ios/images/switch-indicator-light-highcontrast@3x.png b/src/quickcontrols/ios/images/switch-indicator-light-highcontrast@3x.png
new file mode 100644
index 0000000000..59a7f06289
--- /dev/null
+++ b/src/quickcontrols/ios/images/switch-indicator-light-highcontrast@3x.png