From 4ecf82795de54fba530ac9c386f3afff2174edbd Mon Sep 17 00:00:00 2001
From: Gunnar Sletta <gunnar.sletta@nokia.com>
Date: Mon, 9 Jan 2012 08:53:17 +0100
Subject: Remove use of QT_MODULE from library

These defines were there to aid in the commercial
licensing scheme we used long ago, and are no longer needed.

Keep a QT_MODULE(x) define so other modules continue compiling.

Change-Id: I8fd76cd5270df8f14aee746b6cf32ebf7c23fec7
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
---
 src/gui/accessible/qaccessible.h                   | 1 -
 src/gui/accessible/qaccessible2.h                  | 1 -
 src/gui/accessible/qaccessiblebridge.h             | 1 -
 src/gui/accessible/qaccessibleobject.h             | 1 -
 src/gui/accessible/qaccessibleplugin.h             | 1 -
 src/gui/accessible/qplatformaccessibility_qpa.h    | 1 -
 src/gui/image/qbitmap.h                            | 1 -
 src/gui/image/qimage.h                             | 1 -
 src/gui/image/qimageiohandler.h                    | 1 -
 src/gui/image/qimagereader.h                       | 1 -
 src/gui/image/qimagewriter.h                       | 1 -
 src/gui/image/qmovie.h                             | 1 -
 src/gui/image/qpicture.h                           | 1 -
 src/gui/image/qpictureformatplugin.h               | 1 -
 src/gui/image/qpixmap.h                            | 1 -
 src/gui/image/qpixmapcache.h                       | 1 -
 src/gui/image/qplatformpixmap_qpa.h                | 1 -
 src/gui/kernel/qclipboard.h                        | 1 -
 src/gui/kernel/qcursor.h                           | 1 -
 src/gui/kernel/qdrag.h                             | 1 -
 src/gui/kernel/qevent.h                            | 1 -
 src/gui/kernel/qgenericplugin_qpa.h                | 1 -
 src/gui/kernel/qgenericpluginfactory_qpa.h         | 1 -
 src/gui/kernel/qguiapplication.h                   | 1 -
 src/gui/kernel/qguiapplication_p.h                 | 1 -
 src/gui/kernel/qinputpanel.h                       | 1 -
 src/gui/kernel/qkeysequence.h                      | 1 -
 src/gui/kernel/qopenglcontext.h                    | 1 -
 src/gui/kernel/qopenglcontext_p.h                  | 1 -
 src/gui/kernel/qpalette.h                          | 1 -
 src/gui/kernel/qplatformclipboard_qpa.h            | 1 -
 src/gui/kernel/qplatformcursor_qpa.h               | 1 -
 src/gui/kernel/qplatformdrag_qpa.h                 | 1 -
 src/gui/kernel/qplatforminputcontext_qpa.h         | 1 -
 src/gui/kernel/qplatformintegration_qpa.h          | 1 -
 src/gui/kernel/qplatformintegrationfactory_qpa_p.h | 1 -
 src/gui/kernel/qplatformintegrationplugin_qpa.h    | 1 -
 src/gui/kernel/qplatformnativeinterface_qpa.h      | 1 -
 src/gui/kernel/qplatformopenglcontext_qpa.h        | 1 -
 src/gui/kernel/qplatformscreen_qpa.h               | 1 -
 src/gui/kernel/qplatformsurface_qpa.h              | 1 -
 src/gui/kernel/qplatformtheme_qpa.h                | 1 -
 src/gui/kernel/qplatformthemefactory_qpa_p.h       | 1 -
 src/gui/kernel/qplatformthemeplugin_qpa.h          | 1 -
 src/gui/kernel/qplatformwindow_qpa.h               | 1 -
 src/gui/kernel/qscreen.h                           | 1 -
 src/gui/kernel/qsessionmanager.h                   | 1 -
 src/gui/kernel/qstylehints.h                       | 1 -
 src/gui/kernel/qsurface.h                          | 1 -
 src/gui/kernel/qsurfaceformat.h                    | 1 -
 src/gui/kernel/qtouchdevice.h                      | 1 -
 src/gui/kernel/qtouchdevice_p.h                    | 1 -
 src/gui/kernel/qwindow.h                           | 1 -
 src/gui/kernel/qwindow_p.h                         | 1 -
 src/gui/kernel/qwindowdefs.h                       | 1 -
 src/gui/kernel/qwindowdefs_win.h                   | 1 -
 src/gui/kernel/qwindowsysteminterface_qpa.h        | 1 -
 src/gui/math3d/qgenericmatrix.h                    | 1 -
 src/gui/math3d/qmatrix4x4.h                        | 1 -
 src/gui/math3d/qquaternion.h                       | 1 -
 src/gui/math3d/qvector2d.h                         | 1 -
 src/gui/math3d/qvector3d.h                         | 1 -
 src/gui/math3d/qvector4d.h                         | 1 -
 src/gui/opengl/qopengl.h                           | 1 -
 src/gui/opengl/qopenglbuffer.h                     | 1 -
 src/gui/opengl/qopenglcustomshaderstage_p.h        | 1 -
 src/gui/opengl/qopenglengineshadermanager_p.h      | 1 -
 src/gui/opengl/qopenglengineshadersource_p.h       | 1 -
 src/gui/opengl/qopenglextensions_p.h               | 1 -
 src/gui/opengl/qopenglframebufferobject.h          | 1 -
 src/gui/opengl/qopenglfunctions.h                  | 1 -
 src/gui/opengl/qopenglpaintdevice.h                | 1 -
 src/gui/opengl/qopenglshadercache_meego_p.h        | 1 -
 src/gui/opengl/qopenglshadercache_p.h              | 1 -
 src/gui/opengl/qopenglshaderprogram.h              | 1 -
 src/gui/painting/qbackingstore.h                   | 1 -
 src/gui/painting/qbrush.h                          | 1 -
 src/gui/painting/qcolor.h                          | 1 -
 src/gui/painting/qcosmeticstroker_p.h              | 1 -
 src/gui/painting/qemulationpaintengine_p.h         | 1 -
 src/gui/painting/qmatrix.h                         | 1 -
 src/gui/painting/qpagedpaintdevice.h               | 1 -
 src/gui/painting/qpaintdevice.h                    | 1 -
 src/gui/painting/qpaintengine.h                    | 1 -
 src/gui/painting/qpaintengineex_p.h                | 1 -
 src/gui/painting/qpainter.h                        | 1 -
 src/gui/painting/qpainterpath.h                    | 1 -
 src/gui/painting/qpathclipper_p.h                  | 1 -
 src/gui/painting/qpdfwriter.h                      | 1 -
 src/gui/painting/qpen.h                            | 1 -
 src/gui/painting/qplatformbackingstore_qpa.h       | 1 -
 src/gui/painting/qpolygon.h                        | 1 -
 src/gui/painting/qregion.h                         | 1 -
 src/gui/painting/qrgb.h                            | 1 -
 src/gui/painting/qtransform.h                      | 1 -
 src/gui/painting/qvectorpath_p.h                   | 1 -
 src/gui/text/qabstracttextdocumentlayout.h         | 1 -
 src/gui/text/qfont.h                               | 1 -
 src/gui/text/qfontdatabase.h                       | 1 -
 src/gui/text/qfontinfo.h                           | 1 -
 src/gui/text/qfontmetrics.h                        | 1 -
 src/gui/text/qglyphrun.h                           | 1 -
 src/gui/text/qlinecontrol_p.h                      | 1 -
 src/gui/text/qplatformfontdatabase_qpa.h           | 1 -
 src/gui/text/qrawfont.h                            | 1 -
 src/gui/text/qstatictext.h                         | 1 -
 src/gui/text/qsyntaxhighlighter.h                  | 1 -
 src/gui/text/qtextcontrol_p.h                      | 1 -
 src/gui/text/qtextcursor.h                         | 1 -
 src/gui/text/qtextdocument.h                       | 1 -
 src/gui/text/qtextdocumentfragment.h               | 1 -
 src/gui/text/qtextdocumentwriter.h                 | 1 -
 src/gui/text/qtextformat.h                         | 1 -
 src/gui/text/qtextlayout.h                         | 1 -
 src/gui/text/qtextlist.h                           | 1 -
 src/gui/text/qtextobject.h                         | 1 -
 src/gui/text/qtextoption.h                         | 1 -
 src/gui/text/qtexttable.h                          | 1 -
 src/gui/util/qdesktopservices.h                    | 1 -
 src/gui/util/qvalidator.h                          | 1 -
 120 files changed, 120 deletions(-)

