diff options
| author | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2014-10-27 13:00:36 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2014-10-27 13:00:36 +0100 |
| commit | 2eb26c170920d28213b71e549d5dac4663febb14 (patch) | |
| tree | 8df5223ac114d758c2112a8fc787992175556418 /src/corelib/global | |
| parent | 49ddae28e0dcd1c59dd5d742cffedd5290d1224a (diff) | |
| parent | 81998b4e8e440076bd22a9164f0a93481c0e597a (diff) | |
Merge remote-tracking branch 'origin/5.4' into dev
Conflicts:
src/gui/text/qfontdatabase.cpp
Change-Id: I6ac1f55faa22b8e7b591386fb67f0333d0ea443d
Diffstat (limited to 'src/corelib/global')
| -rw-r--r-- | src/corelib/global/qnamespace.qdoc | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/corelib/global/qnamespace.qdoc b/src/corelib/global/qnamespace.qdoc index 044ba66a4c..4e074bcdb5 100644 --- a/src/corelib/global/qnamespace.qdoc +++ b/src/corelib/global/qnamespace.qdoc @@ -159,11 +159,10 @@ \value AA_UseHighDpiPixmaps Make QIcon::pixmap() generate high-dpi pixmaps that can be larger than the requested size. Such pixmaps will have - 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 - QPixmap::devicePixelRatio() to get device-independent layout geometry. + 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 QPixmap::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. @@ -183,7 +182,7 @@ \l{http://www.mesa3d.org/llvmpipe.html}{Mesa llvmpipe}, providing OpenGL 2.1. The value may have no effect if no such OpenGL implementation is available. The default name of this library is - QtSoftwareOpenGL.dll and can be overridden by setting the environment + opengl32sw.dll and can be overridden by setting the environment variable \e QT_OPENGL_DLL. See the platform-specific pages, for instance \l{Qt for Windows}, for more information. This value has been added in Qt 5.4. @@ -191,7 +190,8 @@ \value AA_ShareOpenGLContexts Enables resource sharing between the OpenGL contexts used by classes like QOpenGLWidget and QQuickWidget. This allows sharing OpenGL resources, like textures, between QOpenGLWidget - instances that belong to different top-level windows. + instances that belong to different top-level windows. This value has + been added in Qt 5.4. The following values are obsolete: |