summaryrefslogtreecommitdiffstats
path: root/src/corelib
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2020-04-20 23:39:16 +0200
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2020-04-20 23:39:31 +0200
commit806bc5fc0559119a2d24d7464a56d5692da91b36 (patch)
tree71d42b144eb094941cf5f230080b3a5837ebb4e8 /src/corelib
parent51a348b2e24544f4d42aee10824c98df59062edc (diff)
parent5725cb72f18ac24abb207940570617f1009d06c3 (diff)
Merge "Merge remote-tracking branch 'origin/5.14' into 5.15"
Diffstat (limited to 'src/corelib')
-rw-r--r--src/corelib/global/qnamespace.qdoc2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/global/qnamespace.qdoc b/src/corelib/global/qnamespace.qdoc
index 3e22c9e661..2fe019f372 100644
--- a/src/corelib/global/qnamespace.qdoc
+++ b/src/corelib/global/qnamespace.qdoc
@@ -291,7 +291,7 @@
application on supported platforms, use of a session manager may be
redundant for system services.
This attribute must be set before QGuiApplication is constructed.
- This value was added in 5.13
+ This value was added in 5.14
\value AA_DisableNativeVirtualKeyboard When this attribute is set, the native
on-screen virtual keyboard will not be shown automatically when a