(limited to 'src/gui')

diff --git a/src/gui/accessible/qaccessible.h b/src/gui/accessible/qaccessible.h
index e8cdb5501f..5fa6affab9 100644
--- a/src/gui/accessible/qaccessible.h
+++ b/src/gui/accessible/qaccessible.h
@@ -55,7 +55,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Gui)
 
 #ifndef QT_NO_ACCESSIBILITY
 
diff --git a/src/gui/accessible/qaccessible2.h b/src/gui/accessible/qaccessible2.h
index 23a635e2f9..724d52c83b 100644
--- a/src/gui/accessible/qaccessible2.h
+++ b/src/gui/accessible/qaccessible2.h
@@ -49,7 +49,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Gui)
 
 #ifndef QT_NO_ACCESSIBILITY
 
diff --git a/src/gui/accessible/qaccessiblebridge.h b/src/gui/accessible/qaccessiblebridge.h
index a3301247dc..0ed9a2b6c8 100644
--- a/src/gui/accessible/qaccessiblebridge.h
+++ b/src/gui/accessible/qaccessiblebridge.h
@@ -49,7 +49,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Gui)
 
 #ifndef QT_NO_ACCESSIBILITY
 
diff --git a/src/gui/accessible/qaccessibleobject.h b/src/gui/accessible/qaccessibleobject.h
index b2ac6c02e4..80a5c8d0d3 100644
--- a/src/gui/accessible/qaccessibleobject.h
+++ b/src/gui/accessible/qaccessibleobject.h
@@ -49,7 +49,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Gui)
 
 #ifndef QT_NO_ACCESSIBILITY
 
diff --git a/src/gui/accessible/qaccessibleplugin.h b/src/gui/accessible/qaccessibleplugin.h
index 5939c676d0..1b0a66bb9d 100644
--- a/src/gui/accessible/qaccessibleplugin.h
+++ b/src/gui/accessible/qaccessibleplugin.h
@@ -49,7 +49,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Gui)
 
 #ifndef QT_NO_ACCESSIBILITY
 
diff --git a/src/gui/accessible/qplatformaccessibility_qpa.h b/src/gui/accessible/qplatformaccessibility_qpa.h
index a33e205242..25da28ce7c 100644
--- a/src/gui/accessible/qplatformaccessibility_qpa.h
+++ b/src/gui/accessible/qplatformaccessibility_qpa.h
@@ -50,7 +50,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Gui)
 
 class Q_GUI_EXPORT QPlatformAccessibility
 {
diff --git a/src/gui/image/qbitmap.h b/src/gui/image/qbitmap.h
index 2fbc50fb7d..9a03ed5856 100644
--- a/src/gui/image/qbitmap.h
+++ b/src/gui/image/qbitmap.h
@@ -48,7 +48,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Gui)
 
 class QVariant;
 
diff --git a/src/gui/image/qimage.h b/src/gui/image/qimage.h
index 74114847e7..6a4017edb6 100644
--- a/src/gui/image/qimage.h
+++ b/src/gui/image/qimage.h
@@ -57,7 +57,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Gui)
 
 class QIODevice;
 class QStringList;
diff --git a/src/gui/image/qimageiohandler.h b/src/gui/image/qimageiohandler.h
index c69f703890..5d3d55f0dd 100644
--- a/src/gui/image/qimageiohandler.h
+++ b/src/gui/image/qimageiohandler.h
@@ -50,7 +50,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Gui)
 
 class QImage;
 class QRect;
diff --git a/src/gui/image/qimagereader.h b/src/gui/image/qimagereader.h
index e61dfd24db..84fd8949ce 100644
--- a/src/gui/image/qimagereader.h
+++ b/src/gui/image/qimagereader.h
@@ -50,7 +50,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Gui)
 
 class QColor;
 class QIODevice;
diff --git a/src/gui/image/qimagewriter.h b/src/gui/image/qimagewriter.h
index 09a64765a1..0b9b31dd70 100644
--- a/src/gui/image/qimagewriter.h
+++ b/src/gui/image/qimagewriter.h
@@ -50,7 +50,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Gui)
 
 class QIODevice;
 class QImage;
diff --git a/src/gui/image/qmovie.h b/src/gui/image/qmovie.h
index 315e047ea2..94664cfcc5 100644
--- a/src/gui/image/qmovie.h
+++ b/src/gui/image/qmovie.h
@@ -55,7 +55,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Gui)
 
 class QByteArray;
 class QColor;
diff --git a/src/gui/image/qpicture.h b/src/gui/image/qpicture.h
index e6819c8fd3..a4dfbf1d73 100644
--- a/src/gui/image/qpicture.h
+++ b/src/gui/image/qpicture.h
@@ -50,7 +50,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Gui)
 
 #ifndef QT_NO_PICTURE
 
diff --git a/src/gui/image/qpictureformatplugin.h b/src/gui/image/qpictureformatplugin.h
index 135ec23b52..6e9fdc275b 100644
--- a/src/gui/image/qpictureformatplugin.h
+++ b/src/gui/image/qpictureformatplugin.h
@@ -49,7 +49,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Gui)
 
 #if !defined(QT_NO_LIBRARY) && !defined(QT_NO_PICTURE)
 
