diff options
| author | Stephan Binner <stephan.binner@basyskom.com> | 2017-07-29 08:48:11 +0200 |
|---|---|---|
| committer | Stephan Binner <stephan.binner@basyskom.com> | 2017-08-10 05:37:21 +0000 |
| commit | 39851c6905f68a91f95838da91947f8bfae65729 (patch) | |
| tree | a19d880b80a1c15902ed1c3b1920c66834270753 /src/widgets/widgets | |
| parent | 414026ad9c3e92b1c6a715543175acb922d703e2 (diff) | |
Convert features.groupbox to QT_[REQUIRE_]CONFIG
Change-Id: I034286043a880ab777ec3f2311572bdc38e7fafc
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Diffstat (limited to 'src/widgets/widgets')
| -rw-r--r-- | src/widgets/widgets/qgroupbox.cpp | 5 | ||||
| -rw-r--r-- | src/widgets/widgets/qgroupbox.h | 7 | ||||
| -rw-r--r-- | src/widgets/widgets/widgets.pri | 7 |
3 files changed, 8 insertions, 11 deletions
diff --git a/src/widgets/widgets/qgroupbox.cpp b/src/widgets/widgets/qgroupbox.cpp index 9e323df9a6..611f3f88db 100644 --- a/src/widgets/widgets/qgroupbox.cpp +++ b/src/widgets/widgets/qgroupbox.cpp @@ -38,7 +38,7 @@ ****************************************************************************/ #include "qgroupbox.h" -#ifndef QT_NO_GROUPBOX + #include "qapplication.h" #include "qbitmap.h" #include "qdrawutil.h" @@ -751,9 +751,6 @@ void QGroupBox::mouseReleaseEvent(QMouseEvent *event) update(style()->subControlRect(QStyle::CC_GroupBox, &box, QStyle::SC_GroupBoxCheckBox, this)); } - QT_END_NAMESPACE #include "moc_qgroupbox.cpp" - -#endif //QT_NO_GROUPBOX diff --git a/src/widgets/widgets/qgroupbox.h b/src/widgets/widgets/qgroupbox.h index a132d48e16..668dc03f3d 100644 --- a/src/widgets/widgets/qgroupbox.h +++ b/src/widgets/widgets/qgroupbox.h @@ -43,10 +43,9 @@ #include <QtWidgets/qtwidgetsglobal.h> #include <QtWidgets/qframe.h> -QT_BEGIN_NAMESPACE - +QT_REQUIRE_CONFIG(groupbox); -#ifndef QT_NO_GROUPBOX +QT_BEGIN_NAMESPACE class QGroupBoxPrivate; class QStyleOptionGroupBox; @@ -104,8 +103,6 @@ private: Q_PRIVATE_SLOT(d_func(), void _q_setChildrenEnabled(bool b)) }; -#endif // QT_NO_GROUPBOX - QT_END_NAMESPACE #endif // QGROUPBOX_H diff --git a/src/widgets/widgets/widgets.pri b/src/widgets/widgets/widgets.pri index 0401d7ada2..a4bd39cf67 100644 --- a/src/widgets/widgets/widgets.pri +++ b/src/widgets/widgets/widgets.pri @@ -7,7 +7,6 @@ HEADERS += \ widgets/qabstractspinbox_p.h \ widgets/qframe.h \ widgets/qframe_p.h \ - widgets/qgroupbox.h \ widgets/qkeysequenceedit.h \ widgets/qkeysequenceedit_p.h \ widgets/qlineedit.h \ @@ -53,7 +52,6 @@ SOURCES += \ widgets/qabstractspinbox.cpp \ widgets/qeffects.cpp \ widgets/qframe.cpp \ - widgets/qgroupbox.cpp \ widgets/qkeysequenceedit.cpp \ widgets/qlineedit_p.cpp \ widgets/qlineedit.cpp \ @@ -160,6 +158,11 @@ qtConfig(fontcombobox) { SOURCES += widgets/qfontcombobox.cpp } +qtConfig(groupbox) { + HEADERS += widgets/qgroupbox.h + SOURCES += widgets/qgroupbox.cpp +} + qtConfig(label) { HEADERS += \ widgets/qlabel.h \ |