summaryrefslogtreecommitdiffstats
path: root/src/widgets/styles
diff options
context:
space:
mode:
Diffstat (limited to 'src/widgets/styles')
-rw-r--r--src/widgets/styles/qcommonstyle.cpp14
-rw-r--r--src/widgets/styles/qfusionstyle.cpp2
-rw-r--r--src/widgets/styles/qmacstyle_mac.mm2
-rw-r--r--src/widgets/styles/qpixmapstyle.cpp3
-rw-r--r--src/widgets/styles/qstylehelper.cpp2
-rw-r--r--src/widgets/styles/qstylesheetstyle.cpp14
-rw-r--r--src/widgets/styles/qwindowsstyle.cpp8
-rw-r--r--src/widgets/styles/qwindowsvistastyle_p_p.h2
-rw-r--r--src/widgets/styles/qwindowsxpstyle.cpp2
9 files changed, 31 insertions, 18 deletions
diff --git a/src/widgets/styles/qcommonstyle.cpp b/src/widgets/styles/qcommonstyle.cpp
index 0b44b4295b..2eb7c11c06 100644
--- a/src/widgets/styles/qcommonstyle.cpp
+++ b/src/widgets/styles/qcommonstyle.cpp
@@ -3198,7 +3198,7 @@ void QCommonStyle::drawComplexControl(ComplexControl cc, const QStyleOptionCompl
}
break;
#endif // QT_NO_SLIDER
-#ifndef QT_NO_SCROLLBAR
+#if QT_CONFIG(scrollbar)
case CC_ScrollBar:
if (const QStyleOptionSlider *scrollbar = qstyleoption_cast<const QStyleOptionSlider *>(opt)) {
// Make a copy here and reset it for each primitive.
@@ -3285,7 +3285,7 @@ void QCommonStyle::drawComplexControl(ComplexControl cc, const QStyleOptionCompl
}
}
break;
-#endif // QT_NO_SCROLLBAR
+#endif // QT_CONFIG(scrollbar)
#ifndef QT_NO_SPINBOX
case CC_SpinBox:
if (const QStyleOptionSpinBox *sb = qstyleoption_cast<const QStyleOptionSpinBox *>(opt)) {
@@ -3837,7 +3837,7 @@ QStyle::SubControl QCommonStyle::hitTestComplexControl(ComplexControl cc, const
}
break;
#endif // QT_NO_SLIDER
-#ifndef QT_NO_SCROLLBAR
+#if QT_CONFIG(scrollbar)
case CC_ScrollBar:
if (const QStyleOptionSlider *scrollbar = qstyleoption_cast<const QStyleOptionSlider *>(opt)) {
QRect r;
@@ -3852,7 +3852,7 @@ QStyle::SubControl QCommonStyle::hitTestComplexControl(ComplexControl cc, const
}
}
break;
-#endif // QT_NO_SCROLLBAR
+#endif // QT_CONFIG(scrollbar)
#ifndef QT_NO_TOOLBUTTON
case CC_ToolButton:
if (const QStyleOptionToolButton *toolbutton = qstyleoption_cast<const QStyleOptionToolButton *>(opt)) {
@@ -3996,7 +3996,7 @@ QRect QCommonStyle::subControlRect(ComplexControl cc, const QStyleOptionComplex
}
break;
#endif // QT_NO_SLIDER
-#ifndef QT_NO_SCROLLBAR
+#if QT_CONFIG(scrollbar)
case CC_ScrollBar:
if (const QStyleOptionSlider *scrollbar = qstyleoption_cast<const QStyleOptionSlider *>(opt)) {
const QRect scrollBarRect = scrollbar->rect;
@@ -4080,7 +4080,7 @@ QRect QCommonStyle::subControlRect(ComplexControl cc, const QStyleOptionComplex
ret = visualRect(scrollbar->direction, scrollBarRect, ret);
}
break;
-#endif // QT_NO_SCROLLBAR
+#endif // QT_CONFIG(scrollbar)
#ifndef QT_NO_SPINBOX
case CC_SpinBox:
if (const QStyleOptionSpinBox *spinbox = qstyleoption_cast<const QStyleOptionSpinBox *>(opt)) {
@@ -4482,7 +4482,7 @@ int QCommonStyle::pixelMetric(PixelMetric m, const QStyleOption *opt, const QWid
ret = int(QStyleHelper::dpiScaled(196.));
break;
-#ifndef QT_NO_SCROLLBAR
+#if QT_CONFIG(scrollbar)
case PM_ScrollBarExtent:
if (const QStyleOptionSlider *sb = qstyleoption_cast<const QStyleOptionSlider *>(opt)) {
int s = sb->orientation == Qt::Horizontal ?
diff --git a/src/widgets/styles/qfusionstyle.cpp b/src/widgets/styles/qfusionstyle.cpp
index 1f8e62bcde..c58ed3bee1 100644
--- a/src/widgets/styles/qfusionstyle.cpp
+++ b/src/widgets/styles/qfusionstyle.cpp
@@ -59,7 +59,9 @@
#include <qfont.h>
#include <qgroupbox.h>
#include <qpixmapcache.h>
+#if QT_CONFIG(scrollbar)
#include <qscrollbar.h>
+#endif
#include <qspinbox.h>
#if QT_CONFIG(abstractslider)
#include <qabstractslider.h>
diff --git a/src/widgets/styles/qmacstyle_mac.mm b/src/widgets/styles/qmacstyle_mac.mm
index a35981fa29..d495af6333 100644
--- a/src/widgets/styles/qmacstyle_mac.mm
+++ b/src/widgets/styles/qmacstyle_mac.mm
@@ -91,7 +91,9 @@
#if QT_CONFIG(rubberband)
#include <qrubberband.h>
#endif
+#if QT_CONFIG(scrollbar)
#include <qscrollbar.h>
+#endif
#include <qsizegrip.h>
#include <qstyleoption.h>
#include <qtoolbar.h>
diff --git a/src/widgets/styles/qpixmapstyle.cpp b/src/widgets/styles/qpixmapstyle.cpp
index 7a628a4e39..975ebfcdbf 100644
--- a/src/widgets/styles/qpixmapstyle.cpp
+++ b/src/widgets/styles/qpixmapstyle.cpp
@@ -65,8 +65,9 @@
#include <QListView>
#endif
#include <QAbstractScrollArea>
+#if QT_CONFIG(scrollbar)
#include <QScrollBar>
-
+#endif
#if QT_CONFIG(scroller)
#include <qscroller.h>
#endif
diff --git a/src/widgets/styles/qstylehelper.cpp b/src/widgets/styles/qstylehelper.cpp
index 43bec9a096..797fb0c60a 100644
--- a/src/widgets/styles/qstylehelper.cpp
+++ b/src/widgets/styles/qstylehelper.cpp
@@ -43,7 +43,9 @@
#include <private/qmath_p.h>
#include <private/qstyle_p.h>
#include <qmath.h>
+#if QT_CONFIG(scrollbar)
#include <qscrollbar.h>
+#endif
#include <qabstractscrollarea.h>
#include <qwindow.h>
diff --git a/src/widgets/styles/qstylesheetstyle.cpp b/src/widgets/styles/qstylesheetstyle.cpp
index 2b5b09a46a..740fb4fa47 100644
--- a/src/widgets/styles/qstylesheetstyle.cpp
+++ b/src/widgets/styles/qstylesheetstyle.cpp
@@ -61,7 +61,9 @@
#include <qtooltip.h>
#include <qshareddata.h>
#include <qtoolbutton.h>
+#if QT_CONFIG(scrollbar)
#include <qscrollbar.h>
+#endif
#if QT_CONFIG(abstractslider)
#include <qabstractslider.h>
#endif
@@ -3198,7 +3200,7 @@ void QStyleSheetStyle::drawComplexControl(ComplexControl cc, const QStyleOptionC
}
break;
-#ifndef QT_NO_SCROLLBAR
+#if QT_CONFIG(scrollbar)
case CC_ScrollBar:
if (const QStyleOptionSlider *sb = qstyleoption_cast<const QStyleOptionSlider *>(opt)) {
QStyleOptionSlider sbOpt(*sb);
@@ -3213,7 +3215,7 @@ void QStyleSheetStyle::drawComplexControl(ComplexControl cc, const QStyleOptionC
return;
}
break;
-#endif // QT_NO_SCROLLBAR
+#endif // QT_CONFIG(scrollbar)
#ifndef QT_NO_SLIDER
case CC_Slider:
@@ -4760,7 +4762,7 @@ int QStyleSheetStyle::pixelMetric(PixelMetric m, const QStyleOption *opt, const
return subRule.box()->spacing;
break;
-#ifndef QT_NO_SCROLLBAR
+#if QT_CONFIG(scrollbar)
case PM_ScrollBarExtent:
if (rule.hasContentsSize()) {
QSize sz = rule.size();
@@ -4784,7 +4786,7 @@ int QStyleSheetStyle::pixelMetric(PixelMetric m, const QStyleOption *opt, const
if(!rule.hasNativeBorder() || rule.hasBox())
return 0;
break;
-#endif // QT_NO_SCROLLBAR
+#endif // QT_CONFIG(scrollbar)
case PM_ProgressBarChunkWidth:
subRule = renderRule(w, opt, PseudoElement_ProgressBarChunk);
@@ -5525,7 +5527,7 @@ QRect QStyleSheetStyle::subControlRect(ComplexControl cc, const QStyleOptionComp
}
break;
-#ifndef QT_NO_SCROLLBAR
+#if QT_CONFIG(scrollbar)
case CC_ScrollBar:
if (const QStyleOptionSlider *sb = qstyleoption_cast<const QStyleOptionSlider *>(opt)) {
QStyleOptionSlider styleOptionSlider(*sb);
@@ -5607,7 +5609,7 @@ QRect QStyleSheetStyle::subControlRect(ComplexControl cc, const QStyleOptionComp
: QWindowsStyle::subControlRect(cc, &styleOptionSlider, sc, w);
}
break;
-#endif // QT_NO_SCROLLBAR
+#endif // QT_CONFIG(scrollbar)
#ifndef QT_NO_SLIDER
case CC_Slider:
diff --git a/src/widgets/styles/qwindowsstyle.cpp b/src/widgets/styles/qwindowsstyle.cpp
index 63f7cd43ef..fa5070b867 100644
--- a/src/widgets/styles/qwindowsstyle.cpp
+++ b/src/widgets/styles/qwindowsstyle.cpp
@@ -1499,7 +1499,7 @@ void QWindowsStyle::drawControl(ControlElement ce, const QStyleOption *opt, QPai
p->eraseRect(opt->rect);
break;
#endif // QT_NO_SPLITTER
-#ifndef QT_NO_SCROLLBAR
+#if QT_CONFIG(scrollbar)
case CE_ScrollBarSubLine:
case CE_ScrollBarAddLine: {
if ((opt->state & State_Sunken)) {
@@ -1586,7 +1586,7 @@ void QWindowsStyle::drawControl(ControlElement ce, const QStyleOption *opt, QPai
qDrawWinButton(p, opt->rect, pal, false, &opt->palette.brush(QPalette::Button));
}
break;
-#endif // QT_NO_SCROLLBAR
+#endif // QT_CONFIG(scrollbar)
case CE_HeaderSection: {
QBrush fill;
if (opt->state & State_On)
@@ -2143,7 +2143,7 @@ void QWindowsStyle::drawComplexControl(ComplexControl cc, const QStyleOptionComp
}
break;
#endif // QT_NO_SLIDER
-#ifndef QT_NO_SCROLLBAR
+#if QT_CONFIG(scrollbar)
case CC_ScrollBar:
if (const QStyleOptionSlider *scrollbar = qstyleoption_cast<const QStyleOptionSlider *>(opt)) {
QStyleOptionSlider newScrollbar = *scrollbar;
@@ -2152,7 +2152,7 @@ void QWindowsStyle::drawComplexControl(ComplexControl cc, const QStyleOptionComp
QCommonStyle::drawComplexControl(cc, &newScrollbar, p, widget);
}
break;
-#endif // QT_NO_SCROLLBAR
+#endif // QT_CONFIG(scrollbar)
#if QT_CONFIG(combobox)
case CC_ComboBox:
if (const QStyleOptionComboBox *cmb = qstyleoption_cast<const QStyleOptionComboBox *>(opt)) {
diff --git a/src/widgets/styles/qwindowsvistastyle_p_p.h b/src/widgets/styles/qwindowsvistastyle_p_p.h
index 7b2d80eba3..4973c20440 100644
--- a/src/widgets/styles/qwindowsvistastyle_p_p.h
+++ b/src/widgets/styles/qwindowsvistastyle_p_p.h
@@ -75,7 +75,9 @@
#if QT_CONFIG(combobox)
#include <qcombobox.h>
#endif
+#if QT_CONFIG(scrollbar)
#include <qscrollbar.h>
+#endif
#if QT_CONFIG(progressbar)
#include <qprogressbar.h>
#endif
diff --git a/src/widgets/styles/qwindowsxpstyle.cpp b/src/widgets/styles/qwindowsxpstyle.cpp
index 28171f3156..b74c4123b3 100644
--- a/src/widgets/styles/qwindowsxpstyle.cpp
+++ b/src/widgets/styles/qwindowsxpstyle.cpp
@@ -64,7 +64,9 @@
#if QT_CONFIG(combobox)
#include <qcombobox.h>
#endif
+#if QT_CONFIG(scrollbar)
#include <qscrollbar.h>
+#endif
#include <qheaderview.h>
#include <qspinbox.h>
#if QT_CONFIG(listview)
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-02 20:54:09 +0000