diff --git a/src/gui/image/qpixmap.h b/src/gui/image/qpixmap.h
index 7f0e81013c..0172f790b5 100644
--- a/src/gui/image/qpixmap.h
+++ b/src/gui/image/qpixmap.h
@@ -54,7 +54,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Gui)
 
 class QImageWriter;
 class QImageReader;
diff --git a/src/gui/image/qpixmapcache.h b/src/gui/image/qpixmapcache.h
index a8b2349786..cb95a17d47 100644
--- a/src/gui/image/qpixmapcache.h
+++ b/src/gui/image/qpixmapcache.h
@@ -52,7 +52,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Gui)
 
 class Q_GUI_EXPORT QPixmapCache
 {
diff --git a/src/gui/image/qplatformpixmap_qpa.h b/src/gui/image/qplatformpixmap_qpa.h
index 948891bbfb..944d358a30 100644
--- a/src/gui/image/qplatformpixmap_qpa.h
+++ b/src/gui/image/qplatformpixmap_qpa.h
@@ -60,7 +60,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Gui)
 
 class QImageReader;
 
diff --git a/src/gui/kernel/qclipboard.h b/src/gui/kernel/qclipboard.h
index 29d838a667..9d0832c838 100644
--- a/src/gui/kernel/qclipboard.h
+++ b/src/gui/kernel/qclipboard.h
@@ -48,7 +48,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Gui)
 
 #ifndef QT_NO_CLIPBOARD
 
diff --git a/src/gui/kernel/qcursor.h b/src/gui/kernel/qcursor.h
index 49b13f3165..07b38f8c35 100644
--- a/src/gui/kernel/qcursor.h
+++ b/src/gui/kernel/qcursor.h
@@ -49,7 +49,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Gui)
 
 class QVariant;
 
diff --git a/src/gui/kernel/qdrag.h b/src/gui/kernel/qdrag.h
index c857924457..5be096bea0 100644
--- a/src/gui/kernel/qdrag.h
+++ b/src/gui/kernel/qdrag.h
@@ -48,7 +48,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Gui)
 
 #ifndef QT_NO_DRAGANDDROP
 class QMimeData;
diff --git a/src/gui/kernel/qevent.h b/src/gui/kernel/qevent.h
index 8f0d76a58d..101f580e2d 100644
--- a/src/gui/kernel/qevent.h
+++ b/src/gui/kernel/qevent.h
@@ -61,7 +61,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Gui)
 
 class QAction;
 #ifndef QT_NO_GESTURES
diff --git a/src/gui/kernel/qgenericplugin_qpa.h b/src/gui/kernel/qgenericplugin_qpa.h
index a6b368c078..3aa22fe595 100644
--- a/src/gui/kernel/qgenericplugin_qpa.h
+++ b/src/gui/kernel/qgenericplugin_qpa.h
@@ -49,7 +49,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Gui)
 
 #ifndef QT_NO_LIBRARY
 
diff --git a/src/gui/kernel/qgenericpluginfactory_qpa.h b/src/gui/kernel/qgenericpluginfactory_qpa.h
index 2e9522187d..79fdd569d3 100644
--- a/src/gui/kernel/qgenericpluginfactory_qpa.h
+++ b/src/gui/kernel/qgenericpluginfactory_qpa.h
@@ -48,7 +48,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Gui)
 
 class QString;
 class QObject;
diff --git a/src/gui/kernel/qguiapplication.h b/src/gui/kernel/qguiapplication.h
index 724f9af6cb..e06df1de58 100644
--- a/src/gui/kernel/qguiapplication.h
+++ b/src/gui/kernel/qguiapplication.h
@@ -52,7 +52,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Gui)
 
 class QGuiApplicationPrivate;
 class QPlatformNativeInterface;
diff --git a/src/gui/kernel/qguiapplication_p.h b/src/gui/kernel/qguiapplication_p.h
index 7881d8a955..d771b55a4f 100644
--- a/src/gui/kernel/qguiapplication_p.h
+++ b/src/gui/kernel/qguiapplication_p.h
@@ -59,7 +59,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Gui)
 
 class Q_GUI_EXPORT QGuiApplicationPrivate : public QCoreApplicationPrivate
 {
diff --git a/src/gui/kernel/qinputpanel.h b/src/gui/kernel/qinputpanel.h
index ccdf77b221..5cfe75d030 100644
--- a/src/gui/kernel/qinputpanel.h
+++ b/src/gui/kernel/qinputpanel.h
@@ -48,7 +48,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Gui)
 
 class QInputPanelPrivate;
 class QWindow;
diff --git a/src/gui/kernel/qkeysequence.h b/src/gui/kernel/qkeysequence.h
index 3768929941..8f1a5eb36b 100644
--- a/src/gui/kernel/qkeysequence.h
+++ b/src/gui/kernel/qkeysequence.h
@@ -49,7 +49,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Gui)
 
 #ifndef QT_NO_SHORTCUT
 
diff --git a/src/gui/kernel/qopenglcontext.h b/src/gui/kernel/qopenglcontext.h
index 29fed4400c..2d86a6db31 100644
--- a/src/gui/kernel/qopenglcontext.h
+++ b/src/gui/kernel/qopenglcontext.h
@@ -54,7 +54,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Gui)
 
 class QOpenGLContextPrivate;
 class QOpenGLContextGroupPrivate;
diff --git a/src/gui/kernel/qopenglcontext_p.h b/src/gui/kernel/qopenglcontext_p.h
index 09cfbb2b4f..bd5fae989b 100644
--- a/src/gui/kernel/qopenglcontext_p.h
+++ b/src/gui/kernel/qopenglcontext_p.h
@@ -51,7 +51,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Gui)
 
 class QOpenGLFunctions;
 class QOpenGLContext;
diff --git a/src/gui/kernel/qpalette.h b/src/gui/kernel/qpalette.h
index 61d521a052..e2ebb3e312 100644
--- a/src/gui/kernel/qpalette.h
+++ b/src/gui/kernel/qpalette.h
@@ -50,7 +50,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Gui)
 
 class QPalettePrivate;
 class QVariant;
diff --git a/src/gui/kernel/qplatformclipboard_qpa.h b/src/gui/kernel/qplatformclipboard_qpa.h
index 18c2dc4ace..d7e86d1606 100644
--- a/src/gui/kernel/qplatformclipboard_qpa.h
+++ b/src/gui/kernel/qplatformclipboard_qpa.h
@@ -52,7 +52,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Gui)
 
 class Q_GUI_EXPORT QPlatformClipboard
 {
diff --git a/src/gui/kernel/qplatformcursor_qpa.h b/src/gui/kernel/qplatformcursor_qpa.h
index 2f1e8e0e4a..446eddc7d7 100644
--- a/src/gui/kernel/qplatformcursor_qpa.h
+++ b/src/gui/kernel/qplatformcursor_qpa.h
@@ -53,7 +53,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Gui)
 
 // Cursor graphics management
 class Q_GUI_EXPORT QPlatformCursorImage {
diff --git a/src/gui/kernel/qplatformdrag_qpa.h b/src/gui/kernel/qplatformdrag_qpa.h
index 3670005d28..caab8f107f 100644
--- a/src/gui/kernel/qplatformdrag_qpa.h
+++ b/src/gui/kernel/qplatformdrag_qpa.h
@@ -48,7 +48,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Gui)
 
 class QMimeData;
 class QMouseEvent;
