From d08deb0b4a64e24884eedaf5d8e20f967c38e82a Mon Sep 17 00:00:00 2001
From: Stephan Binner <stephan.binner@basyskom.com>
Date: Wed, 8 Mar 2017 20:11:43 +0100
Subject: Add feature.abstractbutton

Change-Id: Ie93c6d0a8256bc466d3419408b753d5f3738aa6b
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
---
 src/widgets/accessible/complexwidgets.cpp           | 1 -
 src/widgets/accessible/qaccessiblewidgetfactory.cpp | 2 ++
 src/widgets/accessible/qaccessiblewidgets.cpp       | 1 -
 src/widgets/accessible/simplewidgets.cpp            | 5 ++++-
 src/widgets/accessible/simplewidgets_p.h            | 2 ++
 5 files changed, 8 insertions(+), 3 deletions(-)

(limited to 'src/widgets/accessible')

diff --git a/src/widgets/accessible/complexwidgets.cpp b/src/widgets/accessible/complexwidgets.cpp
index ea3b88468b..397a58a5d4 100644
--- a/src/widgets/accessible/complexwidgets.cpp
+++ b/src/widgets/accessible/complexwidgets.cpp
@@ -41,7 +41,6 @@
 
 #include <qaccessible.h>
 #include <qapplication.h>
-#include <qabstractbutton.h>
 #include <qevent.h>
 #include <qheaderview.h>
 #include <qtabbar.h>
diff --git a/src/widgets/accessible/qaccessiblewidgetfactory.cpp b/src/widgets/accessible/qaccessiblewidgetfactory.cpp
index c95b5b1097..e7db53c251 100644
--- a/src/widgets/accessible/qaccessiblewidgetfactory.cpp
+++ b/src/widgets/accessible/qaccessiblewidgetfactory.cpp
@@ -103,11 +103,13 @@ QAccessibleInterface *qAccessibleFactory(const QString &classname, QObject *obje
     } else if (classname == QLatin1String("QToolButton")) {
         iface = new QAccessibleToolButton(widget);
 #endif // QT_NO_TOOLBUTTON
+#if QT_CONFIG(abstractbutton)
     } else if (classname == QLatin1String("QCheckBox")
             || classname == QLatin1String("QRadioButton")
             || classname == QLatin1String("QPushButton")
             || classname == QLatin1String("QAbstractButton")) {
         iface = new QAccessibleButton(widget);
+#endif
     } else if (classname == QLatin1String("QDialog")) {
         iface = new QAccessibleWidget(widget, QAccessible::Dialog);
     } else if (classname == QLatin1String("QMessageBox")) {
diff --git a/src/widgets/accessible/qaccessiblewidgets.cpp b/src/widgets/accessible/qaccessiblewidgets.cpp
index 40aca37f11..7f77f7c524 100644
--- a/src/widgets/accessible/qaccessiblewidgets.cpp
+++ b/src/widgets/accessible/qaccessiblewidgets.cpp
@@ -64,7 +64,6 @@
 #include <QAbstractItemView>
 #include <QDockWidget>
 #include <QMainWindow>
-#include <QAbstractButton>
 #include <private/qdockwidget_p.h>
 #include <QFocusFrame>
 
diff --git a/src/widgets/accessible/simplewidgets.cpp b/src/widgets/accessible/simplewidgets.cpp
index 600754f90c..a53e5eaf30 100644
--- a/src/widgets/accessible/simplewidgets.cpp
+++ b/src/widgets/accessible/simplewidgets.cpp
@@ -39,7 +39,9 @@
 
 #include "simplewidgets_p.h"
 
+#if QT_CONFIG(abstractbutton)
 #include <qabstractbutton.h>
+#endif
 #if QT_CONFIG(checkbox)
 #include <qcheckbox.h>
 #endif
@@ -80,6 +82,7 @@ extern QList<QWidget*> childWidgets(const QWidget *widget);
 QString qt_accStripAmp(const QString &text);
 QString qt_accHotKey(const QString &text);
 
+#if QT_CONFIG(abstractbutton)
 /*!
   \class QAccessibleButton
   \brief The QAccessibleButton class implements the QAccessibleInterface for button type widgets.
@@ -267,7 +270,7 @@ QStringList QAccessibleButton::keyBindingsForAction(const QString &actionName) c
     }
     return QStringList();
 }
-
+#endif // QT_CONFIG(abstractbutton)
 
 #ifndef QT_NO_TOOLBUTTON
 /*!
diff --git a/src/widgets/accessible/simplewidgets_p.h b/src/widgets/accessible/simplewidgets_p.h
index 8bd0af8261..1e4ae5ab67 100644
--- a/src/widgets/accessible/simplewidgets_p.h
+++ b/src/widgets/accessible/simplewidgets_p.h
@@ -65,6 +65,7 @@ class QToolButton;
 class QGroupBox;
 class QProgressBar;
 
+#if QT_CONFIG(abstractbutton)
 class QAccessibleButton : public QAccessibleWidget
 {
     Q_DECLARE_TR_FUNCTIONS(QAccessibleButton)
@@ -83,6 +84,7 @@ public:
 protected:
     QAbstractButton *button() const;
 };
+#endif
 
 #ifndef QT_NO_TOOLBUTTON
 class QAccessibleToolButton : public QAccessibleButton
-- 
cgit v1.2.3