diff options
| author | Stephan Binner <stephan.binner@basyskom.com> | 2017-07-29 08:59:05 +0200 |
|---|---|---|
| committer | Stephan Binner <stephan.binner@basyskom.com> | 2017-08-10 05:37:25 +0000 |
| commit | e58fdbaeb033a801ac7b5dd1f63657b36d6e1305 (patch) | |
| tree | 05de3ca7fe3235606c5e09f2b07f3fe6e7f9096c /src/widgets/styles | |
| parent | 39851c6905f68a91f95838da91947f8bfae65729 (diff) | |
Convert features.splitter to QT_[REQUIRE_]CONFIG
Change-Id: I2eea5004938c581beb5a7c0c01409c576c5e5b39
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Diffstat (limited to 'src/widgets/styles')
| -rw-r--r-- | src/widgets/styles/qfusionstyle.cpp | 2 | ||||
| -rw-r--r-- | src/widgets/styles/qmacstyle_mac_p_p.h | 2 | ||||
| -rw-r--r-- | src/widgets/styles/qwindowsstyle.cpp | 4 |
3 files changed, 6 insertions, 2 deletions
diff --git a/src/widgets/styles/qfusionstyle.cpp b/src/widgets/styles/qfusionstyle.cpp index d1e2cd25c4..6c400b4d2e 100644 --- a/src/widgets/styles/qfusionstyle.cpp +++ b/src/widgets/styles/qfusionstyle.cpp @@ -69,7 +69,9 @@ #include <qabstractslider.h> #endif #include <qslider.h> +#if QT_CONFIG(splitter) #include <qsplitter.h> +#endif #if QT_CONFIG(progressbar) #include <qprogressbar.h> #endif diff --git a/src/widgets/styles/qmacstyle_mac_p_p.h b/src/widgets/styles/qmacstyle_mac_p_p.h index 1770c07bca..409063e531 100644 --- a/src/widgets/styles/qmacstyle_mac_p_p.h +++ b/src/widgets/styles/qmacstyle_mac_p_p.h @@ -97,7 +97,9 @@ #endif #include <qsizegrip.h> #include <qspinbox.h> +#if QT_CONFIG(splitter) #include <qsplitter.h> +#endif #include <qstyleoption.h> #include <qtextedit.h> #include <qtextstream.h> diff --git a/src/widgets/styles/qwindowsstyle.cpp b/src/widgets/styles/qwindowsstyle.cpp index fa5070b867..818c3ea07e 100644 --- a/src/widgets/styles/qwindowsstyle.cpp +++ b/src/widgets/styles/qwindowsstyle.cpp @@ -1494,11 +1494,11 @@ void QWindowsStyle::drawControl(ControlElement ce, const QStyleOption *opt, QPai opt->state & (State_Sunken | State_On), 1, &opt->palette.brush(QPalette::Button)); break; -#ifndef QT_NO_SPLITTER +#if QT_CONFIG(splitter) case CE_Splitter: p->eraseRect(opt->rect); break; -#endif // QT_NO_SPLITTER +#endif // QT_CONFIG(splitter) #if QT_CONFIG(scrollbar) case CE_ScrollBarSubLine: case CE_ScrollBarAddLine: { |