diff --git a/src/gui/kernel/qplatforminputcontext_qpa.h b/src/gui/kernel/qplatforminputcontext_qpa.h
index 6d90d29eef..4571c28ea4 100644
--- a/src/gui/kernel/qplatforminputcontext_qpa.h
+++ b/src/gui/kernel/qplatforminputcontext_qpa.h
@@ -48,7 +48,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Gui)
 
 class QWindow;
 class QMouseEvent;
diff --git a/src/gui/kernel/qplatformintegration_qpa.h b/src/gui/kernel/qplatformintegration_qpa.h
index b8ff655534..fc1a59daa3 100644
--- a/src/gui/kernel/qplatformintegration_qpa.h
+++ b/src/gui/kernel/qplatformintegration_qpa.h
@@ -50,7 +50,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Gui)
 
 class QPlatformWindow;
 class QWindow;
diff --git a/src/gui/kernel/qplatformintegrationfactory_qpa_p.h b/src/gui/kernel/qplatformintegrationfactory_qpa_p.h
index b2f35a440d..370d7f0bb2 100644
--- a/src/gui/kernel/qplatformintegrationfactory_qpa_p.h
+++ b/src/gui/kernel/qplatformintegrationfactory_qpa_p.h
@@ -59,7 +59,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Gui)
 
 class QPlatformIntegration;
 
diff --git a/src/gui/kernel/qplatformintegrationplugin_qpa.h b/src/gui/kernel/qplatformintegrationplugin_qpa.h
index 754597b0ac..f10e07d5f1 100644
--- a/src/gui/kernel/qplatformintegrationplugin_qpa.h
+++ b/src/gui/kernel/qplatformintegrationplugin_qpa.h
@@ -60,7 +60,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Gui)
 
 class QPlatformIntegration;
 
diff --git a/src/gui/kernel/qplatformnativeinterface_qpa.h b/src/gui/kernel/qplatformnativeinterface_qpa.h
index 178a1626a5..c168e38359 100644
--- a/src/gui/kernel/qplatformnativeinterface_qpa.h
+++ b/src/gui/kernel/qplatformnativeinterface_qpa.h
@@ -50,7 +50,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Gui)
 
 class QOpenGLContext;
 class QWindow;
diff --git a/src/gui/kernel/qplatformopenglcontext_qpa.h b/src/gui/kernel/qplatformopenglcontext_qpa.h
index 9a8edd2778..772fbdf06f 100644
--- a/src/gui/kernel/qplatformopenglcontext_qpa.h
+++ b/src/gui/kernel/qplatformopenglcontext_qpa.h
@@ -50,7 +50,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Gui)
 
 class QPlatformOpenGLContextPrivate;
 
diff --git a/src/gui/kernel/qplatformscreen_qpa.h b/src/gui/kernel/qplatformscreen_qpa.h
index 04cc2ccc39..cf7150c888 100644
--- a/src/gui/kernel/qplatformscreen_qpa.h
+++ b/src/gui/kernel/qplatformscreen_qpa.h
@@ -58,7 +58,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Gui)
 
 class QPlatformBackingStore;
 class QPlatformOpenGLContext;
diff --git a/src/gui/kernel/qplatformsurface_qpa.h b/src/gui/kernel/qplatformsurface_qpa.h
index ad7c95a11e..b249362978 100644
--- a/src/gui/kernel/qplatformsurface_qpa.h
+++ b/src/gui/kernel/qplatformsurface_qpa.h
@@ -50,7 +50,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Gui)
 
 class Q_GUI_EXPORT QPlatformSurface
 {
diff --git a/src/gui/kernel/qplatformtheme_qpa.h b/src/gui/kernel/qplatformtheme_qpa.h
index 67720c2028..42151a1270 100644
--- a/src/gui/kernel/qplatformtheme_qpa.h
+++ b/src/gui/kernel/qplatformtheme_qpa.h
@@ -48,7 +48,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Gui)
 
 class QMenu;
 class QMenuBar;
diff --git a/src/gui/kernel/qplatformthemefactory_qpa_p.h b/src/gui/kernel/qplatformthemefactory_qpa_p.h
index 53243f3cdf..606cd27511 100644
--- a/src/gui/kernel/qplatformthemefactory_qpa_p.h
+++ b/src/gui/kernel/qplatformthemefactory_qpa_p.h
@@ -59,7 +59,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Gui)
 
 class QPlatformTheme;
 
diff --git a/src/gui/kernel/qplatformthemeplugin_qpa.h b/src/gui/kernel/qplatformthemeplugin_qpa.h
index 497afe6238..d6299e642f 100644
--- a/src/gui/kernel/qplatformthemeplugin_qpa.h
+++ b/src/gui/kernel/qplatformthemeplugin_qpa.h
@@ -60,7 +60,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Gui)
 
 class QPlatformTheme;
 
diff --git a/src/gui/kernel/qplatformwindow_qpa.h b/src/gui/kernel/qplatformwindow_qpa.h
index de5c955eba..760b6ea08a 100644
--- a/src/gui/kernel/qplatformwindow_qpa.h
+++ b/src/gui/kernel/qplatformwindow_qpa.h
@@ -54,7 +54,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Gui)
 
 class QPlatformScreen;
 class QPlatformWindowPrivate;
diff --git a/src/gui/kernel/qscreen.h b/src/gui/kernel/qscreen.h
index aa3d750b41..a6b6b39f61 100644
--- a/src/gui/kernel/qscreen.h
+++ b/src/gui/kernel/qscreen.h
@@ -56,7 +56,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Gui)
 
 class QPlatformScreen;
 class QScreenPrivate;
diff --git a/src/gui/kernel/qsessionmanager.h b/src/gui/kernel/qsessionmanager.h
index a36e592e16..cfaef9d520 100644
--- a/src/gui/kernel/qsessionmanager.h
+++ b/src/gui/kernel/qsessionmanager.h
@@ -53,7 +53,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Gui)
 
 class QGuiApplication;
 
diff --git a/src/gui/kernel/qstylehints.h b/src/gui/kernel/qstylehints.h
index 0be4501671..58d6bcd1ca 100644
--- a/src/gui/kernel/qstylehints.h
+++ b/src/gui/kernel/qstylehints.h
@@ -48,7 +48,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Gui)
 
 class QPlatformIntegration;
 
