diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-08-15 16:30:10 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-08-15 16:31:48 +0200 |
| commit | 106d3b9bf93325ea93c678270290b2c3dda9b764 (patch) | |
| tree | 26c56932d60964c83e81d9c33d6f37ebc36d6c56 /src/widgets/accessible/rangecontrols.cpp | |
| parent | 79f679da9483c12979500dd48bc096d33af9ca6f (diff) | |
| parent | 8bebded9ab02b8eec67c44bfddf802d6bf9cda3c (diff) | |
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
src/plugins/platforms/cocoa/qcocoamenu.h
src/plugins/platforms/cocoa/qcocoamenu.mm
src/plugins/platforms/cocoa/qcocoawindow.mm
src/widgets/styles/qstylehelper_p.h
Change-Id: I54247c98dd79d2b3826fc062b8b11048c9c7d9bb
Diffstat (limited to 'src/widgets/accessible/rangecontrols.cpp')
| -rw-r--r-- | src/widgets/accessible/rangecontrols.cpp | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/src/widgets/accessible/rangecontrols.cpp b/src/widgets/accessible/rangecontrols.cpp index 602d0c7e11..c890c50938 100644 --- a/src/widgets/accessible/rangecontrols.cpp +++ b/src/widgets/accessible/rangecontrols.cpp @@ -40,15 +40,18 @@ #include "rangecontrols_p.h" #include <qslider.h> +#if QT_CONFIG(dial) #include <qdial.h> +#endif #include <qspinbox.h> +#if QT_CONFIG(scrollbar) #include <qscrollbar.h> +#endif #include <qstyle.h> #include <qstyleoption.h> #include <qdebug.h> #include <qglobal.h> #include <QDoubleSpinBox> -#include <QDial> #include <QtWidgets/qlineedit.h> #include <qmath.h> #include <private/qmath_p.h> @@ -284,7 +287,7 @@ QString QAccessibleDoubleSpinBox::text(QAccessible::Text textType) const #endif // QT_NO_SPINBOX -#ifndef QT_NO_SCROLLBAR +#if QT_CONFIG(scrollbar) /*! \class QAccessibleScrollBar \brief The QAccessibleScrollBar class implements the QAccessibleInterface for scroll bars. @@ -317,7 +320,7 @@ QString QAccessibleScrollBar::text(QAccessible::Text t) const return QAccessibleAbstractSlider::text(t); } -#endif // QT_NO_SCROLLBAR +#endif // QT_CONFIG(scrollbar) #ifndef QT_NO_SLIDER /*! @@ -398,7 +401,7 @@ QAbstractSlider *QAccessibleAbstractSlider::abstractSlider() const #endif // QT_NO_SLIDER -#ifndef QT_NO_DIAL +#if QT_CONFIG(dial) // ======================================= QAccessibleDial ====================================== QAccessibleDial::QAccessibleDial(QWidget *widget) : QAccessibleAbstractSlider(widget, QAccessible::Dial) @@ -419,7 +422,7 @@ QDial *QAccessibleDial::dial() const { return static_cast<QDial*>(object()); } -#endif // QT_NO_DIAL +#endif // QT_CONFIG(dial) #endif // QT_NO_ACCESSIBILITY |