diff options
Diffstat (limited to 'src/widgets/accessible')
-rw-r--r-- | src/widgets/accessible/qaccessiblewidgetfactory.cpp | 6 | ||||
-rw-r--r-- | src/widgets/accessible/simplewidgets.cpp | 6 | ||||
-rw-r--r-- | src/widgets/accessible/simplewidgets_p.h | 4 |
3 files changed, 10 insertions, 6 deletions
diff --git a/src/widgets/accessible/qaccessiblewidgetfactory.cpp b/src/widgets/accessible/qaccessiblewidgetfactory.cpp index d207a7b8d2..3fbc9714f5 100644 --- a/src/widgets/accessible/qaccessiblewidgetfactory.cpp +++ b/src/widgets/accessible/qaccessiblewidgetfactory.cpp @@ -47,7 +47,9 @@ #include "itemviews_p.h" #endif +#if QT_CONFIG(toolbutton) #include <qtoolbutton.h> +#endif #if QT_CONFIG(treeview) #include <qtreeview.h> #endif @@ -103,10 +105,10 @@ QAccessibleInterface *qAccessibleFactory(const QString &classname, QObject *obje } else if (classname == QLatin1String("QSlider")) { iface = new QAccessibleSlider(widget); #endif -#ifndef QT_NO_TOOLBUTTON +#if QT_CONFIG(toolbutton) } else if (classname == QLatin1String("QToolButton")) { iface = new QAccessibleToolButton(widget); -#endif // QT_NO_TOOLBUTTON +#endif // QT_CONFIG(toolbutton) #if QT_CONFIG(abstractbutton) } else if (classname == QLatin1String("QCheckBox") || classname == QLatin1String("QRadioButton") diff --git a/src/widgets/accessible/simplewidgets.cpp b/src/widgets/accessible/simplewidgets.cpp index fae17988b6..b6fe003452 100644 --- a/src/widgets/accessible/simplewidgets.cpp +++ b/src/widgets/accessible/simplewidgets.cpp @@ -57,7 +57,9 @@ #if QT_CONFIG(radiobutton) #include <qradiobutton.h> #endif +#if QT_CONFIG(toolbutton) #include <qtoolbutton.h> +#endif #include <qmenu.h> #if QT_CONFIG(label) #include <qlabel.h> @@ -280,7 +282,7 @@ QStringList QAccessibleButton::keyBindingsForAction(const QString &actionName) c } #endif // QT_CONFIG(abstractbutton) -#ifndef QT_NO_TOOLBUTTON +#if QT_CONFIG(toolbutton) /*! \class QAccessibleToolButton \brief The QAccessibleToolButton class implements the QAccessibleInterface for tool buttons. @@ -400,7 +402,7 @@ void QAccessibleToolButton::doAction(const QString &actionName) } -#endif // QT_NO_TOOLBUTTON +#endif // QT_CONFIG(toolbutton) /*! \class QAccessibleDisplay diff --git a/src/widgets/accessible/simplewidgets_p.h b/src/widgets/accessible/simplewidgets_p.h index 5055f2c534..c25aa31425 100644 --- a/src/widgets/accessible/simplewidgets_p.h +++ b/src/widgets/accessible/simplewidgets_p.h @@ -86,7 +86,7 @@ protected: }; #endif -#ifndef QT_NO_TOOLBUTTON +#if QT_CONFIG(toolbutton) class QAccessibleToolButton : public QAccessibleButton { public: @@ -107,7 +107,7 @@ protected: bool isSplitButton() const; }; -#endif // QT_NO_TOOLBUTTON +#endif // QT_CONFIG(toolbutton) class QAccessibleDisplay : public QAccessibleWidget, public QAccessibleImageInterface { |