diff options
| author | Topi Reinio <topi.reinio@qt.io> | 2020-08-01 00:33:49 +0200 |
|---|---|---|
| committer | Topi Reinio <topi.reinio@qt.io> | 2020-08-28 11:37:35 +0200 |
| commit | 239982901beaf039c25b264a9c6b63aa6fe70710 (patch) | |
| tree | 8513201e0e2983bb819d99ac2bfaa2a0c7d18d91 /src/gui/text/qtextlayout.cpp | |
| parent | 00a1e5da7e1aea373a7e6be1d51e1573ff167dd8 (diff) | |
Doc: Fix documentation warnings for Qt GUI
* Drop deprecation warnings for now-dropped items
* Use the 'qt6' define and a new \nothing doc macro to conditionally
document items on Qt 6
* Add a custom module header for docs that pulls in also Vulkan headers
* Add \internal command for internal classes/functions
* Move QtGUI-related code snippets from widgets to gui docs
Change-Id: Ieb386b96631a49568d09059906d307c45c01d93a
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
Diffstat (limited to 'src/gui/text/qtextlayout.cpp')
| -rw-r--r-- | src/gui/text/qtextlayout.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/gui/text/qtextlayout.cpp b/src/gui/text/qtextlayout.cpp index 35dbf677a3..bec1f4a542 100644 --- a/src/gui/text/qtextlayout.cpp +++ b/src/gui/text/qtextlayout.cpp @@ -356,9 +356,13 @@ QTextLayout::QTextLayout(const QString& text) #if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) /*! +\if !defined(qt6) \fn QTextLayout::QTextLayout(const QString &text, const QFont &font, QPaintDevice *paintdevice) \obsolete Identical to QTextLayout::QTextLayout(const QString &text, const QFont &font, const QPaintDevice *paintdevice) +\else + \nothing +\endif */ QTextLayout::QTextLayout(const QString &text, const QFont &font, QPaintDevice *paintdevice) |