diff options
| author | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2020-08-29 22:28:34 +0200 |
|---|---|---|
| committer | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2020-08-31 14:29:01 +0200 |
| commit | 2dc46c09026362cc267b1183faf09fb29479ef93 (patch) | |
| tree | 7da9a47745e2fdb213ffa5830f4c867c0c25cd61 /src/corelib/global | |
| parent | 8adb0dde1984438d52de4bcb610e4139558bd1a0 (diff) | |
Deprecate and remove all uses of AA_UseHighDpiPixmaps
High-DPI pixmaps are always enabled, and cannot be disabled.
Change-Id: I01a006b404e5431582b64ef812974c1c022b39ae
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Diffstat (limited to 'src/corelib/global')
| -rw-r--r-- | src/corelib/global/qnamespace.h | 6 | ||||
| -rw-r--r-- | src/corelib/global/qnamespace.qdoc | 8 |
2 files changed, 6 insertions, 8 deletions
diff --git a/src/corelib/global/qnamespace.h b/src/corelib/global/qnamespace.h index dbd0c20282..86afa623a9 100644 --- a/src/corelib/global/qnamespace.h +++ b/src/corelib/global/qnamespace.h @@ -458,7 +458,11 @@ namespace Qt { // AA_X11InitThreads = 10, AA_SynthesizeTouchForUnhandledMouseEvents = 11, AA_SynthesizeMouseForUnhandledTouchEvents = 12, - AA_UseHighDpiPixmaps = 13, +#if QT_DEPRECATED_SINCE(6, 0) + AA_UseHighDpiPixmaps Q_DECL_ENUMERATOR_DEPRECATED_X( + "High-DPI pixmaps are always enabled. " \ + "This attribute no longer has any effect.") = 13, +#endif AA_ForceRasterWidgets = 14, AA_UseDesktopOpenGL = 15, AA_UseOpenGLES = 16, diff --git a/src/corelib/global/qnamespace.qdoc b/src/corelib/global/qnamespace.qdoc index b8c9854555..b96d8e0656 100644 --- a/src/corelib/global/qnamespace.qdoc +++ b/src/corelib/global/qnamespace.qdoc @@ -172,13 +172,6 @@ to left button mouse events instead. This attribute is enabled by default. - \value AA_UseHighDpiPixmaps Make QIcon::pixmap() generate high-dpi pixmaps - that can be larger than the requested size. Such pixmaps will have - \l {QPixmap::devicePixelRatio}{devicePixelRatio()} set to a value higher than 1. - After setting this attribute, application code that uses pixmap - sizes in layout geometry calculations should typically divide by - \l {QPixmap::devicePixelRatio}{devicePixelRatio()} to get device-independent layout geometry. - \value AA_ForceRasterWidgets Make top-level widgets use pure raster surfaces, and do not support non-native GL-based child widgets. @@ -297,6 +290,7 @@ \omitvalue AA_AttributeCount \omitvalue AA_EnableHighDpiScaling + \omitvalue AA_UseHighDpiPixmaps */ /*! |