diff --git a/src/gui/kernel/qsurface.h b/src/gui/kernel/qsurface.h
index 82947305fa..e260c744bf 100644
--- a/src/gui/kernel/qsurface.h
+++ b/src/gui/kernel/qsurface.h
@@ -49,7 +49,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Gui)
 
 class QPlatformSurface;
 
diff --git a/src/gui/kernel/qsurfaceformat.h b/src/gui/kernel/qsurfaceformat.h
index c88d54ee11..55f07ce6dc 100644
--- a/src/gui/kernel/qsurfaceformat.h
+++ b/src/gui/kernel/qsurfaceformat.h
@@ -47,7 +47,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Gui)
 
 class QOpenGLContext;
 class QSurfaceFormatPrivate;
diff --git a/src/gui/kernel/qtouchdevice.h b/src/gui/kernel/qtouchdevice.h
index c589d4443e..03e592a16d 100644
--- a/src/gui/kernel/qtouchdevice.h
+++ b/src/gui/kernel/qtouchdevice.h
@@ -48,7 +48,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Gui)
 
 class QTouchDevicePrivate;
 
diff --git a/src/gui/kernel/qtouchdevice_p.h b/src/gui/kernel/qtouchdevice_p.h
index 3bdaf521cd..ac6e1fa2aa 100644
--- a/src/gui/kernel/qtouchdevice_p.h
+++ b/src/gui/kernel/qtouchdevice_p.h
@@ -49,7 +49,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Gui)
 
 class QTouchDevicePrivate
 {
diff --git a/src/gui/kernel/qwindow.h b/src/gui/kernel/qwindow.h
index 088192d714..1de5105b1c 100644
--- a/src/gui/kernel/qwindow.h
+++ b/src/gui/kernel/qwindow.h
@@ -57,7 +57,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Gui)
 
 class QWindowPrivate;
 
diff --git a/src/gui/kernel/qwindow_p.h b/src/gui/kernel/qwindow_p.h
index 2e28205f86..6313f01f80 100644
--- a/src/gui/kernel/qwindow_p.h
+++ b/src/gui/kernel/qwindow_p.h
@@ -51,7 +51,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Gui)
 
 #define QWINDOWSIZE_MAX ((1<<24)-1)
 
diff --git a/src/gui/kernel/qwindowdefs.h b/src/gui/kernel/qwindowdefs.h
index 907340cc60..a6f8b9c688 100644
--- a/src/gui/kernel/qwindowdefs.h
+++ b/src/gui/kernel/qwindowdefs.h
@@ -48,7 +48,6 @@
 QT_BEGIN_HEADER
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Gui)
 
 // Class forward definitions
 
diff --git a/src/gui/kernel/qwindowdefs_win.h b/src/gui/kernel/qwindowdefs_win.h
index 4b242abba5..624955aa3e 100644
--- a/src/gui/kernel/qwindowdefs_win.h
+++ b/src/gui/kernel/qwindowdefs_win.h
@@ -48,7 +48,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Gui)
 
 QT_END_NAMESPACE
 
diff --git a/src/gui/kernel/qwindowsysteminterface_qpa.h b/src/gui/kernel/qwindowsysteminterface_qpa.h
index 43ce4c8585..059a170baa 100644
--- a/src/gui/kernel/qwindowsysteminterface_qpa.h
+++ b/src/gui/kernel/qwindowsysteminterface_qpa.h
@@ -60,7 +60,6 @@ QT_BEGIN_NAMESPACE
 class QMimeData;
 class QTouchDevice;
 
-QT_MODULE(Gui)
 
 class Q_GUI_EXPORT QWindowSystemInterface
 {
diff --git a/src/gui/math3d/qgenericmatrix.h b/src/gui/math3d/qgenericmatrix.h
index d771636da7..ffceefba53 100644
--- a/src/gui/math3d/qgenericmatrix.h
+++ b/src/gui/math3d/qgenericmatrix.h
@@ -50,7 +50,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Gui)
 
 template <int N, int M, typename T>
 class QGenericMatrix
diff --git a/src/gui/math3d/qmatrix4x4.h b/src/gui/math3d/qmatrix4x4.h
index 4e6d578f2a..648afe3428 100644
--- a/src/gui/math3d/qmatrix4x4.h
+++ b/src/gui/math3d/qmatrix4x4.h
@@ -52,7 +52,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Gui)
 
 #ifndef QT_NO_MATRIX4X4
 
diff --git a/src/gui/math3d/qquaternion.h b/src/gui/math3d/qquaternion.h
index 95fe6185f7..c066d1f5a8 100644
--- a/src/gui/math3d/qquaternion.h
+++ b/src/gui/math3d/qquaternion.h
@@ -49,7 +49,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Gui)
 
 #ifndef QT_NO_QUATERNION
 
diff --git a/src/gui/math3d/qvector2d.h b/src/gui/math3d/qvector2d.h
index c86d300e2b..4ac14afe2e 100644
--- a/src/gui/math3d/qvector2d.h
+++ b/src/gui/math3d/qvector2d.h
@@ -49,7 +49,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Gui)
 
 class QVector3D;
 class QVector4D;
diff --git a/src/gui/math3d/qvector3d.h b/src/gui/math3d/qvector3d.h
index 692d7f8b0c..46a48fd952 100644
--- a/src/gui/math3d/qvector3d.h
+++ b/src/gui/math3d/qvector3d.h
@@ -49,7 +49,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Gui)
 
 class QMatrix4x4;
 class QVector2D;
diff --git a/src/gui/math3d/qvector4d.h b/src/gui/math3d/qvector4d.h
index f7d5952b47..d12f7a9551 100644
--- a/src/gui/math3d/qvector4d.h
+++ b/src/gui/math3d/qvector4d.h
@@ -49,7 +49,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Gui)
 
 class QMatrix4x4;
 class QVector2D;
diff --git a/src/gui/opengl/qopengl.h b/src/gui/opengl/qopengl.h
index c108d2f6b0..843a758514 100644
--- a/src/gui/opengl/qopengl.h
+++ b/src/gui/opengl/qopengl.h
@@ -75,7 +75,6 @@ typedef GLfloat GLdouble;
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Gui)
 
 QT_END_NAMESPACE
 
diff --git a/src/gui/opengl/qopenglbuffer.h b/src/gui/opengl/qopenglbuffer.h
index d76eb47be9..1c7b8c1024 100644
--- a/src/gui/opengl/qopenglbuffer.h
+++ b/src/gui/opengl/qopenglbuffer.h
@@ -51,7 +51,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Gui)
 
 class QOpenGLBufferPrivate;
 
diff --git a/src/gui/opengl/qopenglcustomshaderstage_p.h b/src/gui/opengl/qopenglcustomshaderstage_p.h
index 4f8626da26..d800cc4416 100644
--- a/src/gui/opengl/qopenglcustomshaderstage_p.h
+++ b/src/gui/opengl/qopenglcustomshaderstage_p.h
@@ -59,7 +59,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Gui)
 
 class QPainter;
 class QOpenGLCustomShaderStagePrivate;
