vcl/CustomTarget_qt5_moc.mk | 1 -
vcl/CustomTarget_qt6_moc.mk | 1 -
vcl/inc/qt5/QtAccessibleWidget.hxx | 5 +----
vcl/qt5/QtAccessibleWidget.cxx | 1 -
4 files changed, 1 insertion(+), 7 deletions(-)
New commits:
commit b99c74804b254d32f582d2fd9e0c67161ebdf909
Author: Michael Weghorn <m.wegh...@posteo.de>
AuthorDate: Tue Aug 23 12:31:40 2022 +0200
Commit: Michael Weghorn <m.wegh...@posteo.de>
CommitDate: Tue Aug 23 15:34:50 2022 +0200
qt a11y: Drop unnecessary QObject inheritance
While `QtXAccessible` has to inherit from
`QObject`, `QtAccessibleWidget` doesn't.
Change-Id: I5630f05cdd939bb0013dec4d26f010407d40a2c9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/138726
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.wegh...@posteo.de>
diff --git a/vcl/CustomTarget_qt5_moc.mk b/vcl/CustomTarget_qt5_moc.mk
index 14360ae3ae26..5fb4f482e778 100644
--- a/vcl/CustomTarget_qt5_moc.mk
+++ b/vcl/CustomTarget_qt5_moc.mk
@@ -10,7 +10,6 @@
$(eval $(call gb_CustomTarget_CustomTarget,vcl/qt5))
$(call gb_CustomTarget_get_target,vcl/qt5) : \
- $(call gb_CustomTarget_get_workdir,vcl/qt5)/QtAccessibleWidget.moc \
$(call gb_CustomTarget_get_workdir,vcl/qt5)/QtClipboard.moc \
$(call gb_CustomTarget_get_workdir,vcl/qt5)/QtFilePicker.moc \
$(call gb_CustomTarget_get_workdir,vcl/qt5)/QtFrame.moc \
diff --git a/vcl/CustomTarget_qt6_moc.mk b/vcl/CustomTarget_qt6_moc.mk
index 9badd7592e92..77aab947164d 100644
--- a/vcl/CustomTarget_qt6_moc.mk
+++ b/vcl/CustomTarget_qt6_moc.mk
@@ -10,7 +10,6 @@
$(eval $(call gb_CustomTarget_CustomTarget,vcl/qt6))
$(call gb_CustomTarget_get_target,vcl/qt6) : \
- $(call gb_CustomTarget_get_workdir,vcl/qt6)/QtAccessibleWidget.moc \
$(call gb_CustomTarget_get_workdir,vcl/qt6)/QtClipboard.moc \
$(call gb_CustomTarget_get_workdir,vcl/qt6)/QtFilePicker.moc \
$(call gb_CustomTarget_get_workdir,vcl/qt6)/QtFrame.moc \
diff --git a/vcl/inc/qt5/QtAccessibleWidget.hxx
b/vcl/inc/qt5/QtAccessibleWidget.hxx
index 0ca17b394123..7e7625041c4f 100644
--- a/vcl/inc/qt5/QtAccessibleWidget.hxx
+++ b/vcl/inc/qt5/QtAccessibleWidget.hxx
@@ -36,8 +36,7 @@ class XAccessibleTable;
class QtFrame;
class QtWidget;
-class QtAccessibleWidget final : public QObject,
- public QAccessibleInterface,
+class QtAccessibleWidget final : public QAccessibleInterface,
public QAccessibleActionInterface,
public QAccessibleTextInterface,
public QAccessibleEditableTextInterface,
@@ -45,8 +44,6 @@ class QtAccessibleWidget final : public QObject,
public QAccessibleTableInterface,
public QAccessibleValueInterface
{
- Q_OBJECT
-
public:
QtAccessibleWidget(const
css::uno::Reference<css::accessibility::XAccessible> xAccessible,
QObject* pObject);
diff --git a/vcl/qt5/QtAccessibleWidget.cxx b/vcl/qt5/QtAccessibleWidget.cxx
index 6bef5de36473..b23a8c9a2844 100644
--- a/vcl/qt5/QtAccessibleWidget.cxx
+++ b/vcl/qt5/QtAccessibleWidget.cxx
@@ -18,7 +18,6 @@
*/
#include <QtAccessibleWidget.hxx>
-#include <QtAccessibleWidget.moc>
#include <QtGui/QAccessibleInterface>
