diff options
Diffstat (limited to 'src')
25 files changed, 67 insertions, 43 deletions
diff --git a/src/widgets/accessible/complexwidgets.cpp b/src/widgets/accessible/complexwidgets.cpp index 5442c145a0..efbca0331d 100644 --- a/src/widgets/accessible/complexwidgets.cpp +++ b/src/widgets/accessible/complexwidgets.cpp @@ -61,7 +61,9 @@ #endif #include <QAbstractScrollArea> #include <QScrollArea> +#if QT_CONFIG(scrollbar) #include <QScrollBar> +#endif #include <QDebug> #ifndef QT_NO_ACCESSIBILITY diff --git a/src/widgets/accessible/qaccessiblewidgetfactory.cpp b/src/widgets/accessible/qaccessiblewidgetfactory.cpp index cbc0ce9596..4ca29dfbe6 100644 --- a/src/widgets/accessible/qaccessiblewidgetfactory.cpp +++ b/src/widgets/accessible/qaccessiblewidgetfactory.cpp @@ -93,7 +93,7 @@ QAccessibleInterface *qAccessibleFactory(const QString &classname, QObject *obje } else if (classname == QLatin1String("QDoubleSpinBox")) { iface = new QAccessibleDoubleSpinBox(widget); #endif -#ifndef QT_NO_SCROLLBAR +#if QT_CONFIG(scrollbar) } else if (classname == QLatin1String("QScrollBar")) { iface = new QAccessibleScrollBar(widget); #endif diff --git a/src/widgets/accessible/qaccessiblewidgets.cpp b/src/widgets/accessible/qaccessiblewidgets.cpp index 72229834ec..4e7ba78620 100644 --- a/src/widgets/accessible/qaccessiblewidgets.cpp +++ b/src/widgets/accessible/qaccessiblewidgets.cpp @@ -47,7 +47,9 @@ #include "qtextobject.h" #include "qplaintextedit.h" #include "qtextboundaryfinder.h" +#if QT_CONFIG(scrollbar) #include "qscrollbar.h" +#endif #include "qdebug.h" #include <QApplication> #include <QStackedWidget> diff --git a/src/widgets/accessible/rangecontrols.cpp b/src/widgets/accessible/rangecontrols.cpp index 1aa1fb4929..c890c50938 100644 --- a/src/widgets/accessible/rangecontrols.cpp +++ b/src/widgets/accessible/rangecontrols.cpp @@ -44,7 +44,9 @@ #include <qdial.h> #endif #include <qspinbox.h> +#if QT_CONFIG(scrollbar) #include <qscrollbar.h> +#endif #include <qstyle.h> #include <qstyleoption.h> #include <qdebug.h> @@ -285,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. @@ -318,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 /*! diff --git a/src/widgets/accessible/rangecontrols_p.h b/src/widgets/accessible/rangecontrols_p.h index 8c1f96fdf8..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 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) diff --git a/src/widgets/widgets/qcombobox.cpp b/src/widgets/widgets/qcombobox.cpp index 506986f4ba..a4e71662c7 100644 --- a/src/widgets/widgets/qcombobox.cpp +++ b/src/widgets/widgets/qcombobox.cpp @@ -478,7 +478,7 @@ QComboBoxPrivateContainer::QComboBoxPrivateContainer(QAbstractItemView *itemView void QComboBoxPrivateContainer::scrollItemView(int action) { -#ifndef QT_NO_SCROLLBAR +#if QT_CONFIG(scrollbar) if (view->verticalScrollBar()) view->verticalScrollBar()->triggerAction(static_cast<QAbstractSlider::SliderAction>(action)); #endif @@ -489,7 +489,7 @@ void QComboBoxPrivateContainer::scrollItemView(int action) */ void QComboBoxPrivateContainer::updateScrollers() { -#ifndef QT_NO_SCROLLBAR +#if QT_CONFIG(scrollbar) if (!top || !bottom) return; @@ -516,7 +516,7 @@ void QComboBoxPrivateContainer::updateScrollers() top->hide(); bottom->hide(); } -#endif // QT_NO_SCROLLBAR +#endif // QT_CONFIG(scrollbar) } /* @@ -547,7 +547,7 @@ void QComboBoxPrivateContainer::setItemView(QAbstractItemView *itemView) if (view) { view->removeEventFilter(this); view->viewport()->removeEventFilter(this); -#ifndef QT_NO_SCROLLBAR +#if QT_CONFIG(scrollbar) disconnect(view->verticalScrollBar(), SIGNAL(valueChanged(int)), this, SLOT(updateScrollers())); disconnect(view->verticalScrollBar(), SIGNAL(rangeChanged(int,int)), @@ -572,7 +572,7 @@ void QComboBoxPrivateContainer::setItemView(QAbstractItemView *itemView) view->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff); QStyleOptionComboBox opt = comboStyleOption(); const bool usePopup = combo->style()->styleHint(QStyle::SH_ComboBox_Popup, &opt, combo); -#ifndef QT_NO_SCROLLBAR +#if QT_CONFIG(scrollbar) if (usePopup) view->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff); #endif @@ -584,7 +584,7 @@ void QComboBoxPrivateContainer::setItemView(QAbstractItemView *itemView) view->setFrameStyle(QFrame::NoFrame); view->setLineWidth(0); view->setEditTriggers(QAbstractItemView::NoEditTriggers); -#ifndef QT_NO_SCROLLBAR +#if QT_CONFIG(scrollbar) connect(view->verticalScrollBar(), SIGNAL(valueChanged(int)), this, SLOT(updateScrollers())); connect(view->verticalScrollBar(), SIGNAL(rangeChanged(int,int)), diff --git a/src/widgets/widgets/qplaintextedit.cpp b/src/widgets/widgets/qplaintextedit.cpp index 173be7aa88..f8c9b28bb7 100644 --- a/src/widgets/widgets/qplaintextedit.cpp +++ b/src/widgets/widgets/qplaintextedit.cpp @@ -947,7 +947,7 @@ void QPlainTextEditPrivate::pageUpDown(QTextCursor::MoveOperation op, QTextCurso } } -#ifndef QT_NO_SCROLLBAR +#if QT_CONFIG(scrollbar) void QPlainTextEditPrivate::_q_adjustScrollbars() { diff --git a/src/widgets/widgets/qplaintextedit_p.h b/src/widgets/widgets/qplaintextedit_p.h index 803623c974..2484f9a33c 100644 --- a/src/widgets/widgets/qplaintextedit_p.h +++ b/src/widgets/widgets/qplaintextedit_p.h @@ -54,7 +54,9 @@ #include <QtWidgets/private/qtwidgetsglobal_p.h> #include "private/qabstractscrollarea_p.h" #include "QtGui/qtextdocumentfragment.h" +#if QT_CONFIG(scrollbar) #include "QtWidgets/qscrollbar.h" +#endif #include "QtGui/qtextcursor.h" #include "QtGui/qtextformat.h" #include "QtWidgets/qmenu.h" diff --git a/src/widgets/widgets/qscrollbar.cpp b/src/widgets/widgets/qscrollbar.cpp index a98f3fe085..e40c922e97 100644 --- a/src/widgets/widgets/qscrollbar.cpp +++ b/src/widgets/widgets/qscrollbar.cpp @@ -47,8 +47,6 @@ #include "qmenu.h" #include <QtCore/qelapsedtimer.h> -#ifndef QT_NO_SCROLLBAR - #ifndef QT_NO_ACCESSIBILITY #include "qaccessible.h" #endif @@ -728,5 +726,3 @@ Q_WIDGETS_EXPORT QStyleOptionSlider qt_qscrollbarStyleOption(QScrollBar *scrollb QT_END_NAMESPACE #include "moc_qscrollbar.cpp" - -#endif // QT_NO_SCROLLBAR diff --git a/src/widgets/widgets/qscrollbar.h b/src/widgets/widgets/qscrollbar.h index c180a62585..22b9bfcddb 100644 --- a/src/widgets/widgets/qscrollbar.h +++ b/src/widgets/widgets/qscrollbar.h @@ -43,10 +43,10 @@ #include <QtWidgets/qtwidgetsglobal.h> #include <QtWidgets/qwidget.h> -#if QT_CONFIG(scrollbar) - #include <QtWidgets/qabstractslider.h> +QT_REQUIRE_CONFIG(scrollbar); + QT_BEGIN_NAMESPACE class QScrollBarPrivate; @@ -96,6 +96,4 @@ private: QT_END_NAMESPACE -#endif // QT_CONFIG(scrollbar) - #endif // QSCROLLBAR_H diff --git a/src/widgets/widgets/qscrollbar_p.h b/src/widgets/widgets/qscrollbar_p.h index e748edf6a9..8693495c6f 100644 --- a/src/widgets/widgets/qscrollbar_p.h +++ b/src/widgets/widgets/qscrollbar_p.h @@ -55,6 +55,8 @@ #include "private/qabstractslider_p.h" #include "qstyle.h" +QT_REQUIRE_CONFIG(scrollbar); + QT_BEGIN_NAMESPACE class QScrollBarPrivate : public QAbstractSliderPrivate diff --git a/src/widgets/widgets/qtextedit.cpp b/src/widgets/widgets/qtextedit.cpp index 01f20b1197..2d1397a54d 100644 --- a/src/widgets/widgets/qtextedit.cpp +++ b/src/widgets/widgets/qtextedit.cpp @@ -245,7 +245,7 @@ void QTextEditPrivate::pageUpDown(QTextCursor::MoveOperation op, QTextCursor::Mo control->setTextCursor(cursor); } -#ifndef QT_NO_SCROLLBAR +#if QT_CONFIG(scrollbar) static QSize documentSize(QWidgetTextControl *control) { QTextDocument *doc = control->document(); diff --git a/src/widgets/widgets/qtextedit_p.h b/src/widgets/widgets/qtextedit_p.h index 13d0eb323a..28257fe29f 100644 --- a/src/widgets/widgets/qtextedit_p.h +++ b/src/widgets/widgets/qtextedit_p.h @@ -54,7 +54,9 @@ #include <QtWidgets/private/qtwidgetsglobal_p.h> #include "private/qabstractscrollarea_p.h" #include "QtGui/qtextdocumentfragment.h" +#if QT_CONFIG(scrollbar) #include "QtWidgets/qscrollbar.h" +#endif #include "QtGui/qtextcursor.h" #include "QtGui/qtextformat.h" #include "QtWidgets/qmenu.h" diff --git a/src/widgets/widgets/qtoolbar.cpp b/src/widgets/widgets/qtoolbar.cpp index 893506f16f..b5c2179bcc 100644 --- a/src/widgets/widgets/qtoolbar.cpp +++ b/src/widgets/widgets/qtoolbar.cpp @@ -55,6 +55,7 @@ #endif #include <qsignalmapper.h> #include <qstylepainter.h> +#include <qstyleoption.h> #include <qtoolbutton.h> #include <qwidgetaction.h> #include <qtimer.h> diff --git a/src/widgets/widgets/qwidgettextcontrol_p_p.h b/src/widgets/widgets/qwidgettextcontrol_p_p.h index 357ffdc6bd..3917752d19 100644 --- a/src/widgets/widgets/qwidgettextcontrol_p_p.h +++ b/src/widgets/widgets/qwidgettextcontrol_p_p.h @@ -53,7 +53,6 @@ #include <QtWidgets/private/qtwidgetsglobal_p.h> #include "QtGui/qtextdocumentfragment.h" -#include "QtWidgets/qscrollbar.h" #include "QtGui/qtextcursor.h" #include "QtGui/qtextformat.h" #include "QtWidgets/qmenu.h" diff --git a/src/widgets/widgets/widgets.pri b/src/widgets/widgets/widgets.pri index 1ab8a85e0c..0401d7ada2 100644 --- a/src/widgets/widgets/widgets.pri +++ b/src/widgets/widgets/widgets.pri @@ -22,8 +22,6 @@ HEADERS += \ widgets/qmenu_p.h \ widgets/qmenubar.h \ widgets/qmenubar_p.h \ - widgets/qscrollbar.h \ - widgets/qscrollbar_p.h \ widgets/qscrollarea_p.h \ widgets/qsizegrip.h \ widgets/qslider.h \ @@ -65,7 +63,6 @@ SOURCES += \ widgets/qmdisubwindow.cpp \ widgets/qmenu.cpp \ widgets/qmenubar.cpp \ - widgets/qscrollbar.cpp \ widgets/qsizegrip.cpp \ widgets/qslider.cpp \ widgets/qspinbox.cpp \ @@ -215,6 +212,14 @@ qtConfig(rubberband) { SOURCES += widgets/qrubberband.cpp } +qtConfig(scrollbar) { + HEADERS += \ + widgets/qscrollbar.h \ + widgets/qscrollbar_p.h + + SOURCES += widgets/qscrollbar.cpp +} + qtConfig(splashscreen) { HEADERS += \ widgets/qsplashscreen.h |