5 files changed, 12 insertions, 3 deletions
diff --git a/src/widgets/util/qcompleter.cpp b/src/widgets/util/qcompleter.cpp
index 88c83b0c3f..d444fe6053 100644
--- a/src/widgets/util/qcompleter.cpp
+++ b/src/widgets/util/qcompleter.cpp
@@ -159,7 +159,9 @@
 #include "QtGui/qevent.h"
 #include "QtWidgets/qdesktopwidget.h"
 #include <private/qdesktopwidget_p.h>
+#if QT_CONFIG(lineedit)
 #include "QtWidgets/qlineedit.h"
+#endif
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/widgets/util/qsystemtrayicon.cpp b/src/widgets/util/qsystemtrayicon.cpp
index fb3782881c..447c7b2aeb 100644
--- a/src/widgets/util/qsystemtrayicon.cpp
+++ b/src/widgets/util/qsystemtrayicon.cpp
@@ -42,7 +42,9 @@
 
 #ifndef QT_NO_SYSTEMTRAYICON
 
+#if QT_CONFIG(menu)
 #include "qmenu.h"
+#endif
 #include "qlist.h"
 #include "qevent.h"
 #include "qpoint.h"
@@ -182,7 +184,7 @@ QSystemTrayIcon::~QSystemTrayIcon()
     d->remove_sys();
 }
 
-#ifndef QT_NO_MENU
+#if QT_CONFIG(menu)
 
 /*!
     Sets the specified \a menu to be the context menu for the system tray icon.
@@ -228,7 +230,7 @@ QMenu* QSystemTrayIcon::contextMenu() const
     return d->menu;
 }
 
-#endif // QT_NO_MENU
+#endif // QT_CONFIG(menu)
 
 /*!
     \property QSystemTrayIcon::icon
diff --git a/src/widgets/util/qsystemtrayicon.h b/src/widgets/util/qsystemtrayicon.h
index 918dd0478e..81f396ed83 100644
--- a/src/widgets/util/qsystemtrayicon.h
+++ b/src/widgets/util/qsystemtrayicon.h
@@ -78,7 +78,7 @@ public:
         MiddleClick
     };
 
-#ifndef QT_NO_MENU
+#if QT_CONFIG(menu)
     void setContextMenu(QMenu *menu);
     QMenu *contextMenu() const;
 #endif
diff --git a/src/widgets/util/qsystemtrayicon_p.h b/src/widgets/util/qsystemtrayicon_p.h
index 3f5cab40be..318edbd1e3 100644
--- a/src/widgets/util/qsystemtrayicon_p.h
+++ b/src/widgets/util/qsystemtrayicon_p.h
@@ -57,7 +57,10 @@
 
 #ifndef QT_NO_SYSTEMTRAYICON
 
+#if QT_CONFIG(menu)
 #include "QtWidgets/qmenu.h"
+#endif
+#include "QtWidgets/qwidget.h"
 #include "QtGui/qpixmap.h"
 #include <qpa/qplatformsystemtrayicon.h>
 #include "QtCore/qstring.h"
diff --git a/src/widgets/util/qsystemtrayicon_x11.cpp b/src/widgets/util/qsystemtrayicon_x11.cpp
index fd9fdfb507..cd593d8d98 100644
--- a/src/widgets/util/qsystemtrayicon_x11.cpp
+++ b/src/widgets/util/qsystemtrayicon_x11.cpp
@@ -47,7 +47,9 @@
 #include "qevent.h"
 #include "qapplication.h"
 #include "qlist.h"
+#if QT_CONFIG(menu)
 #include "qmenu.h"
+#endif
 #include "qtimer.h"
 #include "qsystemtrayicon_p.h"
 #include "qpaintengine.h"