summaryrefslogtreecommitdiffstats
path: root/src/corelib/global/qnamespace.h
diff options
context:
space:
mode:
authorTor Arne Vestbø <tor.arne.vestbo@qt.io>2020-08-31 14:01:12 +0200
committerTor Arne Vestbø <tor.arne.vestbo@qt.io>2020-08-31 19:14:55 +0200
commit90358f6042d1fe2db849e17e1b0c875fb0560b20 (patch)
tree493e57226970f613c18871d086ae88031b091fde /src/corelib/global/qnamespace.h
parent8028474e62c584ed3d5bb0f662b9690ca029f028 (diff)
Deprecate and remove uses of AA_DisableHighDpiScaling
Change-Id: Ibadce68775858c524b998aacad310905ba2c2e8e Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
Diffstat (limited to 'src/corelib/global/qnamespace.h')
-rw-r--r--src/corelib/global/qnamespace.h8
1 files changed, 6 insertions, 2 deletions
diff --git a/src/corelib/global/qnamespace.h b/src/corelib/global/qnamespace.h
index 86afa623a9..9b5af17f7c 100644
--- a/src/corelib/global/qnamespace.h
+++ b/src/corelib/global/qnamespace.h
@@ -470,9 +470,13 @@ namespace Qt {
AA_ShareOpenGLContexts = 18,
AA_SetPalette = 19,
#if QT_DEPRECATED_SINCE(6, 0)
- AA_EnableHighDpiScaling Q_DECL_ENUMERATOR_DEPRECATED = 20,
+ AA_EnableHighDpiScaling Q_DECL_ENUMERATOR_DEPRECATED_X(
+ "High-DPI scaling is always enabled. " \
+ "This attribute no longer has any effect.") = 20,
+ AA_DisableHighDpiScaling Q_DECL_ENUMERATOR_DEPRECATED_X(
+ "High-DPI scaling is always enabled. " \
+ "This attribute no longer has any effect.") = 21,
#endif
- AA_DisableHighDpiScaling = 21,
AA_UseStyleSheetPropagationInWidgetStyles = 22,
AA_DontUseNativeDialogs = 23,
AA_SynthesizeMouseForUnhandledTabletEvents = 24,