diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-09-06 13:26:31 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-09-06 13:26:31 +0200 |
| commit | 19dd2ca93b8b95a5e2792b29ed62ea23800fb53e (patch) | |
| tree | 17685d2a9628ec5936155e09da3edd74c9244b0e /src/widgets/accessible/complexwidgets.cpp | |
| parent | 942922652481347659a0dae78758c334778a58d2 (diff) | |
| parent | d332a2d3ccb485c9decd6c47fa5a5fc02b59d27e (diff) | |
Merge remote-tracking branch 'origin/5.9' into 5.10
Conflicts:
examples/opengl/qopenglwidget/main.cpp
src/3rdparty/pcre2/src/pcre2_printint.c
src/plugins/platforms/cocoa/qnsview.mm
src/widgets/widgets/qcombobox.cpp
Change-Id: I37ced9da1e8056f95851568bcc52cd5dc34f56af
Diffstat (limited to 'src/widgets/accessible/complexwidgets.cpp')
| -rw-r--r-- | src/widgets/accessible/complexwidgets.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/widgets/accessible/complexwidgets.cpp b/src/widgets/accessible/complexwidgets.cpp index efbca0331d..7c19c5d20c 100644 --- a/src/widgets/accessible/complexwidgets.cpp +++ b/src/widgets/accessible/complexwidgets.cpp @@ -60,7 +60,9 @@ #include <qwhatsthis.h> #endif #include <QAbstractScrollArea> +#if QT_CONFIG(scrollarea) #include <QScrollArea> +#endif #if QT_CONFIG(scrollbar) #include <QScrollBar> #endif @@ -388,7 +390,7 @@ QStringList QAccessibleComboBox::keyBindingsForAction(const QString &/*actionNam #endif // QT_CONFIG(combobox) -#ifndef QT_NO_SCROLLAREA +#if QT_CONFIG(scrollarea) // ======================= QAccessibleAbstractScrollArea ======================= QAccessibleAbstractScrollArea::QAccessibleAbstractScrollArea(QWidget *widget) : QAccessibleWidget(widget, QAccessible::Client) @@ -497,7 +499,7 @@ QAccessibleScrollArea::QAccessibleScrollArea(QWidget *widget) { Q_ASSERT(qobject_cast<QScrollArea *>(widget)); } -#endif // QT_NO_SCROLLAREA +#endif // QT_CONFIG(scrollarea) QT_END_NAMESPACE |