diff --git a/src/gui/opengl/qopenglengineshadermanager_p.h b/src/gui/opengl/qopenglengineshadermanager_p.h
index c4faceb7bf..0c91579ed5 100644
--- a/src/gui/opengl/qopenglengineshadermanager_p.h
+++ b/src/gui/opengl/qopenglengineshadermanager_p.h
@@ -232,7 +232,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Gui)
 
 
 /*
diff --git a/src/gui/opengl/qopenglengineshadersource_p.h b/src/gui/opengl/qopenglengineshadersource_p.h
index fb27f7b91d..59bf34e9aa 100644
--- a/src/gui/opengl/qopenglengineshadersource_p.h
+++ b/src/gui/opengl/qopenglengineshadersource_p.h
@@ -60,7 +60,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Gui)
 
 
 static const char* const qopenglslMainVertexShader = "\n\
diff --git a/src/gui/opengl/qopenglextensions_p.h b/src/gui/opengl/qopenglextensions_p.h
index bcc650a5fe..bd413f7002 100644
--- a/src/gui/opengl/qopenglextensions_p.h
+++ b/src/gui/opengl/qopenglextensions_p.h
@@ -59,7 +59,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Gui)
 
 #if 0
 #ifndef GL_ARB_vertex_buffer_object
diff --git a/src/gui/opengl/qopenglframebufferobject.h b/src/gui/opengl/qopenglframebufferobject.h
index c1c6a71b3c..28b2f8240a 100644
--- a/src/gui/opengl/qopenglframebufferobject.h
+++ b/src/gui/opengl/qopenglframebufferobject.h
@@ -53,7 +53,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Gui)
 
 class QOpenGLFramebufferObjectPrivate;
 class QOpenGLFramebufferObjectFormat;
diff --git a/src/gui/opengl/qopenglfunctions.h b/src/gui/opengl/qopenglfunctions.h
index 8d1b4abec5..99b35a3a93 100644
--- a/src/gui/opengl/qopenglfunctions.h
+++ b/src/gui/opengl/qopenglfunctions.h
@@ -73,7 +73,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Gui)
 
 // Types that aren't defined in all system's gl.h files.
 typedef ptrdiff_t qopengl_GLintptr;
diff --git a/src/gui/opengl/qopenglpaintdevice.h b/src/gui/opengl/qopenglpaintdevice.h
index 7738f6bb2e..e9259d9b2a 100644
--- a/src/gui/opengl/qopenglpaintdevice.h
+++ b/src/gui/opengl/qopenglpaintdevice.h
@@ -64,7 +64,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Gui)
 
 class QOpenGLPaintDevicePrivate;
 
diff --git a/src/gui/opengl/qopenglshadercache_meego_p.h b/src/gui/opengl/qopenglshadercache_meego_p.h
index c0acedd53c..404dcb1128 100644
--- a/src/gui/opengl/qopenglshadercache_meego_p.h
+++ b/src/gui/opengl/qopenglshadercache_meego_p.h
@@ -400,7 +400,6 @@ static bool qt_cache_shader(const QOpenGLShaderProgram *shader, QOpenGLContext *
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Gui)
 
 class CachedShader
 {
diff --git a/src/gui/opengl/qopenglshadercache_p.h b/src/gui/opengl/qopenglshadercache_p.h
index 9ea796059e..69b5f4eae7 100644
--- a/src/gui/opengl/qopenglshadercache_p.h
+++ b/src/gui/opengl/qopenglshadercache_p.h
@@ -63,7 +63,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Gui)
 
 class QOpenGLShaderProgram;
 class QOpenGLContext;
diff --git a/src/gui/opengl/qopenglshaderprogram.h b/src/gui/opengl/qopenglshaderprogram.h
index e9214dab56..d4d6f54844 100644
--- a/src/gui/opengl/qopenglshaderprogram.h
+++ b/src/gui/opengl/qopenglshaderprogram.h
@@ -54,7 +54,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Gui)
 
 class QOpenGLContext;
 class QOpenGLShaderProgram;
diff --git a/src/gui/painting/qbackingstore.h b/src/gui/painting/qbackingstore.h
index 2e5d94a493..931b4374f3 100644
--- a/src/gui/painting/qbackingstore.h
+++ b/src/gui/painting/qbackingstore.h
@@ -51,7 +51,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Gui)
 
 class QRegion;
 class QRect;
diff --git a/src/gui/painting/qbrush.h b/src/gui/painting/qbrush.h
index bc6a1377b0..823f52b898 100644
--- a/src/gui/painting/qbrush.h
+++ b/src/gui/painting/qbrush.h
@@ -65,7 +65,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Gui)
 
 struct QBrushData;
 class QPixmap;
diff --git a/src/gui/painting/qcolor.h b/src/gui/painting/qcolor.h
index 94b557dd23..897a7a83b3 100644
--- a/src/gui/painting/qcolor.h
+++ b/src/gui/painting/qcolor.h
@@ -50,7 +50,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Gui)
 
 class QColor;
 class QColormap;
diff --git a/src/gui/painting/qcosmeticstroker_p.h b/src/gui/painting/qcosmeticstroker_p.h
index a4ef52700f..d756304e45 100644
--- a/src/gui/painting/qcosmeticstroker_p.h
+++ b/src/gui/painting/qcosmeticstroker_p.h
@@ -51,7 +51,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Gui)
 
 class QCosmeticStroker;
 
diff --git a/src/gui/painting/qemulationpaintengine_p.h b/src/gui/painting/qemulationpaintengine_p.h
index e206b2b209..f5c6cbb7c8 100644
--- a/src/gui/painting/qemulationpaintengine_p.h
+++ b/src/gui/painting/qemulationpaintengine_p.h
@@ -59,7 +59,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Gui)
 
 class QEmulationPaintEngine : public QPaintEngineEx
 {
diff --git a/src/gui/painting/qmatrix.h b/src/gui/painting/qmatrix.h
index a3fadd371e..633ece8750 100644
--- a/src/gui/painting/qmatrix.h
+++ b/src/gui/painting/qmatrix.h
@@ -53,7 +53,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Gui)
 
 class QPainterPath;
 class QVariant;
diff --git a/src/gui/painting/qpagedpaintdevice.h b/src/gui/painting/qpagedpaintdevice.h
index ffc93146fe..16f4df2d39 100644
--- a/src/gui/painting/qpagedpaintdevice.h
+++ b/src/gui/painting/qpagedpaintdevice.h
@@ -48,7 +48,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Gui)
 
 class QPagedPaintDevicePrivate;
 
diff --git a/src/gui/painting/qpaintdevice.h b/src/gui/painting/qpaintdevice.h
index 1ace6242c8..e933a661e9 100644
--- a/src/gui/painting/qpaintdevice.h
+++ b/src/gui/painting/qpaintdevice.h
@@ -49,7 +49,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Gui)
 
 
 class QPaintEngine;
diff --git a/src/gui/painting/qpaintengine.h b/src/gui/painting/qpaintengine.h
index 3d901d5ec7..c198c4f286 100644
--- a/src/gui/painting/qpaintengine.h
+++ b/src/gui/painting/qpaintengine.h
@@ -51,7 +51,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Gui)
 
 class QFontEngine;
 class QLineF;
diff --git a/src/gui/painting/qpaintengineex_p.h b/src/gui/painting/qpaintengineex_p.h
index 9234631c7c..b463f37753 100644
--- a/src/gui/painting/qpaintengineex_p.h
+++ b/src/gui/painting/qpaintengineex_p.h
@@ -65,7 +65,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Gui)
 
 class QPainterState;
 class QPaintEngineExPrivate;
diff --git a/src/gui/painting/qpainter.h b/src/gui/painting/qpainter.h
index 36f4f34b34..09df0755f2 100644
--- a/src/gui/painting/qpainter.h
+++ b/src/gui/painting/qpainter.h
@@ -64,7 +64,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Gui)
 
 class QBrush;
 class QFontInfo;
diff --git a/src/gui/painting/qpainterpath.h b/src/gui/painting/qpainterpath.h
index 935e0cdd7e..309d821d60 100644
--- a/src/gui/painting/qpainterpath.h
+++ b/src/gui/painting/qpainterpath.h
@@ -53,7 +53,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Gui)
 
 class QFont;
 class QPainterPathPrivate;
diff --git a/src/gui/painting/qpathclipper_p.h b/src/gui/painting/qpathclipper_p.h
index 45854f1d33..b28d2a5c6e 100644
--- a/src/gui/painting/qpathclipper_p.h
+++ b/src/gui/painting/qpathclipper_p.h
@@ -64,7 +64,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Gui)
 
 class QWingedEdge;
 
diff --git a/src/gui/painting/qpdfwriter.h b/src/gui/painting/qpdfwriter.h
index 00bc13727b..6d899cb752 100644
--- a/src/gui/painting/qpdfwriter.h
+++ b/src/gui/painting/qpdfwriter.h
@@ -49,7 +49,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Gui)
 
 class QIODevice;
 class QPdfWriterPrivate;
diff --git a/src/gui/painting/qpen.h b/src/gui/painting/qpen.h
index b48b95b4a4..aeed33a2b0 100644
--- a/src/gui/painting/qpen.h
+++ b/src/gui/painting/qpen.h
@@ -49,7 +49,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Gui)
 
 class QVariant;
 class QPenPrivate;
diff --git a/src/gui/painting/qplatformbackingstore_qpa.h b/src/gui/painting/qplatformbackingstore_qpa.h
index 78b98a698f..01393fa7ae 100644
--- a/src/gui/painting/qplatformbackingstore_qpa.h
+++ b/src/gui/painting/qplatformbackingstore_qpa.h
@@ -51,7 +51,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Gui)
 
 class QRegion;
 class QRect;
diff --git a/src/gui/painting/qpolygon.h b/src/gui/painting/qpolygon.h
index fa0a13c06b..3d0dc46163 100644
--- a/src/gui/painting/qpolygon.h
+++ b/src/gui/painting/qpolygon.h
@@ -50,7 +50,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Gui)
 
 class QMatrix;
 class QTransform;
diff --git a/src/gui/painting/qregion.h b/src/gui/painting/qregion.h
index f55bf72813..344f335398 100644
--- a/src/gui/painting/qregion.h
+++ b/src/gui/painting/qregion.h
@@ -54,7 +54,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Gui)
 
 template <class T> class QVector;
 class QVariant;
diff --git a/src/gui/painting/qrgb.h b/src/gui/painting/qrgb.h
index b8d4e2340c..58ba909c05 100644
--- a/src/gui/painting/qrgb.h
+++ b/src/gui/painting/qrgb.h
@@ -48,7 +48,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Gui)
 
 typedef unsigned int QRgb;                        // RGB triplet
 
diff --git a/src/gui/painting/qtransform.h b/src/gui/painting/qtransform.h
index 93ab2fbba3..2e05c0c0dc 100644
--- a/src/gui/painting/qtransform.h
+++ b/src/gui/painting/qtransform.h
@@ -58,7 +58,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Gui)
 
 class QVariant;
 
diff --git a/src/gui/painting/qvectorpath_p.h b/src/gui/painting/qvectorpath_p.h
index f478a7751c..332175d65a 100644
--- a/src/gui/painting/qvectorpath_p.h
+++ b/src/gui/painting/qvectorpath_p.h
@@ -64,7 +64,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Gui)
 
 class QPaintEngineEx;
 
diff --git a/src/gui/text/qabstracttextdocumentlayout.h b/src/gui/text/qabstracttextdocumentlayout.h
index 15a503cc58..9014775331 100644
--- a/src/gui/text/qabstracttextdocumentlayout.h
+++ b/src/gui/text/qabstracttextdocumentlayout.h
@@ -52,7 +52,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Gui)
 
 class QAbstractTextDocumentLayoutPrivate;
 class QTextBlock;
diff --git a/src/gui/text/qfont.h b/src/gui/text/qfont.h
index 4b1fd27a48..2c4511bd22 100644
--- a/src/gui/text/qfont.h
+++ b/src/gui/text/qfont.h
@@ -51,7 +51,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Gui)
 
 class QFontPrivate;                                     /* don't touch */
 class QStringList;
