summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Buhr <andreas@andreasbuhr.de>2020-12-01 14:55:22 +0100
committerAndreas Buhr <andreas@andreasbuhr.de>2020-12-01 15:48:53 +0100
commit10b6a87679d02d7cf5dcd2f75d5640ffb1e1303e (patch)
treea1616c7f6b31f5cc0dddfd8249f609577d918082
parentb21dba98e3e557eece0497aeea0f0beb70cc62da (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 Pick-to: 6.0 Change-Id: I5e9417554270a6740986d7cec5e3433d043e5560 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
-rw-r--r--examples/widgets/doc/src/tablet.qdoc2
-rw-r--r--src/gui/image/qicon.cpp2
-rw-r--r--src/gui/image/qiconengine.cpp12
-rw-r--r--src/gui/kernel/qguiapplication.cpp2
4 files changed, 9 insertions, 9 deletions
diff --git a/examples/widgets/doc/src/tablet.qdoc b/examples/widgets/doc/src/tablet.qdoc
index 639f28a33c..a10846fed4 100644
--- a/examples/widgets/doc/src/tablet.qdoc
+++ b/examples/widgets/doc/src/tablet.qdoc
@@ -251,7 +251,7 @@
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
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.
After that, we simply draw the pixmap to the top left of the widget.
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
diff --git a/src/gui/kernel/qguiapplication.cpp b/src/gui/kernel/qguiapplication.cpp
index c10b95e206..6fd4562aa1 100644
--- a/src/gui/kernel/qguiapplication.cpp
+++ b/src/gui/kernel/qguiapplication.cpp
@@ -599,7 +599,7 @@ static QWindowGeometrySpecification windowGeometrySpecification = Q_WINDOW_GEOME
\c none disables them.
\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=directwrite}, uses the experimental DirectWrite
font database and defaults to using the DirectWrite font