diff options
| author | Stephan Binner <stephan.binner@basyskom.com> | 2017-07-29 08:43:26 +0200 |
|---|---|---|
| committer | Stephan Binner <stephan.binner@basyskom.com> | 2017-08-10 05:37:13 +0000 |
| commit | d1a3e674b6b9a98e16aa26fe05688e7099cd2b9b (patch) | |
| tree | a33c53698ec33eaa3f071b2d0c27545add2ea321 /src/widgets/accessible | |
| parent | 0987bda99e3473186f61c11ca46be504534cedaf (diff) | |
Convert features.toolbox to QT_[REQUIRE_]CONFIG
Change-Id: I7abfe0166a021c439f6ed4465631ba62660ef001
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Diffstat (limited to 'src/widgets/accessible')
| -rw-r--r-- | src/widgets/accessible/qaccessiblewidgetfactory.cpp | 2 | ||||
| -rw-r--r-- | src/widgets/accessible/qaccessiblewidgets.cpp | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/src/widgets/accessible/qaccessiblewidgetfactory.cpp b/src/widgets/accessible/qaccessiblewidgetfactory.cpp index 5ecb1cdf5f..cbc0ce9596 100644 --- a/src/widgets/accessible/qaccessiblewidgetfactory.cpp +++ b/src/widgets/accessible/qaccessiblewidgetfactory.cpp @@ -179,7 +179,7 @@ QAccessibleInterface *qAccessibleFactory(const QString &classname, QObject *obje } else if (classname == QLatin1String("QStackedWidget")) { iface = new QAccessibleStackedWidget(widget); #endif -#ifndef QT_NO_TOOLBOX +#if QT_CONFIG(toolbox) } else if (classname == QLatin1String("QToolBox")) { iface = new QAccessibleToolBox(widget); #endif diff --git a/src/widgets/accessible/qaccessiblewidgets.cpp b/src/widgets/accessible/qaccessiblewidgets.cpp index cdfab75385..72229834ec 100644 --- a/src/widgets/accessible/qaccessiblewidgets.cpp +++ b/src/widgets/accessible/qaccessiblewidgets.cpp @@ -51,7 +51,9 @@ #include "qdebug.h" #include <QApplication> #include <QStackedWidget> +#if QT_CONFIG(toolbox) #include <QToolBox> +#endif #include <QMdiArea> #include <QMdiSubWindow> #if QT_CONFIG(dialogbuttonbox) @@ -354,7 +356,7 @@ QStackedWidget *QAccessibleStackedWidget::stackedWidget() const } #endif // QT_NO_STACKEDWIDGET -#ifndef QT_NO_TOOLBOX +#if QT_CONFIG(toolbox) // ======================= QAccessibleToolBox ====================== QAccessibleToolBox::QAccessibleToolBox(QWidget *widget) : QAccessibleWidget(widget, QAccessible::LayeredPane) @@ -366,7 +368,7 @@ QToolBox * QAccessibleToolBox::toolBox() const { return static_cast<QToolBox *>(object()); } -#endif // QT_NO_TOOLBOX +#endif // QT_CONFIG(toolbox) // ======================= QAccessibleMdiArea ====================== #ifndef QT_NO_MDIAREA |