4 files changed, 13 insertions, 17 deletions
diff --git a/src/widgets/util/qcompleter.cpp b/src/widgets/util/qcompleter.cpp
index 25e08c3921..88c83b0c3f 100644
--- a/src/widgets/util/qcompleter.cpp
+++ b/src/widgets/util/qcompleter.cpp
@@ -143,8 +143,6 @@
 
 #include "qcompleter_p.h"
 
-#ifndef QT_NO_COMPLETER
-
 #include "QtWidgets/qscrollbar.h"
 #include "QtCore/qstringlistmodel.h"
 #if QT_CONFIG(dirmodel)
@@ -1920,5 +1918,3 @@ QT_END_NAMESPACE
 #include "moc_qcompleter.cpp"
 
 #include "moc_qcompleter_p.cpp"
-
-#endif // QT_NO_COMPLETER
diff --git a/src/widgets/util/qcompleter.h b/src/widgets/util/qcompleter.h
index 33e6540264..1a2c2440f5 100644
--- a/src/widgets/util/qcompleter.h
+++ b/src/widgets/util/qcompleter.h
@@ -47,10 +47,9 @@
 #include <QtCore/qabstractitemmodel.h>
 #include <QtCore/qrect.h>
 
-QT_BEGIN_NAMESPACE
-
+QT_REQUIRE_CONFIG(completer);
 
-#ifndef QT_NO_COMPLETER
+QT_BEGIN_NAMESPACE
 
 class QCompleterPrivate;
 class QAbstractItemView;
@@ -162,8 +161,6 @@ private:
     Q_PRIVATE_SLOT(d_func(), void _q_fileSystemModelDirectoryLoaded(const QString&))
 };
 
-#endif // QT_NO_COMPLETER
-
 QT_END_NAMESPACE
 
 #endif // QCOMPLETER_H
diff --git a/src/widgets/util/qcompleter_p.h b/src/widgets/util/qcompleter_p.h
index 3cb7c59b6d..179e116d51 100644
--- a/src/widgets/util/qcompleter_p.h
+++ b/src/widgets/util/qcompleter_p.h
@@ -55,8 +55,6 @@
 #include <QtWidgets/private/qtwidgetsglobal_p.h>
 #include "private/qobject_p.h"
 
-#ifndef QT_NO_COMPLETER
-
 #include "QtWidgets/qabstractitemview.h"
 #include "QtCore/qabstractproxymodel.h"
 #include "qcompleter.h"
@@ -64,6 +62,8 @@
 #include "QtGui/qpainter.h"
 #include "private/qabstractproxymodel_p.h"
 
+QT_REQUIRE_CONFIG(completer);
+
 QT_BEGIN_NAMESPACE
 
 class QCompletionModel;
@@ -258,6 +258,4 @@ class QCompletionModelPrivate : public QAbstractProxyModelPrivate
 
 QT_END_NAMESPACE
 
-#endif // QT_NO_COMPLETER
-
 #endif // QCOMPLETER_P_H
diff --git a/src/widgets/util/util.pri b/src/widgets/util/util.pri
index 701758a406..a3bd8897f1 100644
--- a/src/widgets/util/util.pri
+++ b/src/widgets/util/util.pri
@@ -3,14 +3,19 @@
 HEADERS += \
         util/qsystemtrayicon.h \
         util/qcolormap.h \
-        util/qcompleter.h \
-        util/qcompleter_p.h \
         util/qsystemtrayicon_p.h
 
 SOURCES += \
         util/qsystemtrayicon.cpp \
-        util/qcolormap.cpp \
-        util/qcompleter.cpp
+        util/qcolormap.cpp
+
+qtConfig(completer) {
+    HEADERS += \
+        util/qcompleter.h \
+        util/qcompleter_p.h
+
+    SOURCES += util/qcompleter.cpp
+}
 
 qtConfig(scroller) {
     HEADERS += \