diff options
9 files changed, 25 insertions, 228 deletions
diff --git a/src/gui/accessible/qaccessible.h b/src/gui/accessible/qaccessible.h index 339e3fbcd6..283209d08f 100644 --- a/src/gui/accessible/qaccessible.h +++ b/src/gui/accessible/qaccessible.h @@ -66,11 +66,8 @@ class QTextCursor; // We need to inherit QObject to expose the enums to QML. class Q_GUI_EXPORT QAccessible -#ifndef Q_QDOC - :public QObject -#endif { - Q_OBJECT + Q_GADGET Q_ENUMS(Role Event State) public: diff --git a/tests/auto/bic/data/QtGui.5.0.0.linux-gcc-amd64.txt b/tests/auto/bic/data/QtGui.5.0.0.linux-gcc-amd64.txt index d2db7b0a8f..6a7d5535fb 100644 --- a/tests/auto/bic/data/QtGui.5.0.0.linux-gcc-amd64.txt +++ b/tests/auto/bic/data/QtGui.5.0.0.linux-gcc-amd64.txt @@ -3981,40 +3981,15 @@ QScreenOrientationChangeEvent (0x7f7180294bc8) 0 QEvent (0x7f71806522a0) 0 primary-for QScreenOrientationChangeEvent (0x7f7180294bc8) -Class QAccessible::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QAccessible::QPrivateSignal (0x7f7180652360) 0 empty - Class QAccessible::State size=8 align=8 base size=5 base align=8 QAccessible::State (0x7f71806523c0) 0 -Vtable for QAccessible -QAccessible::_ZTV11QAccessible: 14u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI11QAccessible) -16 (int (*)(...))QAccessible::metaObject -24 (int (*)(...))QAccessible::qt_metacast -32 (int (*)(...))QAccessible::qt_metacall -40 (int (*)(...))QAccessible::~QAccessible -48 (int (*)(...))QAccessible::~QAccessible -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify - Class QAccessible - size=16 align=8 - base size=16 base align=8 -QAccessible (0x7f7180294d68) 0 - vptr=((& QAccessible::_ZTV11QAccessible) + 16u) - QObject (0x7f7180652300) 0 - primary-for QAccessible (0x7f7180294d68) + size=1 align=1 + base size=0 base align=1 +QAccessible (0x7f7180294d68) 0 empty Vtable for QAccessibleInterface QAccessibleInterface::_ZTV20QAccessibleInterface: 23u entries diff --git a/tests/auto/bic/data/QtGui.5.0.0.linux-gcc-ia32.txt b/tests/auto/bic/data/QtGui.5.0.0.linux-gcc-ia32.txt index 433c0eaacc..33fb2fd8a0 100644 --- a/tests/auto/bic/data/QtGui.5.0.0.linux-gcc-ia32.txt +++ b/tests/auto/bic/data/QtGui.5.0.0.linux-gcc-ia32.txt @@ -3981,40 +3981,15 @@ QScreenOrientationChangeEvent (0xb3a816cc) 0 QEvent (0xb392ecb0) 0 primary-for QScreenOrientationChangeEvent (0xb3a816cc) -Class QAccessible::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QAccessible::QPrivateSignal (0xb392ee70) 0 empty - Class QAccessible::State size=8 align=4 base size=5 base align=4 QAccessible::State (0xb392eea8) 0 -Vtable for QAccessible -QAccessible::_ZTV11QAccessible: 14u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI11QAccessible) -8 (int (*)(...))QAccessible::metaObject -12 (int (*)(...))QAccessible::qt_metacast -16 (int (*)(...))QAccessible::qt_metacall -20 (int (*)(...))QAccessible::~QAccessible -24 (int (*)(...))QAccessible::~QAccessible -28 (int (*)(...))QObject::event -32 (int (*)(...))QObject::eventFilter -36 (int (*)(...))QObject::timerEvent -40 (int (*)(...))QObject::childEvent -44 (int (*)(...))QObject::customEvent -48 (int (*)(...))QObject::connectNotify -52 (int (*)(...))QObject::disconnectNotify - Class QAccessible - size=8 align=4 - base size=8 base align=4 -QAccessible (0xb3a81708) 0 - vptr=((& QAccessible::_ZTV11QAccessible) + 8u) - QObject (0xb392ed90) 0 - primary-for QAccessible (0xb3a81708) + size=1 align=1 + base size=0 base align=1 +QAccessible (0xb3a81708) 0 empty Vtable for QAccessibleInterface QAccessibleInterface::_ZTV20QAccessibleInterface: 23u entries diff --git a/tests/auto/bic/data/QtOpenGL.5.0.0.linux-gcc-amd64.txt b/tests/auto/bic/data/QtOpenGL.5.0.0.linux-gcc-amd64.txt index 125e529c33..ebf0273f77 100644 --- a/tests/auto/bic/data/QtOpenGL.5.0.0.linux-gcc-amd64.txt +++ b/tests/auto/bic/data/QtOpenGL.5.0.0.linux-gcc-amd64.txt @@ -3981,40 +3981,15 @@ QScreenOrientationChangeEvent (0x7f04b8f8bbc8) 0 QEvent (0x7f04b8efe720) 0 primary-for QScreenOrientationChangeEvent (0x7f04b8f8bbc8) -Class QAccessible::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QAccessible::QPrivateSignal (0x7f04b8efe7e0) 0 empty - Class QAccessible::State size=8 align=8 base size=5 base align=8 QAccessible::State (0x7f04b8efe840) 0 -Vtable for QAccessible -QAccessible::_ZTV11QAccessible: 14u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI11QAccessible) -16 (int (*)(...))QAccessible::metaObject -24 (int (*)(...))QAccessible::qt_metacast -32 (int (*)(...))QAccessible::qt_metacall -40 (int (*)(...))QAccessible::~QAccessible -48 (int (*)(...))QAccessible::~QAccessible -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify - Class QAccessible - size=16 align=8 - base size=16 base align=8 -QAccessible (0x7f04b8f8bd68) 0 - vptr=((& QAccessible::_ZTV11QAccessible) + 16u) - QObject (0x7f04b8efe780) 0 - primary-for QAccessible (0x7f04b8f8bd68) + size=1 align=1 + base size=0 base align=1 +QAccessible (0x7f04b8f8bd68) 0 empty Vtable for QAccessibleInterface QAccessibleInterface::_ZTV20QAccessibleInterface: 23u entries diff --git a/tests/auto/bic/data/QtOpenGL.5.0.0.linux-gcc-ia32.txt b/tests/auto/bic/data/QtOpenGL.5.0.0.linux-gcc-ia32.txt index 7d8a99d222..8ced43438f 100644 --- a/tests/auto/bic/data/QtOpenGL.5.0.0.linux-gcc-ia32.txt +++ b/tests/auto/bic/data/QtOpenGL.5.0.0.linux-gcc-ia32.txt @@ -3981,40 +3981,15 @@ QScreenOrientationChangeEvent (0xb3b78e10) 0 QEvent (0xb39dbe38) 0 primary-for QScreenOrientationChangeEvent (0xb3b78e10) -Class QAccessible::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QAccessible::QPrivateSignal (0xb39dba48) 0 empty - Class QAccessible::State size=8 align=4 base size=5 base align=4 QAccessible::State (0xb39dbe00) 0 -Vtable for QAccessible -QAccessible::_ZTV11QAccessible: 14u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI11QAccessible) -8 (int (*)(...))QAccessible::metaObject -12 (int (*)(...))QAccessible::qt_metacast -16 (int (*)(...))QAccessible::qt_metacall -20 (int (*)(...))QAccessible::~QAccessible -24 (int (*)(...))QAccessible::~QAccessible -28 (int (*)(...))QObject::event -32 (int (*)(...))QObject::eventFilter -36 (int (*)(...))QObject::timerEvent -40 (int (*)(...))QObject::childEvent -44 (int (*)(...))QObject::customEvent -48 (int (*)(...))QObject::connectNotify -52 (int (*)(...))QObject::disconnectNotify - Class QAccessible - size=8 align=4 - base size=8 base align=4 -QAccessible (0xb3b78e4c) 0 - vptr=((& QAccessible::_ZTV11QAccessible) + 8u) - QObject (0xb39dbf18) 0 - primary-for QAccessible (0xb3b78e4c) + size=1 align=1 + base size=0 base align=1 +QAccessible (0xb3b78e4c) 0 empty Vtable for QAccessibleInterface QAccessibleInterface::_ZTV20QAccessibleInterface: 23u entries diff --git a/tests/auto/bic/data/QtPrintSupport.5.0.0.linux-gcc-amd64.txt b/tests/auto/bic/data/QtPrintSupport.5.0.0.linux-gcc-amd64.txt index 20988597b1..28a8468405 100644 --- a/tests/auto/bic/data/QtPrintSupport.5.0.0.linux-gcc-amd64.txt +++ b/tests/auto/bic/data/QtPrintSupport.5.0.0.linux-gcc-amd64.txt @@ -3986,40 +3986,15 @@ QScreenOrientationChangeEvent (0x7f0bd5ed8bc8) 0 QEvent (0x7f0bd5e7e300) 0 primary-for QScreenOrientationChangeEvent (0x7f0bd5ed8bc8) -Class QAccessible::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QAccessible::QPrivateSignal (0x7f0bd5e7e3c0) 0 empty - Class QAccessible::State size=8 align=8 base size=5 base align=8 QAccessible::State (0x7f0bd5e7e420) 0 -Vtable for QAccessible -QAccessible::_ZTV11QAccessible: 14u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI11QAccessible) -16 (int (*)(...))QAccessible::metaObject -24 (int (*)(...))QAccessible::qt_metacast -32 (int (*)(...))QAccessible::qt_metacall -40 (int (*)(...))QAccessible::~QAccessible -48 (int (*)(...))QAccessible::~QAccessible -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify - Class QAccessible - size=16 align=8 - base size=16 base align=8 -QAccessible (0x7f0bd5ed8d68) 0 - vptr=((& QAccessible::_ZTV11QAccessible) + 16u) - QObject (0x7f0bd5e7e360) 0 - primary-for QAccessible (0x7f0bd5ed8d68) + size=1 align=1 + base size=0 base align=1 +QAccessible (0x7f0bd5ed8d68) 0 empty Vtable for QAccessibleInterface QAccessibleInterface::_ZTV20QAccessibleInterface: 23u entries diff --git a/tests/auto/bic/data/QtPrintSupport.5.0.0.linux-gcc-ia32.txt b/tests/auto/bic/data/QtPrintSupport.5.0.0.linux-gcc-ia32.txt index 6162fcde57..be5a9dc941 100644 --- a/tests/auto/bic/data/QtPrintSupport.5.0.0.linux-gcc-ia32.txt +++ b/tests/auto/bic/data/QtPrintSupport.5.0.0.linux-gcc-ia32.txt @@ -3981,40 +3981,15 @@ QScreenOrientationChangeEvent (0xb3b227bc) 0 QEvent (0xb39d0e38) 0 primary-for QScreenOrientationChangeEvent (0xb3b227bc) -Class QAccessible::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QAccessible::QPrivateSignal (0xb39d0a48) 0 empty - Class QAccessible::State size=8 align=4 base size=5 base align=4 QAccessible::State (0xb39d0e00) 0 -Vtable for QAccessible -QAccessible::_ZTV11QAccessible: 14u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI11QAccessible) -8 (int (*)(...))QAccessible::metaObject -12 (int (*)(...))QAccessible::qt_metacast -16 (int (*)(...))QAccessible::qt_metacall -20 (int (*)(...))QAccessible::~QAccessible -24 (int (*)(...))QAccessible::~QAccessible -28 (int (*)(...))QObject::event -32 (int (*)(...))QObject::eventFilter -36 (int (*)(...))QObject::timerEvent -40 (int (*)(...))QObject::childEvent -44 (int (*)(...))QObject::customEvent -48 (int (*)(...))QObject::connectNotify -52 (int (*)(...))QObject::disconnectNotify - Class QAccessible - size=8 align=4 - base size=8 base align=4 -QAccessible (0xb3b227f8) 0 - vptr=((& QAccessible::_ZTV11QAccessible) + 8u) - QObject (0xb39d0f18) 0 - primary-for QAccessible (0xb3b227f8) + size=1 align=1 + base size=0 base align=1 +QAccessible (0xb3b227f8) 0 empty Vtable for QAccessibleInterface QAccessibleInterface::_ZTV20QAccessibleInterface: 23u entries diff --git a/tests/auto/bic/data/QtWidgets.5.0.0.linux-gcc-amd64.txt b/tests/auto/bic/data/QtWidgets.5.0.0.linux-gcc-amd64.txt index 35a4d3a30a..d89eb8d488 100644 --- a/tests/auto/bic/data/QtWidgets.5.0.0.linux-gcc-amd64.txt +++ b/tests/auto/bic/data/QtWidgets.5.0.0.linux-gcc-amd64.txt @@ -3981,40 +3981,15 @@ QScreenOrientationChangeEvent (0x7f871fa70bc8) 0 QEvent (0x7f871fa15300) 0 primary-for QScreenOrientationChangeEvent (0x7f871fa70bc8) -Class QAccessible::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QAccessible::QPrivateSignal (0x7f871fa153c0) 0 empty - Class QAccessible::State size=8 align=8 base size=5 base align=8 QAccessible::State (0x7f871fa15420) 0 -Vtable for QAccessible -QAccessible::_ZTV11QAccessible: 14u entries -0 (int (*)(...))0 -8 (int (*)(...))(& _ZTI11QAccessible) -16 (int (*)(...))QAccessible::metaObject -24 (int (*)(...))QAccessible::qt_metacast -32 (int (*)(...))QAccessible::qt_metacall -40 (int (*)(...))QAccessible::~QAccessible -48 (int (*)(...))QAccessible::~QAccessible -56 (int (*)(...))QObject::event -64 (int (*)(...))QObject::eventFilter -72 (int (*)(...))QObject::timerEvent -80 (int (*)(...))QObject::childEvent -88 (int (*)(...))QObject::customEvent -96 (int (*)(...))QObject::connectNotify -104 (int (*)(...))QObject::disconnectNotify - Class QAccessible - size=16 align=8 - base size=16 base align=8 -QAccessible (0x7f871fa70d68) 0 - vptr=((& QAccessible::_ZTV11QAccessible) + 16u) - QObject (0x7f871fa15360) 0 - primary-for QAccessible (0x7f871fa70d68) + size=1 align=1 + base size=0 base align=1 +QAccessible (0x7f871fa70d68) 0 empty Vtable for QAccessibleInterface QAccessibleInterface::_ZTV20QAccessibleInterface: 23u entries diff --git a/tests/auto/bic/data/QtWidgets.5.0.0.linux-gcc-ia32.txt b/tests/auto/bic/data/QtWidgets.5.0.0.linux-gcc-ia32.txt index fe8f00314f..b1b1eb5c38 100644 --- a/tests/auto/bic/data/QtWidgets.5.0.0.linux-gcc-ia32.txt +++ b/tests/auto/bic/data/QtWidgets.5.0.0.linux-gcc-ia32.txt @@ -3981,40 +3981,15 @@ QScreenOrientationChangeEvent (0xb3ae37bc) 0 QEvent (0xb3990e38) 0 primary-for QScreenOrientationChangeEvent (0xb3ae37bc) -Class QAccessible::QPrivateSignal - size=1 align=1 - base size=0 base align=1 -QAccessible::QPrivateSignal (0xb3990a48) 0 empty - Class QAccessible::State size=8 align=4 base size=5 base align=4 QAccessible::State (0xb3990e00) 0 -Vtable for QAccessible -QAccessible::_ZTV11QAccessible: 14u entries -0 (int (*)(...))0 -4 (int (*)(...))(& _ZTI11QAccessible) -8 (int (*)(...))QAccessible::metaObject -12 (int (*)(...))QAccessible::qt_metacast -16 (int (*)(...))QAccessible::qt_metacall -20 (int (*)(...))QAccessible::~QAccessible -24 (int (*)(...))QAccessible::~QAccessible -28 (int (*)(...))QObject::event -32 (int (*)(...))QObject::eventFilter -36 (int (*)(...))QObject::timerEvent -40 (int (*)(...))QObject::childEvent -44 (int (*)(...))QObject::customEvent -48 (int (*)(...))QObject::connectNotify -52 (int (*)(...))QObject::disconnectNotify - Class QAccessible - size=8 align=4 - base size=8 base align=4 -QAccessible (0xb3ae37f8) 0 - vptr=((& QAccessible::_ZTV11QAccessible) + 8u) - QObject (0xb3990f18) 0 - primary-for QAccessible (0xb3ae37f8) + size=1 align=1 + base size=0 base align=1 +QAccessible (0xb3ae37f8) 0 empty Vtable for QAccessibleInterface QAccessibleInterface::_ZTV20QAccessibleInterface: 23u entries |