1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix documentation links to High DPI documentation

Browse Source 
The documentation on High DPI was recently rewritten, renaming
several sections. This patch fixes the links which were broken
by this change.

Task-number: QTBUG-88533
Pick-to: 6.0
Change-Id: I5e9417554270a6740986d7cec5e3433d043e5560
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
This commit is contained in:
Andreas Buhr 2020-12-01 14:55:22 +01:00
parent b21dba98e3
commit 10b6a87679
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/widgets/doc/src/tablet.qdoc
View File

@ -251,7 +251,7 @@
rendering to, we can create a pixmap with the appropriate resolution. rendering to, we can create a pixmap with the appropriate resolution.
The size of the pixmap with which we fill the window depends on the screen The size of the pixmap with which we fill the window depends on the screen
resolution, as the example does not support zoom; and it may be that one resolution, as the example does not support zoom; and it may be that one
screen is \l {High DPI Displays}{high DPI} while another is not. We need to screen is \l {High DPI}{high DPI} while another is not. We need to
draw the background too, as the default is gray. draw the background too, as the default is gray.
After that, we simply draw the pixmap to the top left of the widget. After that, we simply draw the pixmap to the top left of the widget.

2
src/gui/image/qicon.cpp
View File

@ -624,7 +624,7 @@ QFactoryLoader *qt_iconEngineFactoryLoader()
\section1 High DPI Icons \section1 High DPI Icons
There are two ways that QIcon supports \l {High DPI Displays}{high DPI} There are two ways that QIcon supports \l {High DPI}{high DPI}
icons: via \l addFile() and \l fromTheme(). icons: via \l addFile() and \l fromTheme().
\l addFile() is useful if you have your own custom directory structure and do \l addFile() is useful if you have your own custom directory structure and do

12
src/gui/image/qiconengine.cpp
View File

@ -160,8 +160,8 @@ void QIconEngine::addFile(const QString &/*fileName*/, const QSize &/*size*/, QI
was added in Qt 5.7. was added in Qt 5.7.
\value ScaledPixmapHook Provides a way to get a pixmap that is scaled \value ScaledPixmapHook Provides a way to get a pixmap that is scaled
according to the given scale (typically equal to the \l {Glossary Of High according to the given scale (typically equal to the \l {High
DPI Terms}{device pixel ratio}). The \a data argument of the virtual_hook() DPI}{device pixel ratio}). The \a data argument of the virtual_hook()
function is a \l ScaledPixmapArgument pointer that contains both the input and function is a \l ScaledPixmapArgument pointer that contains both the input and
output arguments. This enum value was added in Qt 5.9. output arguments. This enum value was added in Qt 5.9.
@ -178,8 +178,8 @@ void QIconEngine::addFile(const QString &/*fileName*/, const QSize &/*size*/, QI
the \a id parameter is QIconEngine::ScaledPixmapHook. the \a id parameter is QIconEngine::ScaledPixmapHook.
The struct provides a way for icons created via \l QIcon::fromTheme() The struct provides a way for icons created via \l QIcon::fromTheme()
to return pixmaps that are designed for the current \l {Glossary Of High to return pixmaps that are designed for the current \l {High
DPI Terms}{device pixel ratio}. The scale for such an icon is specified DPI}{device pixel ratio}. The scale for such an icon is specified
using the \l {Icon Theme Specification - Directory Layout}{Scale directory key} using the \l {Icon Theme Specification - Directory Layout}{Scale directory key}
in the appropriate \c index.theme file. in the appropriate \c index.theme file.
@ -323,8 +323,8 @@ bool QIconEngine::isNull()
Returns a pixmap for the given \a size, \a mode, \a state and \a scale. Returns a pixmap for the given \a size, \a mode, \a state and \a scale.
The \a scale argument is typically equal to the \l {Glossary Of High DPI The \a scale argument is typically equal to the \l {High DPI}
Terms}{device pixel ratio} of the display. {device pixel ratio} of the display.
\include qiconengine-virtualhookhelper.qdocinc \include qiconengine-virtualhookhelper.qdocinc

2
src/gui/kernel/qguiapplication.cpp
View File

@ -599,7 +599,7 @@ static QWindowGeometrySpecification windowGeometrySpecification = Q_WINDOW_GEOME
\c none disables them. \c none disables them.
\li \c {dpiawareness=[0|1|2]} Sets the DPI awareness of the process \li \c {dpiawareness=[0|1|2]} Sets the DPI awareness of the process
(see \l{High DPI Displays}, since Qt 5.4). (see \l{High DPI}, since Qt 5.4).
\li \c {fontengine=freetype}, uses the FreeType font engine. \li \c {fontengine=freetype}, uses the FreeType font engine.
\li \c {fontengine=directwrite}, uses the experimental DirectWrite \li \c {fontengine=directwrite}, uses the experimental DirectWrite
font database and defaults to using the DirectWrite font font database and defaults to using the DirectWrite font