diff options
| author | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2020-08-31 14:01:12 +0200 |
|---|---|---|
| committer | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2020-08-31 19:14:55 +0200 |
| commit | 90358f6042d1fe2db849e17e1b0c875fb0560b20 (patch) | |
| tree | 493e57226970f613c18871d086ae88031b091fde /src/corelib | |
| parent | 8028474e62c584ed3d5bb0f662b9690ca029f028 (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')
| -rw-r--r-- | src/corelib/global/qnamespace.h | 8 | ||||
| -rw-r--r-- | src/corelib/global/qnamespace.qdoc | 10 | ||||
| -rw-r--r-- | src/corelib/kernel/qcoreapplication.cpp | 1 |
3 files changed, 7 insertions, 12 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, diff --git a/src/corelib/global/qnamespace.qdoc b/src/corelib/global/qnamespace.qdoc index b96d8e0656..b5830173f8 100644 --- a/src/corelib/global/qnamespace.qdoc +++ b/src/corelib/global/qnamespace.qdoc @@ -208,15 +208,6 @@ \value AA_SetPalette Indicates whether a palette was explicitly set on the QGuiApplication. This value was added in Qt 5.5. - \value AA_DisableHighDpiScaling Disables high-DPI scaling in Qt, exposing window - system coordinates. Note that the window system may do its own scaling, - so this does not guarantee that QPaintDevice::devicePixelRatio() will - be equal to 1. In addition, scale factors set by QT_SCALE_FACTOR will not - be affected. This corresponds to setting the - QT_AUTO_SCREEN\unicode{0x200b}_SCALE_FACTOR environment variable to 0. - This attribute must be set before QGuiApplication is constructed. - This value was added in Qt 5.6. - \value AA_UseStyleSheetPropagationInWidgetStyles By default, Qt Style Sheets disable regular QWidget palette and font propagation. When this flag is enabled, font and palette changes propagate as though the user had @@ -291,6 +282,7 @@ \omitvalue AA_AttributeCount \omitvalue AA_EnableHighDpiScaling \omitvalue AA_UseHighDpiPixmaps + \omitvalue AA_DisableHighDpiScaling */ /*! diff --git a/src/corelib/kernel/qcoreapplication.cpp b/src/corelib/kernel/qcoreapplication.cpp index f9bd7bb63b..9892680109 100644 --- a/src/corelib/kernel/qcoreapplication.cpp +++ b/src/corelib/kernel/qcoreapplication.cpp @@ -951,7 +951,6 @@ void QCoreApplication::setAttribute(Qt::ApplicationAttribute attribute, bool on) if (Q_UNLIKELY(QCoreApplicationPrivate::is_app_running)) { #endif switch (attribute) { - case Qt::AA_DisableHighDpiScaling: case Qt::AA_PluginApplication: case Qt::AA_UseDesktopOpenGL: case Qt::AA_UseOpenGLES: |