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_p.h | |
| 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_p.h')
| -rw-r--r-- | src/widgets/accessible/rangecontrols_p.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/widgets/accessible/rangecontrols_p.h b/src/widgets/accessible/rangecontrols_p.h index c0b010c292..49f57fa1c6 100644 --- a/src/widgets/accessible/rangecontrols_p.h +++ b/src/widgets/accessible/rangecontrols_p.h @@ -162,7 +162,7 @@ protected: }; #endif // QT_CONFIG(slider) -#ifndef QT_NO_SCROLLBAR +#if QT_CONFIG(scrollbar) class QAccessibleScrollBar : public QAccessibleAbstractSlider { public: @@ -172,7 +172,7 @@ public: protected: QScrollBar *scrollBar() const; }; -#endif // QT_NO_SCROLLBAR +#endif // QT_CONFIG(scrollbar) #ifndef QT_NO_SLIDER class QAccessibleSlider : public QAccessibleAbstractSlider @@ -186,7 +186,7 @@ protected: }; #endif // QT_NO_SLIDER -#ifndef QT_NO_DIAL +#if QT_CONFIG(dial) class QAccessibleDial : public QAccessibleAbstractSlider { public: @@ -197,7 +197,7 @@ public: protected: QDial *dial() const; }; -#endif // QT_NO_DIAL +#endif // QT_CONFIG(dial) #endif // QT_NO_ACCESSIBILITY |