summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
Diffstat (limited to 'doc')
-rw-r--r--doc/global/externalsites/external-resources.qdoc4
-rw-r--r--doc/global/externalsites/rfc.qdoc10
-rw-r--r--doc/global/macros.qdocconf10
3 files changed, 19 insertions, 5 deletions
diff --git a/doc/global/externalsites/external-resources.qdoc b/doc/global/externalsites/external-resources.qdoc
index 272c73b3b0..0dcea08a53 100644
--- a/doc/global/externalsites/external-resources.qdoc
+++ b/doc/global/externalsites/external-resources.qdoc
@@ -33,6 +33,10 @@
\title Android: Tagged Pointers
*/
/*!
+ \externalpage https://developer.android.com/build/configure-app-module
+ \title Android: Configure the app module
+*/
+/*!
\externalpage https://developer.apple.com/documentation/uikit/uiapplication/1622952-canopenurl
\title iOS: canOpenURL:
*/
diff --git a/doc/global/externalsites/rfc.qdoc b/doc/global/externalsites/rfc.qdoc
index b6646f453c..ceab869bfd 100644
--- a/doc/global/externalsites/rfc.qdoc
+++ b/doc/global/externalsites/rfc.qdoc
@@ -125,6 +125,11 @@
*/
/*!
+ \externalpage https://datatracker.ietf.org/doc/html/rfc6698
+ \title RFC 6698
+*/
+
+/*!
\externalpage https://datatracker.ietf.org/doc/html/rfc7049
\title RFC 7049
*/
@@ -150,6 +155,11 @@
*/
/*!
+ \externalpage https://datatracker.ietf.org/doc/html/rfc7858
+ \title RFC 7858
+*/
+
+/*!
\externalpage https://datatracker.ietf.org/doc/html/rfc8018#section-5.1
\title RFC 8018, section 5.1
*/
diff --git a/doc/global/macros.qdocconf b/doc/global/macros.qdocconf
index 450ded322a..0bb02323c1 100644
--- a/doc/global/macros.qdocconf
+++ b/doc/global/macros.qdocconf
@@ -85,19 +85,19 @@ macro.QtTAS = "Qt Tools for Android Studio"
# The following macros are used for various Android docs. The purpose is to keep
# it as simple as updating these instead of updating multiple lines in scattered locations.
-macro.AndroidAbis = "\\c{arm64-v8}, \\c{x86_64}, \\c{x86}, and \\c{armeabi-v7a}"
+macro.AndroidAbis = "\\c{arm64-v8a}, \\c{x86_64}, \\c{x86}, and \\c{armeabi-v7a}"
macro.NdkVer = "r26b"
macro.NdkFullVer = "26.1.10909125"
macro.NdkCompilerVer = "Clang 17.0.2"
macro.JdkVer = "17"
-macro.AndroidMinApiVer = "26"
+macro.AndroidMinApiVer = "28"
macro.AndroidMaxApiVer = "34"
-macro.AndroidMinVer = "8.0"
+macro.AndroidMinVer = "9"
macro.AndroidMaxVer = "14"
macro.AndroidPlatformVer = "34"
macro.AndroidBuildToolsVer = "34.0.0"
-macro.GradleVer = "8.3"
-macro.AGPVer = "7.4.1"
+macro.GradleVer = "8.7"
+macro.AGPVer = "8.4.0"
macro.AAOSVer = "10 to 13"
macro.beginfloatleft.HTML = "<div style=\"float: left; margin-right: 2em\">"