diff options
| author | Stephan Binner <stephan.binner@basyskom.com> | 2017-07-27 22:07:50 +0200 |
|---|---|---|
| committer | Stephan Binner <stephan.binner@basyskom.com> | 2017-08-10 05:37:03 +0000 |
| commit | fab326173000ef82ced76ed5b74d10988ddb3972 (patch) | |
| tree | d9004b2b264c7a7bcfe7733c68a740c0ee91d44c /src/widgets/accessible | |
| parent | c35fc435950437d3d046b17d06593873d7b82011 (diff) | |
Convert features.textbrowser to QT_[REQUIRE_]CONFIG
Change-Id: I02a0c39c308204f7c67674928973275fa1247d38
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Diffstat (limited to 'src/widgets/accessible')
| -rw-r--r-- | src/widgets/accessible/qaccessiblewidgetfactory.cpp | 2 | ||||
| -rw-r--r-- | src/widgets/accessible/qaccessiblewidgets.cpp | 6 | ||||
| -rw-r--r-- | src/widgets/accessible/qaccessiblewidgets_p.h | 4 |
3 files changed, 7 insertions, 5 deletions
diff --git a/src/widgets/accessible/qaccessiblewidgetfactory.cpp b/src/widgets/accessible/qaccessiblewidgetfactory.cpp index be52188cc3..194b38461b 100644 --- a/src/widgets/accessible/qaccessiblewidgetfactory.cpp +++ b/src/widgets/accessible/qaccessiblewidgetfactory.cpp @@ -201,7 +201,7 @@ QAccessibleInterface *qAccessibleFactory(const QString &classname, QObject *obje } else if (classname == QLatin1String("QRubberBand")) { iface = new QAccessibleWidget(widget, QAccessible::Border); #endif -#if !defined(QT_NO_TEXTBROWSER) && !defined(QT_NO_CURSOR) +#if QT_CONFIG(textbrowser) && !defined(QT_NO_CURSOR) } else if (classname == QLatin1String("QTextBrowser")) { iface = new QAccessibleTextBrowser(widget); #endif diff --git a/src/widgets/accessible/qaccessiblewidgets.cpp b/src/widgets/accessible/qaccessiblewidgets.cpp index e28833274e..cdfab75385 100644 --- a/src/widgets/accessible/qaccessiblewidgets.cpp +++ b/src/widgets/accessible/qaccessiblewidgets.cpp @@ -61,7 +61,9 @@ #if QT_CONFIG(rubberband) #include <QRubberBand> #endif +#if QT_CONFIG(textbrowser) #include <QTextBrowser> +#endif #if QT_CONFIG(calendarwidget) #include <QCalendarWidget> #endif @@ -499,7 +501,7 @@ QAccessibleDialogButtonBox::QAccessibleDialogButtonBox(QWidget *widget) #endif // QT_CONFIG(dialogbuttonbox) -#if !defined(QT_NO_TEXTBROWSER) && !defined(QT_NO_CURSOR) +#if QT_CONFIG(textbrowser) && !defined(QT_NO_CURSOR) QAccessibleTextBrowser::QAccessibleTextBrowser(QWidget *widget) : QAccessibleTextEdit(widget) { @@ -510,7 +512,7 @@ QAccessible::Role QAccessibleTextBrowser::role() const { return QAccessible::StaticText; } -#endif // QT_NO_TEXTBROWSER && QT_NO_CURSOR +#endif // QT_CONFIG(textbrowser) && QT_NO_CURSOR #if QT_CONFIG(calendarwidget) // ===================== QAccessibleCalendarWidget ======================== diff --git a/src/widgets/accessible/qaccessiblewidgets_p.h b/src/widgets/accessible/qaccessiblewidgets_p.h index 3ff67c0c9b..050930243d 100644 --- a/src/widgets/accessible/qaccessiblewidgets_p.h +++ b/src/widgets/accessible/qaccessiblewidgets_p.h @@ -256,7 +256,7 @@ public: }; #endif -#if !defined(QT_NO_TEXTBROWSER) && !defined(QT_NO_CURSOR) +#if QT_CONFIG(textbrowser) && !defined(QT_NO_CURSOR) class QAccessibleTextBrowser : public QAccessibleTextEdit { public: @@ -264,7 +264,7 @@ public: QAccessible::Role role() const Q_DECL_OVERRIDE; }; -#endif // QT_NO_TEXTBROWSER && QT_NO_CURSOR +#endif // QT_CONFIG(textbrowser) && QT_NO_CURSOR #if QT_CONFIG(calendarwidget) class QAccessibleCalendarWidget : public QAccessibleWidget |