diff options
| author | Olivier Goffart <ogoffart@woboq.com> | 2012-04-30 14:26:41 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-05-02 11:14:09 +0200 |
| commit | 36b3a6ad3818b6c8d0849d5e5d63de22c2a2a430 (patch) | |
| tree | 209a6267ce8ca7a05ae5f9a46b37e6c8255cfbc9 /src/gui/accessible/qaccessible.h | |
| parent | bcd477e0bc48bb028193d7707d1ecfbd61b5bdc1 (diff) | |
Fix compilation of public headers with QT_NO_DEPRECATED defined
Put the functions in QT_DEPRECATED_SINCE if possible
QPluginLoader::staticInstances is not documented as deprecated, and do
not reference any alternative use. So I unmarked it as deprecated.
Change-Id: I556c3f3657fb0490dd5543fcc56718fe9bd394e7
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com>
Diffstat (limited to 'src/gui/accessible/qaccessible.h')
| -rw-r--r-- | src/gui/accessible/qaccessible.h | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/src/gui/accessible/qaccessible.h b/src/gui/accessible/qaccessible.h index 2e0019705f..ce7c54e00b 100644 --- a/src/gui/accessible/qaccessible.h +++ b/src/gui/accessible/qaccessible.h @@ -342,8 +342,9 @@ public: static RootObjectHandler installRootObjectHandler(RootObjectHandler); static QAccessibleInterface *queryAccessibleInterface(QObject *); - - QT_DEPRECATED static void updateAccessibility(QObject *object, int child, Event reason); +#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(); @@ -626,6 +627,17 @@ 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 + #endif // QT_NO_ACCESSIBILITY QT_END_NAMESPACE |