diff options
| author | Stephan Binner <stephan.binner@basyskom.com> | 2017-07-22 15:16:51 +0200 |
|---|---|---|
| committer | Stephan Binner <stephan.binner@basyskom.com> | 2017-07-25 11:23:45 +0000 |
| commit | 163863f77d891f56573e4dae316d16cfc2fefc8f (patch) | |
| tree | b4d909413d084babd124e614df55e333f4d07b45 /src/widgets/accessible | |
| parent | 3ade30a2af5b64cb2437d214f25e4dcbfa00c49d (diff) | |
Convert features.combobox to QT_[REQUIRE_]CONFIG
Change-Id: I2f415de8556289a6461a645d559be17089c43c99
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Diffstat (limited to 'src/widgets/accessible')
| -rw-r--r-- | src/widgets/accessible/complexwidgets.cpp | 6 | ||||
| -rw-r--r-- | src/widgets/accessible/complexwidgets_p.h | 4 | ||||
| -rw-r--r-- | src/widgets/accessible/qaccessiblewidgetfactory.cpp | 2 |
3 files changed, 7 insertions, 5 deletions
diff --git a/src/widgets/accessible/complexwidgets.cpp b/src/widgets/accessible/complexwidgets.cpp index 42775d7324..29e11556aa 100644 --- a/src/widgets/accessible/complexwidgets.cpp +++ b/src/widgets/accessible/complexwidgets.cpp @@ -44,7 +44,9 @@ #include <qevent.h> #include <qheaderview.h> #include <qtabbar.h> +#if QT_CONFIG(combobox) #include <qcombobox.h> +#endif #include <qlineedit.h> #include <qstyle.h> #include <qstyleoption.h> @@ -260,7 +262,7 @@ QString QAccessibleTabBar::text(QAccessible::Text t) const #endif // QT_NO_TABBAR -#ifndef QT_NO_COMBOBOX +#if QT_CONFIG(combobox) /*! \class QAccessibleComboBox \brief The QAccessibleComboBox class implements the QAccessibleInterface for editable and read-only combo boxes. @@ -378,7 +380,7 @@ QStringList QAccessibleComboBox::keyBindingsForAction(const QString &/*actionNam return QStringList(); } -#endif // QT_NO_COMBOBOX +#endif // QT_CONFIG(combobox) #ifndef QT_NO_SCROLLAREA // ======================= QAccessibleAbstractScrollArea ======================= diff --git a/src/widgets/accessible/complexwidgets_p.h b/src/widgets/accessible/complexwidgets_p.h index d43b06f4a4..b4b4e89a1a 100644 --- a/src/widgets/accessible/complexwidgets_p.h +++ b/src/widgets/accessible/complexwidgets_p.h @@ -124,7 +124,7 @@ protected: }; #endif // QT_NO_TABBAR -#ifndef QT_NO_COMBOBOX +#if QT_CONFIG(combobox) class QAccessibleComboBox : public QAccessibleWidget { public: @@ -146,7 +146,7 @@ public: protected: QComboBox *comboBox() const; }; -#endif // QT_NO_COMBOBOX +#endif // QT_CONFIG(combobox) #endif // QT_NO_ACCESSIBILITY diff --git a/src/widgets/accessible/qaccessiblewidgetfactory.cpp b/src/widgets/accessible/qaccessiblewidgetfactory.cpp index 20104eea68..371158c73c 100644 --- a/src/widgets/accessible/qaccessiblewidgetfactory.cpp +++ b/src/widgets/accessible/qaccessiblewidgetfactory.cpp @@ -79,7 +79,7 @@ QAccessibleInterface *qAccessibleFactory(const QString &classname, QObject *obje else iface = new QAccessibleLineEdit(widget); #endif -#ifndef QT_NO_COMBOBOX +#if QT_CONFIG(combobox) } else if (classname == QLatin1String("QComboBox")) { iface = new QAccessibleComboBox(widget); #endif |