diff options
Diffstat (limited to 'src/widgets/styles')
-rw-r--r-- | src/widgets/styles/qcommonstyle.cpp | 12 | ||||
-rw-r--r-- | src/widgets/styles/qfusionstyle.cpp | 2 | ||||
-rw-r--r-- | src/widgets/styles/qmacstyle_mac.mm | 6 | ||||
-rw-r--r-- | src/widgets/styles/qmacstyle_mac_p_p.h | 2 | ||||
-rw-r--r-- | src/widgets/styles/qpixmapstyle.cpp | 2 | ||||
-rw-r--r-- | src/widgets/styles/qwindowsvistastyle_p_p.h | 2 |
6 files changed, 18 insertions, 8 deletions
diff --git a/src/widgets/styles/qcommonstyle.cpp b/src/widgets/styles/qcommonstyle.cpp index 4e6f0c8817..671da4c38c 100644 --- a/src/widgets/styles/qcommonstyle.cpp +++ b/src/widgets/styles/qcommonstyle.cpp @@ -288,7 +288,7 @@ void QCommonStyle::drawPrimitive(PrimitiveElement pe, const QStyleOption *opt, Q case PE_PanelToolBar: break; #endif // QT_NO_TOOLBAR -#ifndef QT_NO_PROGRESSBAR +#if QT_CONFIG(progressbar) case PE_IndicatorProgressChunk: { bool vertical = false; @@ -303,7 +303,7 @@ void QCommonStyle::drawPrimitive(PrimitiveElement pe, const QStyleOption *opt, Q } } break; -#endif // QT_NO_PROGRESSBAR +#endif // QT_CONFIG(progressbar) case PE_IndicatorBranch: { static const int decoration_size = 9; int mid_h = opt->rect.x() + opt->rect.width() / 2; @@ -1414,7 +1414,7 @@ void QCommonStyle::drawControl(ControlElement element, const QStyleOption *opt, p->eraseRect(opt->rect); break; #endif // QT_NO_MENUBAR -#ifndef QT_NO_PROGRESSBAR +#if QT_CONFIG(progressbar) case CE_ProgressBar: if (const QStyleOptionProgressBar *pb = qstyleoption_cast<const QStyleOptionProgressBar *>(opt)) { @@ -1551,7 +1551,7 @@ void QCommonStyle::drawControl(ControlElement element, const QStyleOption *opt, } } break; -#endif // QT_NO_PROGRESSBAR +#endif // QT_CONFIG(progressbar) case CE_HeaderLabel: if (const QStyleOptionHeader *header = qstyleoption_cast<const QStyleOptionHeader *>(opt)) { QRect rect = header->rect; @@ -2487,7 +2487,7 @@ QRect QCommonStyle::subElementRect(SubElement sr, const QStyleOption *opt, } break; #endif // QT_NO_SLIDER -#ifndef QT_NO_PROGRESSBAR +#if QT_CONFIG(progressbar) case SE_ProgressBarGroove: case SE_ProgressBarContents: case SE_ProgressBarLabel: @@ -2512,7 +2512,7 @@ QRect QCommonStyle::subElementRect(SubElement sr, const QStyleOption *opt, r = visualRect(pb->direction, pb->rect, r); } break; -#endif // QT_NO_PROGRESSBAR +#endif // QT_CONFIG(progressbar) #if QT_CONFIG(combobox) case SE_ComboBoxFocusRect: if (const QStyleOptionComboBox *cb = qstyleoption_cast<const QStyleOptionComboBox *>(opt)) { diff --git a/src/widgets/styles/qfusionstyle.cpp b/src/widgets/styles/qfusionstyle.cpp index 792d958d8b..1f8e62bcde 100644 --- a/src/widgets/styles/qfusionstyle.cpp +++ b/src/widgets/styles/qfusionstyle.cpp @@ -66,7 +66,9 @@ #endif #include <qslider.h> #include <qsplitter.h> +#if QT_CONFIG(progressbar) #include <qprogressbar.h> +#endif #if QT_CONFIG(wizard) #include <qwizard.h> #endif diff --git a/src/widgets/styles/qmacstyle_mac.mm b/src/widgets/styles/qmacstyle_mac.mm index 93f7dce590..a35981fa29 100644 --- a/src/widgets/styles/qmacstyle_mac.mm +++ b/src/widgets/styles/qmacstyle_mac.mm @@ -81,7 +81,9 @@ #include <qpainter.h> #include <qpixmapcache.h> #include <qpointer.h> +#if QT_CONFIG(progressbar) #include <qprogressbar.h> +#endif #if QT_CONFIG(pushbutton) #include <qpushbutton.h> #endif @@ -659,7 +661,7 @@ static QSize qt_aqua_get_known_size(QStyle::ContentsType ct, const QWidget *widg #endif else if (qobject_cast<const QSlider *>(widg)) ct = QStyle::CT_Slider; -#ifndef QT_NO_PROGRESSBAR +#if QT_CONFIG(progressbar) else if (qobject_cast<const QProgressBar *>(widg)) ct = QStyle::CT_ProgressBar; #endif @@ -875,7 +877,7 @@ static QSize qt_aqua_get_known_size(QStyle::ContentsType ct, const QWidget *widg ret.setWidth(w); break; } -#ifndef QT_NO_PROGRESSBAR +#if QT_CONFIG(progressbar) case QStyle::CT_ProgressBar: { int finalValue = -1; Qt::Orientation orient = Qt::Horizontal; diff --git a/src/widgets/styles/qmacstyle_mac_p_p.h b/src/widgets/styles/qmacstyle_mac_p_p.h index 50596e572d..91e84ed82e 100644 --- a/src/widgets/styles/qmacstyle_mac_p_p.h +++ b/src/widgets/styles/qmacstyle_mac_p_p.h @@ -83,7 +83,9 @@ #include <qpainter.h> #include <qpixmapcache.h> #include <qpointer.h> +#if QT_CONFIG(progressbar) #include <qprogressbar.h> +#endif #if QT_CONFIG(pushbutton) #include <qpushbutton.h> #endif diff --git a/src/widgets/styles/qpixmapstyle.cpp b/src/widgets/styles/qpixmapstyle.cpp index 63308a5e36..7a628a4e39 100644 --- a/src/widgets/styles/qpixmapstyle.cpp +++ b/src/widgets/styles/qpixmapstyle.cpp @@ -49,7 +49,9 @@ #include <QPixmapCache> #include <QStyleOption> #include <QString> +#if QT_CONFIG(progressbar) #include <QProgressBar> +#endif #include <QSlider> #include <QEvent> #if QT_CONFIG(combobox) diff --git a/src/widgets/styles/qwindowsvistastyle_p_p.h b/src/widgets/styles/qwindowsvistastyle_p_p.h index 5e2200b876..7b2d80eba3 100644 --- a/src/widgets/styles/qwindowsvistastyle_p_p.h +++ b/src/widgets/styles/qwindowsvistastyle_p_p.h @@ -76,7 +76,9 @@ #include <qcombobox.h> #endif #include <qscrollbar.h> +#if QT_CONFIG(progressbar) #include <qprogressbar.h> +#endif #if QT_CONFIG(dockwidget) #include <qdockwidget.h> #endif |