summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/gui/accessible/qaccessible.cpp11
-rw-r--r--src/gui/accessible/qaccessible.h17
2 files changed, 2 insertions, 26 deletions
diff --git a/src/gui/accessible/qaccessible.cpp b/src/gui/accessible/qaccessible.cpp
index 6edcd7befa..973c19b3bf 100644
--- a/src/gui/accessible/qaccessible.cpp
+++ b/src/gui/accessible/qaccessible.cpp
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2020 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/
**
** This file is part of the QtGui module of the Qt Toolkit.
@@ -875,15 +875,6 @@ void QAccessible::updateAccessibility(QAccessibleEvent *event)
pfAccessibility->notifyAccessibilityUpdate(event);
}
-#if QT_DEPRECATED_SINCE(5, 0)
-/*!
- \obsolete
- \fn void QAccessible::updateAccessibility(QObject *object, int child, Event reason);
-
- \brief Use QAccessible::updateAccessibility(QAccessibleEvent*) instead.
-*/
-#endif
-
/*!
\internal
\brief getBoundaries is a helper function to find the accessible text boundaries for QTextCursor based documents.
diff --git a/src/gui/accessible/qaccessible.h b/src/gui/accessible/qaccessible.h
index f7564a3076..bfe881a712 100644
--- a/src/gui/accessible/qaccessible.h
+++ b/src/gui/accessible/qaccessible.h
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2020 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/
**
** This file is part of the QtGui module of the Qt Toolkit.
@@ -418,10 +418,6 @@ public:
static Id registerAccessibleInterface(QAccessibleInterface *iface);
static void deleteAccessibleInterface(Id uniqueId);
-
-#if QT_DEPRECATED_SINCE(5, 0)
- QT_DEPRECATED static inline void updateAccessibility(QObject *object, int child, Event reason);
-#endif
static void updateAccessibility(QAccessibleEvent *event);
static bool isActive();
@@ -981,17 +977,6 @@ Q_GUI_EXPORT QDebug operator<<(QDebug d, const QAccessibleInterface *iface);
Q_GUI_EXPORT QDebug operator<<(QDebug d, const QAccessibleEvent &ev);
#endif
-#if QT_DEPRECATED_SINCE(5, 0)
-inline void QAccessible::updateAccessibility(QObject *object, int child, Event reason)
-{
- Q_ASSERT(object);
-
- QAccessibleEvent ev(object, reason);
- ev.setChild(child);
- updateAccessibility(&ev);
-}
-#endif
-
QT_END_NAMESPACE
#endif // QACCESSIBLE_H