diff --git a/src/gui/text/qfontdatabase.h b/src/gui/text/qfontdatabase.h
index 9df8d8f323..c627c56e4f 100644
--- a/src/gui/text/qfontdatabase.h
+++ b/src/gui/text/qfontdatabase.h
@@ -52,7 +52,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Gui)
 
 class QStringList;
 template <class T> class QList;
diff --git a/src/gui/text/qfontinfo.h b/src/gui/text/qfontinfo.h
index f900eb719f..9a463e4143 100644
--- a/src/gui/text/qfontinfo.h
+++ b/src/gui/text/qfontinfo.h
@@ -49,7 +49,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Gui)
 
 class Q_GUI_EXPORT QFontInfo
 {
diff --git a/src/gui/text/qfontmetrics.h b/src/gui/text/qfontmetrics.h
index b19e94ba4b..a7451d9481 100644
--- a/src/gui/text/qfontmetrics.h
+++ b/src/gui/text/qfontmetrics.h
@@ -52,7 +52,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Gui)
 
 
 class QTextCodec;
diff --git a/src/gui/text/qglyphrun.h b/src/gui/text/qglyphrun.h
index 0e3c24c6ee..f2a17b9884 100644
--- a/src/gui/text/qglyphrun.h
+++ b/src/gui/text/qglyphrun.h
@@ -53,7 +53,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Gui)
 
 class QGlyphRunPrivate;
 class Q_GUI_EXPORT QGlyphRun
