8 files changed, 17 insertions, 18 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
diff --git a/src/widgets/dialogs/qmessagebox.cpp b/src/widgets/dialogs/qmessagebox.cpp
index 843a1bf341..6a55f62e53 100644
--- a/src/widgets/dialogs/qmessagebox.cpp
+++ b/src/widgets/dialogs/qmessagebox.cpp
@@ -55,7 +55,6 @@
 #include <QtGui/qtextdocument.h>
 #include <QtWidgets/qapplication.h>
 #include <QtWidgets/qtextedit.h>
-#include <QtWidgets/qtextbrowser.h>
 #include <QtWidgets/qmenu.h>
 #include "qdialog_p.h"
 #include <QtGui/qfont.h>
diff --git a/src/widgets/widgets/qtextbrowser.cpp b/src/widgets/widgets/qtextbrowser.cpp
index 902a6afb8a..0797120960 100644
--- a/src/widgets/widgets/qtextbrowser.cpp
+++ b/src/widgets/widgets/qtextbrowser.cpp
@@ -40,8 +40,6 @@
 #include "qtextbrowser.h"
 #include "qtextedit_p.h"
 
-#ifndef QT_NO_TEXTBROWSER
-
 #include <qstack.h>
 #include <qapplication.h>
 #include <qevent.h>
@@ -1270,5 +1268,3 @@ bool QTextBrowser::event(QEvent *e)
 QT_END_NAMESPACE
 
 #include "moc_qtextbrowser.cpp"
-
-#endif // QT_NO_TEXTBROWSER
diff --git a/src/widgets/widgets/qtextbrowser.h b/src/widgets/widgets/qtextbrowser.h
index 48b64d1216..f36c86bc86 100644
--- a/src/widgets/widgets/qtextbrowser.h
+++ b/src/widgets/widgets/qtextbrowser.h
@@ -44,10 +44,9 @@
 #include <QtWidgets/qtextedit.h>
 #include <QtCore/qurl.h>
 
-QT_BEGIN_NAMESPACE
-
+QT_REQUIRE_CONFIG(textbrowser);
 
-#ifndef QT_NO_TEXTBROWSER
+QT_BEGIN_NAMESPACE
 
 class QTextBrowserPrivate;
 
@@ -122,8 +121,6 @@ private:
     Q_PRIVATE_SLOT(d_func(), void _q_highlightLink(const QString &))
 };
 
-#endif // QT_NO_TEXTBROWSER
-
 QT_END_NAMESPACE
 
 #endif // QTEXTBROWSER_H
diff --git a/src/widgets/widgets/qtextedit.cpp b/src/widgets/widgets/qtextedit.cpp
index 6973cec429..01f20b1197 100644
--- a/src/widgets/widgets/qtextedit.cpp
+++ b/src/widgets/widgets/qtextedit.cpp
@@ -39,7 +39,9 @@
 
 #include "qtextedit_p.h"
 #include "qlineedit.h"
+#if QT_CONFIG(textbrowser)
 #include "qtextbrowser.h"
+#endif
 
 #ifndef QT_NO_TEXTEDIT
 #include <qfont.h>
@@ -2134,7 +2136,7 @@ void QTextEdit::setReadOnly(bool ro)
     Qt::TextInteractionFlags flags = Qt::NoTextInteraction;
     if (ro) {
         flags = Qt::TextSelectableByMouse;
-#ifndef QT_NO_TEXTBROWSER
+#if QT_CONFIG(textbrowser)
         if (qobject_cast<QTextBrowser *>(this))
             flags |= Qt::TextBrowserInteraction;
 #endif
diff --git a/src/widgets/widgets/widgets.pri b/src/widgets/widgets/widgets.pri
index 347c821145..66416cdb08 100644
--- a/src/widgets/widgets/widgets.pri
+++ b/src/widgets/widgets/widgets.pri
@@ -34,7 +34,6 @@ HEADERS += \
         widgets/qstackedwidget.h \
         widgets/qtextedit.h \
         widgets/qtextedit_p.h \
-        widgets/qtextbrowser.h \
         widgets/qtoolbar.h \
         widgets/qtoolbar_p.h \
         widgets/qtoolbarlayout_p.h \
@@ -76,7 +75,6 @@ SOURCES += \
         widgets/qsplitter.cpp \
         widgets/qstackedwidget.cpp \
         widgets/qtextedit.cpp \
-        widgets/qtextbrowser.cpp \
         widgets/qtoolbar.cpp \
         widgets/qtoolbarlayout.cpp \
         widgets/qtoolbarextension.cpp \
@@ -237,6 +235,11 @@ qtConfig(tabbar) {
     SOURCES += widgets/qtabbar.cpp
 }
 
+qtConfig(textbrowser) {
+    HEADERS += widgets/qtextbrowser.h
+    SOURCES += widgets/qtextbrowser.cpp
+}
+
 qtConfig(tabwidget) {
     HEADERS += widgets/qtabwidget.h
     SOURCES += widgets/qtabwidget.cpp