diff options
author | Andreas Buhr <andreas@andreasbuhr.de> | 2020-12-01 14:55:22 +0100 |
---|---|---|
committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2020-12-01 18:43:21 +0000 |
commit | 54c18ea30acd11cd8c10ca68b5d7bf9d589b2699 (patch) | |
tree | 256b2bee107970885970f6d102da2512829cb04a /src/gui/image | |
parent | e50cd75a77e678d409c72ab8fdd503b5b9e8ded8 (diff) |
Fix documentation links to High DPI documentation
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
Change-Id: I5e9417554270a6740986d7cec5e3433d043e5560
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
(cherry picked from commit 10b6a87679d02d7cf5dcd2f75d5640ffb1e1303e)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'src/gui/image')
-rw-r--r-- | src/gui/image/qicon.cpp | 2 | ||||
-rw-r--r-- | src/gui/image/qiconengine.cpp | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/gui/image/qicon.cpp b/src/gui/image/qicon.cpp index 0bbc4005a0..fdb2ab0f9b 100644 --- a/src/gui/image/qicon.cpp +++ b/src/gui/image/qicon.cpp @@ -624,7 +624,7 @@ QFactoryLoader *qt_iconEngineFactoryLoader() \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(). \l addFile() is useful if you have your own custom directory structure and do diff --git a/src/gui/image/qiconengine.cpp b/src/gui/image/qiconengine.cpp index f1004b4d2a..c5727e8ae6 100644 --- a/src/gui/image/qiconengine.cpp +++ b/src/gui/image/qiconengine.cpp @@ -160,8 +160,8 @@ void QIconEngine::addFile(const QString &/*fileName*/, const QSize &/*size*/, QI was added in Qt 5.7. \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 - DPI Terms}{device pixel ratio}). The \a data argument of the virtual_hook() + according to the given scale (typically equal to the \l {High + DPI}{device pixel ratio}). The \a data argument of the virtual_hook() function is a \l ScaledPixmapArgument pointer that contains both the input and 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 struct provides a way for icons created via \l QIcon::fromTheme() - to return pixmaps that are designed for the current \l {Glossary Of High - DPI Terms}{device pixel ratio}. The scale for such an icon is specified + to return pixmaps that are designed for the current \l {High + DPI}{device pixel ratio}. The scale for such an icon is specified using the \l {Icon Theme Specification - Directory Layout}{Scale directory key} 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. - The \a scale argument is typically equal to the \l {Glossary Of High DPI - Terms}{device pixel ratio} of the display. + The \a scale argument is typically equal to the \l {High DPI} + {device pixel ratio} of the display. \include qiconengine-virtualhookhelper.qdocinc |