diff options
author | Stephan Binner <stephan.binner@basyskom.com> | 2017-07-09 11:04:38 +0200 |
---|---|---|
committer | Stephan Binner <stephan.binner@basyskom.com> | 2017-07-11 02:52:25 +0000 |
commit | 3835194d340f8756d2ac7a5f9ae2a3519cb891b9 (patch) | |
tree | 63fa52aabac01d835340b94a9ac8c146ac6fc110 /src/widgets/accessible | |
parent | 3906043f05d2ffccede47f845561cca95548ac5a (diff) |
Convert features.rubberband to QT_[REQUIRE_]CONFIG
Change-Id: I6d634bafa6d26c1e78069fddd412e6de24f5775c
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Diffstat (limited to 'src/widgets/accessible')
-rw-r--r-- | src/widgets/accessible/qaccessiblewidget.cpp | 2 | ||||
-rw-r--r-- | src/widgets/accessible/qaccessiblewidgetfactory.cpp | 2 | ||||
-rw-r--r-- | src/widgets/accessible/qaccessiblewidgets.cpp | 2 |
3 files changed, 5 insertions, 1 deletions
diff --git a/src/widgets/accessible/qaccessiblewidget.cpp b/src/widgets/accessible/qaccessiblewidget.cpp index f18930f273..3bc0f7e77b 100644 --- a/src/widgets/accessible/qaccessiblewidget.cpp +++ b/src/widgets/accessible/qaccessiblewidget.cpp @@ -54,7 +54,9 @@ #include "qwidget.h" #include "qdebug.h" #include <qmath.h> +#if QT_CONFIG(rubberband) #include <QRubberBand> +#endif #include <QFocusFrame> #include <QMenu> #include <QtWidgets/private/qwidget_p.h> diff --git a/src/widgets/accessible/qaccessiblewidgetfactory.cpp b/src/widgets/accessible/qaccessiblewidgetfactory.cpp index e7db53c251..ccd176cd04 100644 --- a/src/widgets/accessible/qaccessiblewidgetfactory.cpp +++ b/src/widgets/accessible/qaccessiblewidgetfactory.cpp @@ -193,7 +193,7 @@ QAccessibleInterface *qAccessibleFactory(const QString &classname, QObject *obje } else if (classname == QLatin1String("QDial")) { iface = new QAccessibleDial(widget); #endif -#ifndef QT_NO_RUBBERBAND +#if QT_CONFIG(rubberband) } else if (classname == QLatin1String("QRubberBand")) { iface = new QAccessibleWidget(widget, QAccessible::Border); #endif diff --git a/src/widgets/accessible/qaccessiblewidgets.cpp b/src/widgets/accessible/qaccessiblewidgets.cpp index 7f77f7c524..60f489d487 100644 --- a/src/widgets/accessible/qaccessiblewidgets.cpp +++ b/src/widgets/accessible/qaccessiblewidgets.cpp @@ -58,7 +58,9 @@ #include <QDialogButtonBox> #endif #include <limits.h> +#if QT_CONFIG(rubberband) #include <QRubberBand> +#endif #include <QTextBrowser> #include <QCalendarWidget> #include <QAbstractItemView> |