Get rid of this hack where QAccessible inherits from QObject.

This was added just so that moc could pick up the enums and so that
we could use the enums in Q_PROPERTY declarations, which was needed for
accessibility in QML. It turns out that Q_GADGET is enough for us.

This is a strictly a binary compatible change.
However, QAccessible was marked internal in 5.0, so we are free to
change it. In addition, this class is static and cannot be instantiated.

Change-Id: I27e2e97c5f4b45c38678264c6b593a4383db8d3e
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>

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:
 

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

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

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

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

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

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

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

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