diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/corelib/global/qnamespace.h | 4 | ||||
| -rw-r--r-- | src/corelib/global/qnamespace.qdoc | 11 | ||||
| -rw-r--r-- | src/corelib/kernel/qcoreapplication.cpp | 1 | ||||
| -rw-r--r-- | src/gui/kernel/qguiapplication.cpp | 2 | ||||
| -rw-r--r-- | src/widgets/widgets/qdockwidget.cpp | 4 |
5 files changed, 7 insertions, 15 deletions
diff --git a/src/corelib/global/qnamespace.h b/src/corelib/global/qnamespace.h index 9dda3572b4..01138e58ed 100644 --- a/src/corelib/global/qnamespace.h +++ b/src/corelib/global/qnamespace.h @@ -487,7 +487,9 @@ namespace Qt { AA_UseSoftwareOpenGL = 17, AA_ShareOpenGLContexts = 18, AA_SetPalette = 19, - AA_EnableHighDpiScaling = 20, +#if QT_DEPRECATED_SINCE(6, 0) + AA_EnableHighDpiScaling Q_DECL_ENUMERATOR_DEPRECATED = 20, +#endif AA_DisableHighDpiScaling = 21, AA_UseStyleSheetPropagationInWidgetStyles = 22, AA_DontUseNativeDialogs = 23, diff --git a/src/corelib/global/qnamespace.qdoc b/src/corelib/global/qnamespace.qdoc index a3d1564b06..6532f3bbab 100644 --- a/src/corelib/global/qnamespace.qdoc +++ b/src/corelib/global/qnamespace.qdoc @@ -215,15 +215,6 @@ \value AA_SetPalette Indicates whether a palette was explicitly set on the QGuiApplication. This value was added in Qt 5.5. - \value AA_EnableHighDpiScaling Enables high-DPI scaling in Qt on supported - platforms (see also \l{High DPI Displays}). Supported platforms are - X11, Windows and Android. Enabling makes Qt scale the main (device - independent) coordinate system according to display scale factors - provided by the operating system. This corresponds to setting the - QT_AUTO_SCREEN\unicode{0x200b}_SCALE_FACTOR environment variable to - 1. This attribute must be set before QGuiApplication is constructed. - This value was added in Qt 5.6. - \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 @@ -305,6 +296,7 @@ This value was added in 5.15 \omitvalue AA_AttributeCount + \omitvalue AA_EnableHighDpiScaling */ /*! @@ -3270,7 +3262,6 @@ environment variable. \sa QGuiApplication::setHighDpiScaleFactorRoundingPolicy() - \sa AA_EnableHighDpiScaling. \omitvalue Unset \value Round Round up for .5 and above. diff --git a/src/corelib/kernel/qcoreapplication.cpp b/src/corelib/kernel/qcoreapplication.cpp index ab1d500087..3bda921820 100644 --- a/src/corelib/kernel/qcoreapplication.cpp +++ b/src/corelib/kernel/qcoreapplication.cpp @@ -952,7 +952,6 @@ void QCoreApplication::setAttribute(Qt::ApplicationAttribute attribute, bool on) if (Q_UNLIKELY(QCoreApplicationPrivate::is_app_running)) { #endif switch (attribute) { - case Qt::AA_EnableHighDpiScaling: case Qt::AA_DisableHighDpiScaling: case Qt::AA_PluginApplication: case Qt::AA_UseDesktopOpenGL: diff --git a/src/gui/kernel/qguiapplication.cpp b/src/gui/kernel/qguiapplication.cpp index 81ee315c0d..d3e97ebe5c 100644 --- a/src/gui/kernel/qguiapplication.cpp +++ b/src/gui/kernel/qguiapplication.cpp @@ -3699,7 +3699,7 @@ Qt::ApplicationState QGuiApplication::applicationState() Sets the high-DPI scale factor rounding policy for the application. The \a policy decides how non-integer scale factors (such as Windows 150%) are - handled, for applications that have AA_EnableHighDpiScaling enabled. + handled. The two principal options are whether fractional scale factors should be rounded to an integer or not. Keeping the scale factor as-is will diff --git a/src/widgets/widgets/qdockwidget.cpp b/src/widgets/widgets/qdockwidget.cpp index df335c9ca6..fd9e98c795 100644 --- a/src/widgets/widgets/qdockwidget.cpp +++ b/src/widgets/widgets/qdockwidget.cpp @@ -1586,8 +1586,8 @@ bool QDockWidget::event(QEvent *event) // Usually the window won't get resized while it's being moved, but it can happen, // for example on Windows when moving to a screen with bigger scale factor - // (and Qt::AA_EnableHighDpiScaling is enabled). If that happens we should - // update state->pressPos, otherwise it will be outside the window when the window shrinks. + // If that happens we should update state->pressPos, otherwise it will be outside + // the window when the window shrinks. if (d->state && d->state->dragging) d->recalculatePressPos(static_cast<QResizeEvent*>(event)); break; |