diff options
Diffstat (limited to 'src/widgets/widgets')
-rw-r--r-- | src/widgets/widgets/qprogressbar.cpp | 4 | ||||
-rw-r--r-- | src/widgets/widgets/qprogressbar.h | 7 | ||||
-rw-r--r-- | src/widgets/widgets/widgets.pri | 7 |
3 files changed, 8 insertions, 10 deletions
diff --git a/src/widgets/widgets/qprogressbar.cpp b/src/widgets/widgets/qprogressbar.cpp index b4819278c7..c408a87339 100644 --- a/src/widgets/widgets/qprogressbar.cpp +++ b/src/widgets/widgets/qprogressbar.cpp @@ -38,7 +38,7 @@ ****************************************************************************/ #include "qprogressbar.h" -#ifndef QT_NO_PROGRESSBAR + #include <qlocale.h> #include <qevent.h> #include <qpainter.h> @@ -623,5 +623,3 @@ QString QProgressBar::format() const QT_END_NAMESPACE #include "moc_qprogressbar.cpp" - -#endif // QT_NO_PROGRESSBAR diff --git a/src/widgets/widgets/qprogressbar.h b/src/widgets/widgets/qprogressbar.h index 2dbb7240c5..e0f5e9084b 100644 --- a/src/widgets/widgets/qprogressbar.h +++ b/src/widgets/widgets/qprogressbar.h @@ -43,10 +43,9 @@ #include <QtWidgets/qtwidgetsglobal.h> #include <QtWidgets/qframe.h> -QT_BEGIN_NAMESPACE - +QT_REQUIRE_CONFIG(progressbar); -#ifndef QT_NO_PROGRESSBAR +QT_BEGIN_NAMESPACE class QProgressBarPrivate; class QStyleOptionProgressBar; @@ -119,8 +118,6 @@ private: Q_DISABLE_COPY(QProgressBar) }; -#endif // QT_NO_PROGRESSBAR - QT_END_NAMESPACE #endif // QPROGRESSBAR_H diff --git a/src/widgets/widgets/widgets.pri b/src/widgets/widgets/widgets.pri index 66416cdb08..eff98c717a 100644 --- a/src/widgets/widgets/widgets.pri +++ b/src/widgets/widgets/widgets.pri @@ -22,7 +22,6 @@ HEADERS += \ widgets/qmenu_p.h \ widgets/qmenubar.h \ widgets/qmenubar_p.h \ - widgets/qprogressbar.h \ widgets/qscrollbar.h \ widgets/qscrollbar_p.h \ widgets/qscrollarea_p.h \ @@ -67,7 +66,6 @@ SOURCES += \ widgets/qmdisubwindow.cpp \ widgets/qmenu.cpp \ widgets/qmenubar.cpp \ - widgets/qprogressbar.cpp \ widgets/qscrollbar.cpp \ widgets/qsizegrip.cpp \ widgets/qslider.cpp \ @@ -184,6 +182,11 @@ qtConfig(lcdnumber) { widgets/qlcdnumber.cpp } +qtConfig(progressbar) { + HEADERS += widgets/qprogressbar.h + SOURCES += widgets/qprogressbar.cpp +} + qtConfig(pushbutton) { HEADERS += \ widgets/qpushbutton.h \ |