diff --git a/src/gui/accessible/qaccessible.h b/src/gui/accessible/qaccessible.h index 0551e950ae..937b044f36 100644 --- a/src/gui/accessible/qaccessible.h +++ b/src/gui/accessible/qaccessible.h @@ -610,7 +610,7 @@ protected: class Q_GUI_EXPORT QAccessibleAnnouncementEvent : public QAccessibleEvent { public: - inline QAccessibleAnnouncementEvent(QObject *object, const QString &message) + explicit QAccessibleAnnouncementEvent(QObject *object, const QString &message) : QAccessibleEvent(object, QAccessible::InvalidEvent) , m_message(message) , m_politeness(QAccessible::AnnouncementPoliteness::Polite) @@ -618,7 +618,7 @@ public: m_type = QAccessible::Announcement; } - inline QAccessibleAnnouncementEvent(QAccessibleInterface *iface, const QString &message) + explicit QAccessibleAnnouncementEvent(QAccessibleInterface *iface, const QString &message) : QAccessibleEvent(iface, QAccessible::InvalidEvent) , m_message(message) , m_politeness(QAccessible::AnnouncementPoliteness::Polite) @@ -626,7 +626,7 @@ public: m_type = QAccessible::Announcement; } - ~QAccessibleAnnouncementEvent(); + ~QAccessibleAnnouncementEvent() override; QString message() const { return m_message; } QAccessible::AnnouncementPoliteness politeness() const { return m_politeness; } diff --git a/src/gui/accessible/qaccessible_base.h b/src/gui/accessible/qaccessible_base.h index b8a080b5f9..253aaa0ecb 100644 --- a/src/gui/accessible/qaccessible_base.h +++ b/src/gui/accessible/qaccessible_base.h @@ -104,7 +104,8 @@ public: Announcement = 0x80D0, IdentifierChanged = 0x80E0, - InvalidEvent + // was declared after AcceleratorChanged, without explicit value + InvalidEvent = AcceleratorChanged + 1, }; Q_ENUM(Event) @@ -369,10 +370,11 @@ public: Custom, Level, }; + Q_ENUM(Attribute) enum class AnnouncementPoliteness { Polite, - Assertive + Assertive, }; Q_ENUM(AnnouncementPoliteness) // ### remove once qtdeclarative dependencies are up-to-date