diff --git a/src/gui/text/qlinecontrol_p.h b/src/gui/text/qlinecontrol_p.h
index 323b35020a..4c97acca0c 100644
--- a/src/gui/text/qlinecontrol_p.h
+++ b/src/gui/text/qlinecontrol_p.h
@@ -68,7 +68,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Gui)
 
 class Q_GUI_EXPORT QLineControl : public QObject
 {
diff --git a/src/gui/text/qplatformfontdatabase_qpa.h b/src/gui/text/qplatformfontdatabase_qpa.h
index ab31f55c55..0f24b0e4b8 100644
--- a/src/gui/text/qplatformfontdatabase_qpa.h
+++ b/src/gui/text/qplatformfontdatabase_qpa.h
@@ -54,7 +54,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Gui)
 
 class QWritingSystemsPrivate;
 
diff --git a/src/gui/text/qrawfont.h b/src/gui/text/qrawfont.h
index 4402d88cc5..0a6c09cf54 100644
--- a/src/gui/text/qrawfont.h
+++ b/src/gui/text/qrawfont.h
@@ -57,7 +57,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Gui)
 
 class QRawFontPrivate;
 class Q_GUI_EXPORT QRawFont
diff --git a/src/gui/text/qstatictext.h b/src/gui/text/qstatictext.h
index 631e9ea031..40c32f382d 100644
--- a/src/gui/text/qstatictext.h
+++ b/src/gui/text/qstatictext.h
@@ -54,7 +54,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Gui)
 
 class QStaticTextPrivate;
 class Q_GUI_EXPORT QStaticText
diff --git a/src/gui/text/qsyntaxhighlighter.h b/src/gui/text/qsyntaxhighlighter.h
index 278a9ec74b..c5f0f1c96c 100644
--- a/src/gui/text/qsyntaxhighlighter.h
+++ b/src/gui/text/qsyntaxhighlighter.h
@@ -53,7 +53,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Gui)
 
 class QTextDocument;
 class QSyntaxHighlighterPrivate;
diff --git a/src/gui/text/qtextcontrol_p.h b/src/gui/text/qtextcontrol_p.h
index fbcbd7f729..dc8631ffa4 100644
--- a/src/gui/text/qtextcontrol_p.h
+++ b/src/gui/text/qtextcontrol_p.h
@@ -67,7 +67,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Gui)
 
 class QStyleSheet;
 class QTextDocument;
diff --git a/src/gui/text/qtextcursor.h b/src/gui/text/qtextcursor.h
index b64bbf76d7..efada98ab7 100644
--- a/src/gui/text/qtextcursor.h
+++ b/src/gui/text/qtextcursor.h
@@ -50,7 +50,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Gui)
 
 class QTextDocument;
 class QTextCursorPrivate;
diff --git a/src/gui/text/qtextdocument.h b/src/gui/text/qtextdocument.h
index 7ecbe78309..fddcb7f194 100644
--- a/src/gui/text/qtextdocument.h
+++ b/src/gui/text/qtextdocument.h
@@ -51,7 +51,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Gui)
 
 class QTextFormatCollection;
 class QTextListFormat;
diff --git a/src/gui/text/qtextdocumentfragment.h b/src/gui/text/qtextdocumentfragment.h
index ef5372bac8..b3241b799f 100644
--- a/src/gui/text/qtextdocumentfragment.h
+++ b/src/gui/text/qtextdocumentfragment.h
@@ -48,7 +48,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Gui)
 
 class QTextStream;
 class QTextDocument;
diff --git a/src/gui/text/qtextdocumentwriter.h b/src/gui/text/qtextdocumentwriter.h
index b616508483..b396fd4d88 100644
--- a/src/gui/text/qtextdocumentwriter.h
+++ b/src/gui/text/qtextdocumentwriter.h
@@ -47,7 +47,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Gui)
 
 class QTextDocumentWriterPrivate;
 class QIODevice;
diff --git a/src/gui/text/qtextformat.h b/src/gui/text/qtextformat.h
index dd4ba6b2e9..5837fc74fa 100644
--- a/src/gui/text/qtextformat.h
+++ b/src/gui/text/qtextformat.h
@@ -55,7 +55,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Gui)
 
 class QString;
 class QVariant;
diff --git a/src/gui/text/qtextlayout.h b/src/gui/text/qtextlayout.h
index 6d22a2773e..c1a3efcc3d 100644
--- a/src/gui/text/qtextlayout.h
+++ b/src/gui/text/qtextlayout.h
@@ -56,7 +56,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Gui)
 
 class QTextEngine;
 class QFont;
diff --git a/src/gui/text/qtextlist.h b/src/gui/text/qtextlist.h
index b81d973898..0a760c8128 100644
--- a/src/gui/text/qtextlist.h
+++ b/src/gui/text/qtextlist.h
@@ -49,7 +49,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Gui)
 
 class QTextListPrivate;
 class QTextCursor;
diff --git a/src/gui/text/qtextobject.h b/src/gui/text/qtextobject.h
index a224020827..e42ce428c7 100644
--- a/src/gui/text/qtextobject.h
+++ b/src/gui/text/qtextobject.h
@@ -50,7 +50,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Gui)
 
 class QTextObjectPrivate;
 class QTextDocument;
diff --git a/src/gui/text/qtextoption.h b/src/gui/text/qtextoption.h
index 3d76c40dd2..16bdcad7f7 100644
--- a/src/gui/text/qtextoption.h
+++ b/src/gui/text/qtextoption.h
@@ -51,7 +51,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Gui)
 
 template <typename T> class QList;
 struct QTextOptionPrivate;
diff --git a/src/gui/text/qtexttable.h b/src/gui/text/qtexttable.h
index b8d7cd7098..697d416c90 100644
--- a/src/gui/text/qtexttable.h
+++ b/src/gui/text/qtexttable.h
@@ -50,7 +50,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Gui)
 
 class QTextCursor;
 class QTextTable;
diff --git a/src/gui/util/qdesktopservices.h b/src/gui/util/qdesktopservices.h
index c439364525..96e985e927 100644
--- a/src/gui/util/qdesktopservices.h
+++ b/src/gui/util/qdesktopservices.h
@@ -51,7 +51,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Gui)
 
 #ifndef QT_NO_DESKTOPSERVICES
 
diff --git a/src/gui/util/qvalidator.h b/src/gui/util/qvalidator.h
index a5f6beec55..b8a6417251 100644
--- a/src/gui/util/qvalidator.h
+++ b/src/gui/util/qvalidator.h
@@ -51,7 +51,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Gui)
 
 #ifndef QT_NO_VALIDATOR
 
-- 
cgit v1.2.3