diff options
38 files changed, 2 insertions, 61 deletions
diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp index 22a8b32017..2f7e8c7bab 100644 --- a/qmake/generators/makefile.cpp +++ b/qmake/generators/makefile.cpp @@ -57,7 +57,6 @@ #else #include <io.h> #endif -#include <qdebug.h> #include <stdio.h> #include <stdlib.h> #include <time.h> diff --git a/src/corelib/global/qendian.h b/src/corelib/global/qendian.h index 5b18eec489..86f73a783a 100644 --- a/src/corelib/global/qendian.h +++ b/src/corelib/global/qendian.h @@ -52,8 +52,6 @@ #include <byteswap.h> #endif -#include <string.h> - QT_BEGIN_HEADER QT_BEGIN_NAMESPACE diff --git a/src/corelib/io/qfilesystemengine_unix.cpp b/src/corelib/io/qfilesystemengine_unix.cpp index 0e0c0453d0..21e2987782 100644 --- a/src/corelib/io/qfilesystemengine_unix.cpp +++ b/src/corelib/io/qfilesystemengine_unix.cpp @@ -41,7 +41,6 @@ #include "qplatformdefs.h" #include "qfilesystemengine_p.h" -#include "qplatformdefs.h" #include "qfile.h" #include <QtCore/qvarlengtharray.h> diff --git a/src/corelib/json/qjsonarray.cpp b/src/corelib/json/qjsonarray.cpp index 2fcb7a67e4..cd47bea360 100644 --- a/src/corelib/json/qjsonarray.cpp +++ b/src/corelib/json/qjsonarray.cpp @@ -42,7 +42,6 @@ #include <qjsonobject.h> #include <qjsonvalue.h> #include <qjsonarray.h> -#include <qjsonvalue.h> #include <qstringlist.h> #include <qvariant.h> #include <qdebug.h> diff --git a/src/corelib/json/qjsonvalue.cpp b/src/corelib/json/qjsonvalue.cpp index 28213210a3..f1e9e20bf3 100644 --- a/src/corelib/json/qjsonvalue.cpp +++ b/src/corelib/json/qjsonvalue.cpp @@ -42,7 +42,6 @@ #include <qjsonobject.h> #include <qjsonvalue.h> #include <qjsonarray.h> -#include <qjsonarray.h> #include <qvariant.h> #include <qstringlist.h> #include <qdebug.h> diff --git a/src/corelib/kernel/qsharedmemory_unix.cpp b/src/corelib/kernel/qsharedmemory_unix.cpp index 54bd4c6cc7..59d5dfb3cd 100644 --- a/src/corelib/kernel/qsharedmemory_unix.cpp +++ b/src/corelib/kernel/qsharedmemory_unix.cpp @@ -53,7 +53,6 @@ #include <sys/types.h> #include <sys/ipc.h> #include <sys/shm.h> -#include <sys/types.h> #include <sys/stat.h> #include <fcntl.h> #include <unistd.h> diff --git a/src/corelib/plugin/qlibrary_win.cpp b/src/corelib/plugin/qlibrary_win.cpp index 10ca17cd2d..3568bed547 100644 --- a/src/corelib/plugin/qlibrary_win.cpp +++ b/src/corelib/plugin/qlibrary_win.cpp @@ -44,7 +44,6 @@ #include "qfile.h" #include "qdir.h" #include "qfileinfo.h" -#include "qdir.h" #include <private/qfilesystementry_p.h> #if defined(QT_NO_LIBRARY) && defined(Q_OS_WIN) diff --git a/src/gui/image/qimage.cpp b/src/gui/image/qimage.cpp index ef184c0a78..524ab9150d 100644 --- a/src/gui/image/qimage.cpp +++ b/src/gui/image/qimage.cpp @@ -64,7 +64,6 @@ #include <qhash.h> -#include <private/qguiapplication_p.h> #include <private/qpaintengine_raster_p.h> #include <private/qimage_p.h> diff --git a/src/gui/image/qmovie.h b/src/gui/image/qmovie.h index e11dea6ad3..f0d52906b4 100644 --- a/src/gui/image/qmovie.h +++ b/src/gui/image/qmovie.h @@ -48,7 +48,6 @@ #include <QtCore/qbytearray.h> #include <QtCore/qlist.h> -#include <QtCore/qobject.h> #include <QtGui/qimagereader.h> QT_BEGIN_HEADER diff --git a/src/gui/image/qnativeimage.cpp b/src/gui/image/qnativeimage.cpp index c562b0bd6d..2794f093f2 100644 --- a/src/gui/image/qnativeimage.cpp +++ b/src/gui/image/qnativeimage.cpp @@ -47,9 +47,6 @@ #include "private/qpaintengine_raster_p.h" -#include "private/qguiapplication_p.h" - - QT_BEGIN_NAMESPACE diff --git a/src/gui/kernel/qguiapplication.cpp b/src/gui/kernel/qguiapplication.cpp index d48112e0a4..f59c7dcf4a 100644 --- a/src/gui/kernel/qguiapplication.cpp +++ b/src/gui/kernel/qguiapplication.cpp @@ -66,11 +66,9 @@ #include <private/qdrawhelper_p.h> #include <QtGui/qgenericpluginfactory.h> -#include <qpa/qplatformintegration.h> #include <QtGui/qstylehints.h> #include <QtGui/qinputmethod.h> #include <QtGui/qpixmapcache.h> -#include <qpa/qplatformtheme.h> #include <qpa/qplatforminputcontext.h> #include <qpa/qplatforminputcontext_p.h> @@ -81,7 +79,6 @@ #include "private/qdnd_p.h" #include <qpa/qplatformthemefactory_p.h> -#include <qpa/qplatformdrag.h> #ifndef QT_NO_CURSOR #include <qpa/qplatformcursor.h> diff --git a/src/gui/kernel/qguivariant.cpp b/src/gui/kernel/qguivariant.cpp index 8a5c083840..417dc4b742 100644 --- a/src/gui/kernel/qguivariant.cpp +++ b/src/gui/kernel/qguivariant.cpp @@ -39,15 +39,11 @@ ** ****************************************************************************/ -#include "qvariant.h" - // Gui types #include "qbitmap.h" #include "qbrush.h" #include "qcolor.h" #include "qcursor.h" -#include "qdatastream.h" -#include "qdebug.h" #include "qfont.h" #include "qimage.h" #include "qkeysequence.h" diff --git a/src/gui/kernel/qplatformintegration.cpp b/src/gui/kernel/qplatformintegration.cpp index 85933de8b2..54ba3b6a2b 100644 --- a/src/gui/kernel/qplatformintegration.cpp +++ b/src/gui/kernel/qplatformintegration.cpp @@ -48,7 +48,6 @@ #include <QtGui/private/qguiapplication_p.h> #include <QtGui/private/qpixmap_raster_p.h> #include <qpa/qplatformscreen_p.h> -#include <qpa/qplatformtheme.h> #include <private/qdnd_p.h> QT_BEGIN_NAMESPACE diff --git a/src/gui/text/qfontengine_ft.cpp b/src/gui/text/qfontengine_ft.cpp index af0a510980..946285b89d 100644 --- a/src/gui/text/qfontengine_ft.cpp +++ b/src/gui/text/qfontengine_ft.cpp @@ -53,7 +53,6 @@ #include "qthreadstorage.h" #include <qmath.h> -#include "qfontengine_ft_p.h" #include <ft2build.h> #include FT_FREETYPE_H #include FT_OUTLINE_H diff --git a/src/network/kernel/qhostinfo_p.h b/src/network/kernel/qhostinfo_p.h index 57a5050172..afe5f081a2 100644 --- a/src/network/kernel/qhostinfo_p.h +++ b/src/network/kernel/qhostinfo_p.h @@ -62,7 +62,6 @@ #include "QtCore/qpointer.h" #include "QtCore/qthread.h" #include "QtCore/qthreadpool.h" -#include "QtCore/qmutex.h" #include "QtCore/qrunnable.h" #include "QtCore/qlist.h" #include "QtCore/qqueue.h" diff --git a/src/network/socket/qnativesocketengine_unix.cpp b/src/network/socket/qnativesocketengine_unix.cpp index 5993c18983..4b22f1c262 100644 --- a/src/network/socket/qnativesocketengine_unix.cpp +++ b/src/network/socket/qnativesocketengine_unix.cpp @@ -53,9 +53,6 @@ #ifndef QT_NO_IPV6IFNAME #include <net/if.h> #endif -#ifndef QT_NO_IPV6IFNAME -#include <net/if.h> -#endif #ifdef QT_LINUXBASE #include <arpa/inet.h> #endif diff --git a/src/opengl/qgl_qpa.cpp b/src/opengl/qgl_qpa.cpp index 7e37fa19ea..117401ce4c 100644 --- a/src/opengl/qgl_qpa.cpp +++ b/src/opengl/qgl_qpa.cpp @@ -44,7 +44,6 @@ #include <QPixmap> #include <QDebug> -#include <private/qapplication_p.h> #include <qpa/qplatformopenglcontext.h> #include <qpa/qplatformwindow.h> #include <QtGui/QSurfaceFormat> diff --git a/src/platformsupport/fontdatabases/fontconfig/qfontenginemultifontconfig.cpp b/src/platformsupport/fontdatabases/fontconfig/qfontenginemultifontconfig.cpp index 153c452b04..a10186c1c4 100644 --- a/src/platformsupport/fontdatabases/fontconfig/qfontenginemultifontconfig.cpp +++ b/src/platformsupport/fontdatabases/fontconfig/qfontenginemultifontconfig.cpp @@ -42,7 +42,6 @@ #include "qfontenginemultifontconfig_p.h" #include <QtGui/private/qfontengine_ft_p.h> -#include <QtGui/private/qfontengine_ft_p.h> QT_BEGIN_NAMESPACE diff --git a/src/plugins/platforms/windows/accessible/qwindowsaccessibility.cpp b/src/plugins/platforms/windows/accessible/qwindowsaccessibility.cpp index fa8862f67e..f59a02b36a 100644 --- a/src/plugins/platforms/windows/accessible/qwindowsaccessibility.cpp +++ b/src/plugins/platforms/windows/accessible/qwindowsaccessibility.cpp @@ -78,7 +78,6 @@ # include <winable.h> #endif -#include <oleacc.h> #include <servprov.h> #if !defined(Q_CC_BOR) && !defined (Q_CC_GNU) #include <comdef.h> diff --git a/src/plugins/platforms/windows/qwindowsscreen.cpp b/src/plugins/platforms/windows/qwindowsscreen.cpp index d843236695..4155c262dd 100644 --- a/src/plugins/platforms/windows/qwindowsscreen.cpp +++ b/src/plugins/platforms/windows/qwindowsscreen.cpp @@ -44,7 +44,6 @@ #include "qwindowswindow.h" #include "qwindowsintegration.h" #include "qwindowscursor.h" -#include "qwindowscontext.h" #include "qtwindows_additional.h" diff --git a/src/plugins/platforms/xcb/qxcbintegration.cpp b/src/plugins/platforms/xcb/qxcbintegration.cpp index 501b18a255..cc1c5258f8 100644 --- a/src/plugins/platforms/xcb/qxcbintegration.cpp +++ b/src/plugins/platforms/xcb/qxcbintegration.cpp @@ -54,7 +54,6 @@ #include <QtPlatformSupport/private/qgenericunixeventdispatcher_p.h> #include <QtPlatformSupport/private/qgenericunixfontdatabase_p.h> -#include <QtPlatformSupport/private/qgenericunixfontdatabase_p.h> #include <QtPlatformSupport/private/qgenericunixservices_p.h> #include <stdio.h> diff --git a/src/tools/qdbuscpp2xml/qdbuscpp2xml.cpp b/src/tools/qdbuscpp2xml/qdbuscpp2xml.cpp index 87a7692333..ff5f4357df 100644 --- a/src/tools/qdbuscpp2xml/qdbuscpp2xml.cpp +++ b/src/tools/qdbuscpp2xml/qdbuscpp2xml.cpp @@ -51,7 +51,6 @@ #include <stdio.h> #include <stdlib.h> #include <string.h> -#include <stdlib.h> #include "qdbusconnection.h" // for the Export* flags #include "qdbusconnection_p.h" // for the qDBusCheckAsyncTag diff --git a/src/widgets/dialogs/qdialog.cpp b/src/widgets/dialogs/qdialog.cpp index 0e57a16757..efb850d615 100644 --- a/src/widgets/dialogs/qdialog.cpp +++ b/src/widgets/dialogs/qdialog.cpp @@ -55,7 +55,6 @@ #include <qpa/qplatformtheme.h> #include "private/qdialog_p.h" #include "private/qguiapplication_p.h" -#include <qpa/qplatformtheme.h> #ifndef QT_NO_ACCESSIBILITY #include "qaccessible.h" #endif diff --git a/src/widgets/dialogs/qfilesystemmodel_p.h b/src/widgets/dialogs/qfilesystemmodel_p.h index 3a02b91b09..48bd82d7d9 100644 --- a/src/widgets/dialogs/qfilesystemmodel_p.h +++ b/src/widgets/dialogs/qfilesystemmodel_p.h @@ -63,8 +63,6 @@ #include <qpair.h> #include <qdir.h> #include <qicon.h> -#include <qdir.h> -#include <qicon.h> #include <qfileinfo.h> #include <qtimer.h> #include <qhash.h> diff --git a/src/widgets/itemviews/qabstractitemview_p.h b/src/widgets/itemviews/qabstractitemview_p.h index dc2b2dfa90..4575dd3847 100644 --- a/src/widgets/itemviews/qabstractitemview_p.h +++ b/src/widgets/itemviews/qabstractitemview_p.h @@ -62,7 +62,6 @@ #include "QtCore/qpair.h" #include "QtGui/qregion.h" #include "QtCore/qdebug.h" -#include "QtGui/qpainter.h" #include "QtCore/qbasictimer.h" #include "QtCore/qelapsedtimer.h" diff --git a/src/widgets/kernel/qapplication.cpp b/src/widgets/kernel/qapplication.cpp index 34b2893e89..7e672f4725 100644 --- a/src/widgets/kernel/qapplication.cpp +++ b/src/widgets/kernel/qapplication.cpp @@ -88,24 +88,21 @@ #include "private/qevent_p.h" #include "qwidget_p.h" -#include "qapplication.h" - #include "qgesture.h" #include "private/qgesturemanager_p.h" -#include "private/qguiapplication_p.h" #include <qpa/qplatformfontdatabase.h> #ifndef QT_NO_LIBRARY #include "qlibrary.h" #endif -#ifdef Q_OS_WINCE #include "qdatetime.h" + +#ifdef Q_OS_WINCE extern bool qt_wince_is_smartphone(); //qguifunctions_wince.cpp extern bool qt_wince_is_mobile(); //qguifunctions_wince.cpp extern bool qt_wince_is_pocket_pc(); //qguifunctions_wince.cpp #endif -#include "qdatetime.h" #include <qpa/qplatformwindow.h> //#define ALIEN_DEBUG diff --git a/src/widgets/styles/qcommonstyle.cpp b/src/widgets/styles/qcommonstyle.cpp index da6298a4b5..417a043977 100644 --- a/src/widgets/styles/qcommonstyle.cpp +++ b/src/widgets/styles/qcommonstyle.cpp @@ -70,7 +70,6 @@ #include <qdebug.h> #include <qtextformat.h> #include <qwizard.h> -#include <qtabbar.h> #include <qfileinfo.h> #include <qdir.h> #include <qsettings.h> diff --git a/src/widgets/styles/qstylesheetstyle.cpp b/src/widgets/styles/qstylesheetstyle.cpp index ffbf7c2f5b..d25092bfbc 100644 --- a/src/widgets/styles/qstylesheetstyle.cpp +++ b/src/widgets/styles/qstylesheetstyle.cpp @@ -54,7 +54,6 @@ #include <qlineedit.h> #include <qwindowsstyle.h> #include <qcombobox.h> -#include <qwindowsstyle.h> #include <qplastiquestyle.h> #include "private/qcssparser_p.h" #include "private/qmath_p.h" diff --git a/src/widgets/styles/qwindowsmobilestyle.cpp b/src/widgets/styles/qwindowsmobilestyle.cpp index 863bd1aa62..6b36260e71 100644 --- a/src/widgets/styles/qwindowsmobilestyle.cpp +++ b/src/widgets/styles/qwindowsmobilestyle.cpp @@ -61,8 +61,6 @@ #include "qabstractscrollarea.h" #include "qabstractbutton.h" #include "qcombobox.h" -#include "qabstractscrollarea.h" -#include "qframe.h" #include "qscrollbar.h" #include "qabstractitemview.h" #include "qmenubar.h" diff --git a/src/widgets/styles/qwindowsvistastyle_p.h b/src/widgets/styles/qwindowsvistastyle_p.h index cdb1227319..494d9fa836 100644 --- a/src/widgets/styles/qwindowsvistastyle_p.h +++ b/src/widgets/styles/qwindowsvistastyle_p.h @@ -82,8 +82,6 @@ #include <qmessagebox.h> #include <qdialogbuttonbox.h> #include <qinputdialog.h> -#include <qtreeview.h> -#include <qlistview.h> #include <qtableview.h> #include <qbasictimer.h> #include <qdatetime.h> diff --git a/src/widgets/util/qcompleter.cpp b/src/widgets/util/qcompleter.cpp index 245857b3c3..f6277341fb 100644 --- a/src/widgets/util/qcompleter.cpp +++ b/src/widgets/util/qcompleter.cpp @@ -154,7 +154,6 @@ #include "QtWidgets/qlistview.h" #include "QtWidgets/qapplication.h" #include "QtGui/qevent.h" -#include "QtWidgets/qheaderview.h" #include "QtWidgets/qdesktopwidget.h" #include "QtWidgets/qlineedit.h" diff --git a/src/widgets/util/qsystemtrayicon.cpp b/src/widgets/util/qsystemtrayicon.cpp index 9e667b1781..e88a03a477 100644 --- a/src/widgets/util/qsystemtrayicon.cpp +++ b/src/widgets/util/qsystemtrayicon.cpp @@ -57,7 +57,6 @@ #include "qdesktopwidget.h" #include "qbitmap.h" #include "private/qlabel_p.h" -#include "qapplication.h" QT_BEGIN_NAMESPACE diff --git a/src/widgets/widgets/qdialogbuttonbox.cpp b/src/widgets/widgets/qdialogbuttonbox.cpp index a7d923fb07..6028d96634 100644 --- a/src/widgets/widgets/qdialogbuttonbox.cpp +++ b/src/widgets/widgets/qdialogbuttonbox.cpp @@ -50,11 +50,6 @@ #include "qdialogbuttonbox.h" -#ifdef QT_SOFTKEYS_ENABLED -#include <QtWidgets/qaction.h> -#endif - - QT_BEGIN_NAMESPACE /*! diff --git a/src/widgets/widgets/qlineedit_p.h b/src/widgets/widgets/qlineedit_p.h index d6af91fd65..2d02694f66 100644 --- a/src/widgets/widgets/qlineedit_p.h +++ b/src/widgets/widgets/qlineedit_p.h @@ -64,7 +64,6 @@ #include "QtWidgets/qcompleter.h" #include "QtCore/qpointer.h" #include "QtCore/qmimedata.h" -#include "QtWidgets/qlineedit.h" #include "private/qwidgetlinecontrol_p.h" diff --git a/src/widgets/widgets/qmainwindowlayout.cpp b/src/widgets/widgets/qmainwindowlayout.cpp index 6446453a6b..6a72a32511 100644 --- a/src/widgets/widgets/qmainwindowlayout.cpp +++ b/src/widgets/widgets/qmainwindowlayout.cpp @@ -47,12 +47,10 @@ #include "qdockwidget_p.h" #include "qtoolbar_p.h" #include "qmainwindow.h" -#include "qmainwindowlayout_p.h" #include "qtoolbar.h" #include "qtoolbarlayout_p.h" #include "qwidgetanimator_p.h" #include "qrubberband.h" -#include "qdockwidget_p.h" #include "qtabbar_p.h" #include <qapplication.h> diff --git a/src/widgets/widgets/qmenu.cpp b/src/widgets/widgets/qmenu.cpp index b201179661..c8d2b39ca3 100644 --- a/src/widgets/widgets/qmenu.cpp +++ b/src/widgets/widgets/qmenu.cpp @@ -71,7 +71,6 @@ #include <private/qaction_p.h> #include <private/qsoftkeymanager_p.h> #include <private/qguiapplication_p.h> -#include <qpa/qplatformtheme.h> QT_BEGIN_NAMESPACE diff --git a/src/widgets/widgets/qwidgetlinecontrol_p.h b/src/widgets/widgets/qwidgetlinecontrol_p.h index 2dce790c1e..3e7dd227cd 100644 --- a/src/widgets/widgets/qwidgetlinecontrol_p.h +++ b/src/widgets/widgets/qwidgetlinecontrol_p.h @@ -69,8 +69,6 @@ #include "qplatformdefs.h" -#include "qplatformdefs.h" - QT_BEGIN_HEADER #ifdef DrawText diff --git a/tools/configure/environment.cpp b/tools/configure/environment.cpp index c7511919f3..cf8ed9611b 100644 --- a/tools/configure/environment.cpp +++ b/tools/configure/environment.cpp @@ -48,7 +48,6 @@ #include <QDir> #include <QStringList> #include <QMap> -#include <QDir> #include <QFile> #include <QFileInfo> |