diff options
| author | Simon Hausmann <simon.hausmann@qt.io> | 2020-03-16 18:41:27 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2020-03-16 18:41:27 +0100 |
| commit | ff922e7b87de147797fbd759167878aec7625f0c (patch) | |
| tree | a326819f23e2421723f144522f9362ba608d6bb1 /src/gui/doc | |
| parent | e464e1eb8eb63c631fb0916c3ea4540a88d8aad3 (diff) | |
| parent | 75f52bd0ddc4afbd181c14b310d256e3507052d6 (diff) | |
Merge remote-tracking branch 'origin/5.15' into dev
Conflicts:
src/corelib/kernel/qmetatype.cpp
Change-Id: I88eb0d3e9c9a38abf7241a51e370c655ae74e38a
Diffstat (limited to 'src/gui/doc')
| -rw-r--r-- | src/gui/doc/src/paintsystem.qdoc | 3 | ||||
| -rw-r--r-- | src/gui/doc/src/richtext.qdoc | 6 |
2 files changed, 0 insertions, 9 deletions
diff --git a/src/gui/doc/src/paintsystem.qdoc b/src/gui/doc/src/paintsystem.qdoc index 98d71e9e55..163c0252da 100644 --- a/src/gui/doc/src/paintsystem.qdoc +++ b/src/gui/doc/src/paintsystem.qdoc @@ -93,7 +93,6 @@ \page paintsystem-devices.html \title Paint Devices and Backends - \contentspage The Paint System \nextpage Drawing and Filling \section1 Creating a Paint Device @@ -185,7 +184,6 @@ \title Drawing and Filling \previouspage Paint Devices and Backends - \contentspage The Paint System \nextpage Coordinate System \section1 Drawing @@ -303,7 +301,6 @@ \title Reading and Writing Image Files \previouspage Coordinate System - \contentspage The Paint System The most common way to read images is through QImage and QPixmap's constructors, or by calling the QImage::load() and QPixmap::load() diff --git a/src/gui/doc/src/richtext.qdoc b/src/gui/doc/src/richtext.qdoc index 31a2ebf05b..b7c731cf43 100644 --- a/src/gui/doc/src/richtext.qdoc +++ b/src/gui/doc/src/richtext.qdoc @@ -83,7 +83,6 @@ /*! \page richtext-structure.html - \contentspage richtext.html Contents \previouspage Rich Text Processing \nextpage The QTextCursor Interface @@ -349,7 +348,6 @@ /*! \page richtext-cursor.html - \contentspage richtext.html Contents \previouspage Rich Text Document Structure \nextpage Document Layouts @@ -656,7 +654,6 @@ /*! \page richtext-layouts.html - \contentspage richtext.html Contents \previouspage The QTextCursor Interface \nextpage Common Rich Text Editing Tasks @@ -707,7 +704,6 @@ /*! \page richtext-common-tasks.html - \contentspage richtext.html Contents \previouspage Document Layouts \nextpage Advanced Rich Text Processing @@ -800,7 +796,6 @@ /*! \page richtext-advanced-processing.html - \contentspage richtext.html Contents \previouspage Common Rich Text Editing Tasks \nextpage Supported HTML Subset @@ -849,7 +844,6 @@ \title Supported HTML Subset \brief Describes the support for HTML markup in text widgets. - \contentspage richtext.html Contents \previouspage Common Rich Text Editing Tasks Qt's text widgets are able to display rich text, specified using a subset of \l {http://www.w3.org/TR/html401/}{HTML 4} |