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/accessible | |
| 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/accessible')
| -rw-r--r-- | src/widgets/accessible/qaccessiblewidget.cpp | 6 | ||||
| -rw-r--r-- | src/widgets/accessible/qaccessiblewidgetfactory.cpp | 2 | ||||
| -rw-r--r-- | src/widgets/accessible/simplewidgets.cpp | 4 | ||||
| -rw-r--r-- | src/widgets/accessible/simplewidgets_p.h | 2 |
4 files changed, 9 insertions, 5 deletions
diff --git a/src/widgets/accessible/qaccessiblewidget.cpp b/src/widgets/accessible/qaccessiblewidget.cpp index 3bc0f7e77b..e3dd7383b2 100644 --- a/src/widgets/accessible/qaccessiblewidget.cpp +++ b/src/widgets/accessible/qaccessiblewidget.cpp @@ -43,7 +43,9 @@ #include "qaction.h" #include "qapplication.h" +#if QT_CONFIG(groupbox) #include "qgroupbox.h" +#endif #if QT_CONFIG(label) #include "qlabel.h" #endif @@ -95,7 +97,7 @@ static QString buddyString(const QWidget *widget) } #endif -#ifndef QT_NO_GROUPBOX +#if QT_CONFIG(groupbox) QGroupBox *groupbox = qobject_cast<QGroupBox*>(parent); if (groupbox) return groupbox->title(); @@ -331,7 +333,7 @@ QAccessibleWidget::relations(QAccessible::Relation match /*= QAccessible::AllRel } } #endif -#ifndef QT_NO_GROUPBOX +#if QT_CONFIG(groupbox) QGroupBox *groupbox = qobject_cast<QGroupBox*>(parent); if (groupbox && !groupbox->title().isEmpty()) { QAccessibleInterface *iface = QAccessible::queryAccessibleInterface(groupbox); diff --git a/src/widgets/accessible/qaccessiblewidgetfactory.cpp b/src/widgets/accessible/qaccessiblewidgetfactory.cpp index 4ca29dfbe6..67afec5faf 100644 --- a/src/widgets/accessible/qaccessiblewidgetfactory.cpp +++ b/src/widgets/accessible/qaccessiblewidgetfactory.cpp @@ -124,7 +124,7 @@ QAccessibleInterface *qAccessibleFactory(const QString &classname, QObject *obje #endif } else if (classname == QLatin1String("QLabel") || classname == QLatin1String("QLCDNumber")) { iface = new QAccessibleDisplay(widget); -#ifndef QT_NO_GROUPBOX +#if QT_CONFIG(groupbox) } else if (classname == QLatin1String("QGroupBox")) { iface = new QAccessibleGroupBox(widget); #endif diff --git a/src/widgets/accessible/simplewidgets.cpp b/src/widgets/accessible/simplewidgets.cpp index e5ab85ebab..fae17988b6 100644 --- a/src/widgets/accessible/simplewidgets.cpp +++ b/src/widgets/accessible/simplewidgets.cpp @@ -62,7 +62,9 @@ #if QT_CONFIG(label) #include <qlabel.h> #endif +#if QT_CONFIG(groupbox) #include <qgroupbox.h> +#endif #if QT_CONFIG(lcdnumber) #include <qlcdnumber.h> #endif @@ -566,7 +568,7 @@ QPoint QAccessibleDisplay::imagePosition() const #endif } -#ifndef QT_NO_GROUPBOX +#if QT_CONFIG(groupbox) QAccessibleGroupBox::QAccessibleGroupBox(QWidget *w) : QAccessibleWidget(w) { diff --git a/src/widgets/accessible/simplewidgets_p.h b/src/widgets/accessible/simplewidgets_p.h index d4a25b4b80..5055f2c534 100644 --- a/src/widgets/accessible/simplewidgets_p.h +++ b/src/widgets/accessible/simplewidgets_p.h @@ -126,7 +126,7 @@ public: QPoint imagePosition() const Q_DECL_OVERRIDE; }; -#ifndef QT_NO_GROUPBOX +#if QT_CONFIG(groupbox) class QAccessibleGroupBox : public QAccessibleWidget { public: |