summaryrefslogtreecommitdiffstats
path: root/src/corelib/global
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@qt.io>2020-07-21 11:27:58 +0200
committerFriedemann Kleint <Friedemann.Kleint@qt.io>2020-07-24 10:02:27 +0200
commit61a50b2b9b5bca5482e3ce981f4ed6d031a6255a (patch)
treec9a8ba3f505bd6d91f83bc66b8589064849c5dfc /src/corelib/global
parent27fcf66319605ed29d35de4034a41f05e8ba0a3b (diff)
Fix a number of qdoc warnings related to deprecation
Remove obsolete documentation. Change-Id: Iaf4b6f9852a883dea0f256c5c89e74f6ebbe85f3 Reviewed-by: Sona Kurazyan <sona.kurazyan@qt.io>
Diffstat (limited to 'src/corelib/global')
-rw-r--r--src/corelib/global/qlogging.cpp14
-rw-r--r--src/corelib/global/qnamespace.qdoc2
2 files changed, 0 insertions, 16 deletions
diff --git a/src/corelib/global/qlogging.cpp b/src/corelib/global/qlogging.cpp
index bfb2535448..28f3357e1b 100644
--- a/src/corelib/global/qlogging.cpp
+++ b/src/corelib/global/qlogging.cpp
@@ -1944,20 +1944,6 @@ void qErrnoWarning(int code, const char *msg, ...)
}
/*!
- \typedef QtMsgHandler
- \relates <QtGlobal>
- \deprecated
-
- This is a typedef for a pointer to a function with the following
- signature:
-
- \snippet code/src_corelib_global_qglobal.cpp 7
-
- This typedef is deprecated, you should use QtMessageHandler instead.
- \sa QtMsgType, QtMessageHandler, qInstallMessageHandler()
-*/
-
-/*!
\typedef QtMessageHandler
\relates <QtGlobal>
\since 5.0
diff --git a/src/corelib/global/qnamespace.qdoc b/src/corelib/global/qnamespace.qdoc
index 54407e4180..f63b58f515 100644
--- a/src/corelib/global/qnamespace.qdoc
+++ b/src/corelib/global/qnamespace.qdoc
@@ -2745,11 +2745,9 @@
default delegate. (Qt::Alignment)
\value BackgroundRole The background brush used for items rendered with
the default delegate. (QBrush)
- \value BackgroundColorRole This role is obsolete. Use BackgroundRole instead.
\value ForegroundRole The foreground brush (text color, typically)
used for items rendered with the default delegate.
(QBrush)
- \value TextColorRole This role is obsolete. Use ForegroundRole instead.
\value CheckStateRole This role is used to obtain the checked state of
an item. (Qt::CheckState)
\value InitialSortOrderRole This role is used to obtain the initial sort order