summaryrefslogtreecommitdiffstats
path: root/src/corelib/global
diff options
context:
space:
mode:
authorAndre de la Rocha <andre.rocha@qt.io>2020-02-25 16:41:39 +0100
committerAndre de la Rocha <andre.rocha@qt.io>2020-02-25 19:53:27 +0100
commita434880e624aa56c14914af1741349eff255aea2 (patch)
treef956b0871e4fefad4e4f7e3f3a5697da61ab968c /src/corelib/global
parent0394961f953094ab3535b79329dace4ed9a0300d (diff)
Rename AA_MSWindowsDisableVirtualKeyboard to AA_DisableNativeVirtualKeyboard
Renaming the attribute to make it platform-independent, since in spite of currently being supported only on Windows, it may be eventually supported on other platforms where it may be useful. Task-number: QTBUG-76088 Change-Id: Id98ccd7a34e1c43b1f2274efce6ab4b4aff24f03 Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Diffstat (limited to 'src/corelib/global')
-rw-r--r--src/corelib/global/qnamespace.h2
-rw-r--r--src/corelib/global/qnamespace.qdoc8
2 files changed, 5 insertions, 5 deletions
diff --git a/src/corelib/global/qnamespace.h b/src/corelib/global/qnamespace.h
index 17ae73536d..b745d0de7e 100644
--- a/src/corelib/global/qnamespace.h
+++ b/src/corelib/global/qnamespace.h
@@ -523,7 +523,7 @@ public:
AA_DontUseNativeMenuBar = 6,
AA_MacDontSwapCtrlAndMeta = 7,
AA_Use96Dpi = 8,
- AA_MSWindowsDisableVirtualKeyboard = 9,
+ AA_DisableNativeVirtualKeyboard = 9,
#if QT_DEPRECATED_SINCE(5, 14)
AA_X11InitThreads Q_DECL_ENUMERATOR_DEPRECATED = 10,
#endif
diff --git a/src/corelib/global/qnamespace.qdoc b/src/corelib/global/qnamespace.qdoc
index cfa86888b2..3e22c9e661 100644
--- a/src/corelib/global/qnamespace.qdoc
+++ b/src/corelib/global/qnamespace.qdoc
@@ -293,10 +293,10 @@
This attribute must be set before QGuiApplication is constructed.
This value was added in 5.13
- \value AA_MSWindowsDisableVirtualKeyboard When this attribute is set,
- Windows' native on-screen virtual keyboard will not be shown
- automatically when a text input widget gains focus on a system
- without a physical keyboard.
+ \value AA_DisableNativeVirtualKeyboard When this attribute is set, the native
+ on-screen virtual keyboard will not be shown automatically when a
+ text input widget gains focus on a system without a physical keyboard.
+ Currently supported on the Windows platform only.
This value was added in 5.15
The following values are deprecated or obsolete: