diff options
| author | Gunnar Sletta <[email protected]> | 2012-01-09 08:53:17 +0100 |
|---|---|---|
| committer | Qt by Nokia <[email protected]> | 2012-01-25 10:19:44 +0100 |
| commit | 4ecf82795de54fba530ac9c386f3afff2174edbd (patch) | |
| tree | 7e453145b49364176c3e4a881464e16fe6049e5b | |
| parent | 00c8984b4e48b2a7eadfee6c3cd0cbb19f586118 (diff) | |
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 <[email protected]>
561 files changed, 25 insertions, 732 deletions
diff --git a/bin/syncqt b/bin/syncqt index 194996e3f85..2120c39a2a9 100755 --- a/bin/syncqt +++ b/bin/syncqt @@ -1341,7 +1341,6 @@ if($check_includes) { my $iheader = $subdir . "/" . $header; if($public_header) { if(open(F, "<$iheader")) { - my $qt_module_found = 0; my $qt_begin_header_found = 0; my $qt_end_header_found = 0; my $qt_begin_namespace_found = 0; @@ -1376,8 +1375,6 @@ if($check_includes) { $qt_begin_namespace_found = 1; } elsif ($header_skip_qt_begin_namespace_test == 0 and $line =~ /^QT_END_NAMESPACE\s*$/) { $qt_end_namespace_found = 1; - } elsif ($header_skip_qt_module_test == 0 and $line =~ /^QT_MODULE\(.*\)\s*$/) { - $qt_module_found = 1; } } if ($header_skip_qt_begin_header_test == 0) { @@ -1400,11 +1397,6 @@ if($check_includes) { } } - if ($header_skip_qt_module_test == 0) { - if ($qt_module_found == 0) { - print "$lib: WARNING: $iheader does not include QT_MODULE\n"; - } - } close(F); } } diff --git a/examples/animation/sub-attaq/qanimationstate.h b/examples/animation/sub-attaq/qanimationstate.h index ed388163de7..1a6926350a6 100644 --- a/examples/animation/sub-attaq/qanimationstate.h +++ b/examples/animation/sub-attaq/qanimationstate.h @@ -54,7 +54,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Gui) #ifndef QT_NO_ANIMATION diff --git a/src/corelib/animation/qabstractanimation.h b/src/corelib/animation/qabstractanimation.h index 482bb6c0ccb..bcb0e263008 100644 --- a/src/corelib/animation/qabstractanimation.h +++ b/src/corelib/animation/qabstractanimation.h @@ -48,7 +48,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Core) #ifndef QT_NO_ANIMATION diff --git a/src/corelib/animation/qanimationgroup.h b/src/corelib/animation/qanimationgroup.h index 8e789202b66..ee613e4880a 100644 --- a/src/corelib/animation/qanimationgroup.h +++ b/src/corelib/animation/qanimationgroup.h @@ -48,7 +48,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Core) #ifndef QT_NO_ANIMATION diff --git a/src/corelib/animation/qparallelanimationgroup.h b/src/corelib/animation/qparallelanimationgroup.h index 05b5d91ff36..d76b43a7f0d 100644 --- a/src/corelib/animation/qparallelanimationgroup.h +++ b/src/corelib/animation/qparallelanimationgroup.h @@ -48,7 +48,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Core) #ifndef QT_NO_ANIMATION diff --git a/src/corelib/animation/qpauseanimation.h b/src/corelib/animation/qpauseanimation.h index 34c9dd3c59a..1dbc7db2b92 100644 --- a/src/corelib/animation/qpauseanimation.h +++ b/src/corelib/animation/qpauseanimation.h @@ -48,7 +48,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Core) #ifndef QT_NO_ANIMATION diff --git a/src/corelib/animation/qpropertyanimation.h b/src/corelib/animation/qpropertyanimation.h index 7e7befdd5d2..d3960a9c248 100644 --- a/src/corelib/animation/qpropertyanimation.h +++ b/src/corelib/animation/qpropertyanimation.h @@ -48,7 +48,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Core) #ifndef QT_NO_ANIMATION diff --git a/src/corelib/animation/qsequentialanimationgroup.h b/src/corelib/animation/qsequentialanimationgroup.h index 405c9cb5d1e..e6e3c3371a4 100644 --- a/src/corelib/animation/qsequentialanimationgroup.h +++ b/src/corelib/animation/qsequentialanimationgroup.h @@ -48,7 +48,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Core) #ifndef QT_NO_ANIMATION diff --git a/src/corelib/animation/qvariantanimation.h b/src/corelib/animation/qvariantanimation.h index c7caa0884f7..110cd7b5e7d 100644 --- a/src/corelib/animation/qvariantanimation.h +++ b/src/corelib/animation/qvariantanimation.h @@ -52,7 +52,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Core) #ifndef QT_NO_ANIMATION diff --git a/src/corelib/arch/qatomic_arm.h b/src/corelib/arch/qatomic_arm.h index 7516a81fcee..a4b826261d4 100644 --- a/src/corelib/arch/qatomic_arm.h +++ b/src/corelib/arch/qatomic_arm.h @@ -42,16 +42,12 @@ #ifndef QATOMIC_ARM_H #define QATOMIC_ARM_H -QT_BEGIN_HEADER - #if defined(__ARM_ARCH_7__) \ || defined(__ARM_ARCH_7A__) \ || defined(__ARM_ARCH_7R__) \ || defined(__ARM_ARCH_7M__) # define QT_ARCH_ARMV7 -QT_BEGIN_INCLUDE_HEADER # include "QtCore/qatomic_armv7.h" -QT_END_INCLUDE_HEADER #elif defined(__ARM_ARCH_6__) \ || defined(__ARM_ARCH_6J__) \ || defined(__ARM_ARCH_6T2__) \ @@ -61,16 +57,10 @@ QT_END_INCLUDE_HEADER || defined(__ARM_ARCH_6M__) \ || (defined(__TARGET_ARCH_ARM) && (__TARGET_ARCH_ARM-0 >= 6)) # define QT_ARCH_ARMV6 -QT_BEGIN_INCLUDE_HEADER # include "QtCore/qatomic_armv6.h" -QT_END_INCLUDE_HEADER #else # define QT_ARCH_ARMV5 -QT_BEGIN_INCLUDE_HEADER # include "QtCore/qatomic_armv5.h" -QT_END_INCLUDE_HEADER #endif -QT_END_HEADER - #endif // QATOMIC_ARM_H diff --git a/src/corelib/arch/qatomic_armv7.h b/src/corelib/arch/qatomic_armv7.h index d734b15893b..523f827c699 100644 --- a/src/corelib/arch/qatomic_armv7.h +++ b/src/corelib/arch/qatomic_armv7.h @@ -42,8 +42,6 @@ #ifndef QATOMIC_ARMV7_H #define QATOMIC_ARMV7_H -QT_BEGIN_HEADER - // use the DMB instruction when compiling for ARMv7, ... #ifndef Q_CC_RCVT # define Q_DATA_MEMORY_BARRIER asm volatile("dmb\n":::"memory") @@ -52,10 +50,6 @@ QT_BEGIN_HEADER #endif // ... but the implementation is otherwise identical to that for ARMv6 -QT_BEGIN_INCLUDE_HEADER #include "QtCore/qatomic_armv6.h" -QT_END_INCLUDE_HEADER - -QT_END_HEADER #endif // QATOMIC_ARMV7_H diff --git a/src/corelib/codecs/qtextcodec.h b/src/corelib/codecs/qtextcodec.h index 4bad7dfc086..2f34cea388c 100644 --- a/src/corelib/codecs/qtextcodec.h +++ b/src/corelib/codecs/qtextcodec.h @@ -49,7 +49,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Core) #ifndef QT_NO_TEXTCODEC diff --git a/src/corelib/concurrent/qfuture.h b/src/corelib/concurrent/qfuture.h index b194eea0afa..26a62d9c050 100644 --- a/src/corelib/concurrent/qfuture.h +++ b/src/corelib/concurrent/qfuture.h @@ -53,7 +53,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Core) template <typename T> class QFutureWatcher; diff --git a/src/corelib/concurrent/qfutureinterface.h b/src/corelib/concurrent/qfutureinterface.h index 4f20a8e98b3..c4601f060fd 100644 --- a/src/corelib/concurrent/qfutureinterface.h +++ b/src/corelib/concurrent/qfutureinterface.h @@ -54,7 +54,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Core) template <typename T> class QFuture; class QFutureInterfaceBasePrivate; diff --git a/src/corelib/concurrent/qfuturesynchronizer.h b/src/corelib/concurrent/qfuturesynchronizer.h index 4664d2f50af..342368899f7 100644 --- a/src/corelib/concurrent/qfuturesynchronizer.h +++ b/src/corelib/concurrent/qfuturesynchronizer.h @@ -49,7 +49,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Core) template <typename T> class QFutureSynchronizer diff --git a/src/corelib/concurrent/qfuturewatcher.h b/src/corelib/concurrent/qfuturewatcher.h index aca8a1a7dfa..15c077d4c4e 100644 --- a/src/corelib/concurrent/qfuturewatcher.h +++ b/src/corelib/concurrent/qfuturewatcher.h @@ -51,7 +51,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Core) class QEvent; diff --git a/src/corelib/concurrent/qrunnable.h b/src/corelib/concurrent/qrunnable.h index 14d39845c9e..fc9b6730394 100644 --- a/src/corelib/concurrent/qrunnable.h +++ b/src/corelib/concurrent/qrunnable.h @@ -47,7 +47,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Core) class QRunnable { diff --git a/src/corelib/concurrent/qtconcurrentcompilertest.h b/src/corelib/concurrent/qtconcurrentcompilertest.h index b02931ed051..a6ee1690908 100644 --- a/src/corelib/concurrent/qtconcurrentcompilertest.h +++ b/src/corelib/concurrent/qtconcurrentcompilertest.h @@ -49,7 +49,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Core) #if defined (Q_CC_MSVC) && (_MSC_VER < 1300) # define QT_TYPENAME diff --git a/src/corelib/concurrent/qtconcurrentexception.h b/src/corelib/concurrent/qtconcurrentexception.h index d47359a6439..5229f0b4d3f 100644 --- a/src/corelib/concurrent/qtconcurrentexception.h +++ b/src/corelib/concurrent/qtconcurrentexception.h @@ -56,7 +56,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Core) namespace QtConcurrent { diff --git a/src/corelib/concurrent/qtconcurrentfilter.h b/src/corelib/concurrent/qtconcurrentfilter.h index 9edc6927241..6a4d711816e 100644 --- a/src/corelib/concurrent/qtconcurrentfilter.h +++ b/src/corelib/concurrent/qtconcurrentfilter.h @@ -52,7 +52,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Core) #ifdef qdoc diff --git a/src/corelib/concurrent/qtconcurrentfilterkernel.h b/src/corelib/concurrent/qtconcurrentfilterkernel.h index 149d682ef59..b14ef7379f0 100644 --- a/src/corelib/concurrent/qtconcurrentfilterkernel.h +++ b/src/corelib/concurrent/qtconcurrentfilterkernel.h @@ -53,7 +53,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Core) #ifndef qdoc diff --git a/src/corelib/concurrent/qtconcurrentfunctionwrappers.h b/src/corelib/concurrent/qtconcurrentfunctionwrappers.h index 9f901c3f413..b186330d729 100644 --- a/src/corelib/concurrent/qtconcurrentfunctionwrappers.h +++ b/src/corelib/concurrent/qtconcurrentfunctionwrappers.h @@ -49,7 +49,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Core) #ifndef qdoc diff --git a/src/corelib/concurrent/qtconcurrentiteratekernel.h b/src/corelib/concurrent/qtconcurrentiteratekernel.h index 459765a3db3..9177b01c2f4 100644 --- a/src/corelib/concurrent/qtconcurrentiteratekernel.h +++ b/src/corelib/concurrent/qtconcurrentiteratekernel.h @@ -57,7 +57,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Core) #ifndef qdoc diff --git a/src/corelib/concurrent/qtconcurrentmap.h b/src/corelib/concurrent/qtconcurrentmap.h index ebfb2e9b7e0..835540b1112 100644 --- a/src/corelib/concurrent/qtconcurrentmap.h +++ b/src/corelib/concurrent/qtconcurrentmap.h @@ -54,7 +54,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Core) #ifdef qdoc diff --git a/src/corelib/concurrent/qtconcurrentmapkernel.h b/src/corelib/concurrent/qtconcurrentmapkernel.h index 38c362f90ad..efa9f9ed691 100644 --- a/src/corelib/concurrent/qtconcurrentmapkernel.h +++ b/src/corelib/concurrent/qtconcurrentmapkernel.h @@ -52,7 +52,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Core) #ifndef qdoc namespace QtConcurrent { diff --git a/src/corelib/concurrent/qtconcurrentmedian.h b/src/corelib/concurrent/qtconcurrentmedian.h index 405daa86f02..eb031c41657 100644 --- a/src/corelib/concurrent/qtconcurrentmedian.h +++ b/src/corelib/concurrent/qtconcurrentmedian.h @@ -52,7 +52,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Core) #ifndef qdoc diff --git a/src/corelib/concurrent/qtconcurrentreducekernel.h b/src/corelib/concurrent/qtconcurrentreducekernel.h index c9f34e33c84..7bcb31f552e 100644 --- a/src/corelib/concurrent/qtconcurrentreducekernel.h +++ b/src/corelib/concurrent/qtconcurrentreducekernel.h @@ -57,7 +57,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Core) namespace QtConcurrent { diff --git a/src/corelib/concurrent/qtconcurrentresultstore.h b/src/corelib/concurrent/qtconcurrentresultstore.h index aa946d7c0bd..32605a9ad32 100644 --- a/src/corelib/concurrent/qtconcurrentresultstore.h +++ b/src/corelib/concurrent/qtconcurrentresultstore.h @@ -52,7 +52,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Core) /* ResultStore stores indexed results. Results can be added and retrieved diff --git a/src/corelib/concurrent/qtconcurrentrun.h b/src/corelib/concurrent/qtconcurrentrun.h index ddd23b35157..e7df9470dbf 100644 --- a/src/corelib/concurrent/qtconcurrentrun.h +++ b/src/corelib/concurrent/qtconcurrentrun.h @@ -53,7 +53,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Core) #ifdef qdoc diff --git a/src/corelib/concurrent/qtconcurrentrunbase.h b/src/corelib/concurrent/qtconcurrentrunbase.h index 0dea99bb31a..3ca699e6618 100644 --- a/src/corelib/concurrent/qtconcurrentrunbase.h +++ b/src/corelib/concurrent/qtconcurrentrunbase.h @@ -53,7 +53,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Core) #ifndef qdoc diff --git a/src/corelib/concurrent/qtconcurrentstoredfunctioncall.h b/src/corelib/concurrent/qtconcurrentstoredfunctioncall.h index 324f35c14dd..f9a59aa45d9 100644 --- a/src/corelib/concurrent/qtconcurrentstoredfunctioncall.h +++ b/src/corelib/concurrent/qtconcurrentstoredfunctioncall.h @@ -51,7 +51,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Core) #ifndef qdoc diff --git a/src/corelib/concurrent/qtconcurrentthreadengine.h b/src/corelib/concurrent/qtconcurrentthreadengine.h index 0981d0bfe09..5c68a7fd8f7 100644 --- a/src/corelib/concurrent/qtconcurrentthreadengine.h +++ b/src/corelib/concurrent/qtconcurrentthreadengine.h @@ -57,7 +57,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Core) #ifndef qdoc diff --git a/src/corelib/concurrent/qthreadpool.h b/src/corelib/concurrent/qthreadpool.h index 3bec5b8e437..a9ac6c16329 100644 --- a/src/corelib/concurrent/qthreadpool.h +++ b/src/corelib/concurrent/qthreadpool.h @@ -52,7 +52,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Core) class QThreadPoolPrivate; class Q_CORE_EXPORT QThreadPool : public QObject diff --git a/src/corelib/global/qendian.h b/src/corelib/global/qendian.h index b8a129a390a..5e22a4730a2 100644 --- a/src/corelib/global/qendian.h +++ b/src/corelib/global/qendian.h @@ -55,7 +55,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Core) /* * ENDIAN FUNCTIONS diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h index 66628317e10..a65e6747edc 100644 --- a/src/corelib/global/qglobal.h +++ b/src/corelib/global/qglobal.h @@ -143,13 +143,9 @@ namespace QT_NAMESPACE {} #if defined(Q_OS_MAC) && !defined(Q_CC_INTEL) #define QT_BEGIN_HEADER extern "C++" { #define QT_END_HEADER } -#define QT_BEGIN_INCLUDE_HEADER } -#define QT_END_INCLUDE_HEADER extern "C++" { #else #define QT_BEGIN_HEADER #define QT_END_HEADER -#define QT_BEGIN_INCLUDE_HEADER -#define QT_END_INCLUDE_HEADER extern "C++" #endif /* @@ -2440,138 +2436,7 @@ inline int qIntCast(float f) { return int(f); } Q_CORE_EXPORT void qsrand(uint seed); Q_CORE_EXPORT int qrand(); -/* - This gives us the possibility to check which modules the user can - use. These are purely compile time checks and will generate no code. -*/ - -/* Qt modules */ -#define QT_MODULE_CORE 0x000001 -#define QT_MODULE_GUI 0x000002 -#define QT_MODULE_NETWORK 0x000004 -#define QT_MODULE_OPENGL 0x000008 -#define QT_MODULE_SQL 0x000010 -#define QT_MODULE_XML 0x000020 -#define QT_MODULE_SVG 0x000100 -#define QT_MODULE_ACTIVEQT 0x000200 -#define QT_MODULE_GRAPHICSVIEW 0x000400 -#define QT_MODULE_SCRIPT 0x000800 -#define QT_MODULE_XMLPATTERNS 0x001000 -#define QT_MODULE_HELP 0x002000 -#define QT_MODULE_TEST 0x004000 -#define QT_MODULE_DBUS 0x008000 -#define QT_MODULE_SCRIPTTOOLS 0x010000 -#define QT_MODULE_OPENVG 0x020000 -#define QT_MODULE_MULTIMEDIA 0x040000 -#define QT_MODULE_DECLARATIVE 0x080000 - -/* Qt editions */ -#define QT_EDITION_CONSOLE (QT_MODULE_CORE \ - | QT_MODULE_NETWORK \ - | QT_MODULE_SQL \ - | QT_MODULE_SCRIPT \ - | QT_MODULE_MULTIMEDIA \ - | QT_MODULE_XML \ - | QT_MODULE_XMLPATTERNS \ - | QT_MODULE_TEST \ - | QT_MODULE_DBUS) -#define QT_EDITION_DESKTOPLIGHT (QT_MODULE_CORE \ - | QT_MODULE_GUI \ - | QT_MODULE_TEST \ - | QT_MODULE_DBUS) -#define QT_EDITION_OPENSOURCE (QT_MODULE_CORE \ - | QT_MODULE_GUI \ - | QT_MODULE_NETWORK \ - | QT_MODULE_OPENGL \ - | QT_MODULE_OPENVG \ - | QT_MODULE_SQL \ - | QT_MODULE_MULTIMEDIA \ - | QT_MODULE_XML \ - | QT_MODULE_XMLPATTERNS \ - | QT_MODULE_SCRIPT \ - | QT_MODULE_SCRIPTTOOLS \ - | QT_MODULE_SVG \ - | QT_MODULE_DECLARATIVE \ - | QT_MODULE_GRAPHICSVIEW \ - | QT_MODULE_HELP \ - | QT_MODULE_TEST \ - | QT_MODULE_DBUS \ - | QT_MODULE_ACTIVEQT) -#define QT_EDITION_DESKTOP (QT_EDITION_OPENSOURCE) -#define QT_EDITION_UNIVERSAL QT_EDITION_DESKTOP -#define QT_EDITION_ACADEMIC QT_EDITION_DESKTOP -#define QT_EDITION_EDUCATIONAL QT_EDITION_DESKTOP -#define QT_EDITION_EVALUATION QT_EDITION_DESKTOP - -/* Determine which modules can be used */ -#ifndef QT_EDITION -# ifdef QT_BUILD_QMAKE -# define QT_EDITION QT_EDITION_DESKTOP -# else -# error "Qt not configured correctly, please run configure" -# endif -#endif - -#define QT_LICENSED_MODULE(x) \ - enum QtValidLicenseFor##x##Module { Licensed##x = true }; - -/* qdoc is really unhappy with the following block of preprocessor checks, - making it difficult to document classes properly after this point. */ - -#if (QT_EDITION & QT_MODULE_CORE) -QT_LICENSED_MODULE(Core) -#endif -#if (QT_EDITION & QT_MODULE_GUI) -QT_LICENSED_MODULE(Gui) -#endif -#if (QT_EDITION & QT_MODULE_NETWORK) -QT_LICENSED_MODULE(Network) -#endif -#if (QT_EDITION & QT_MODULE_OPENGL) -QT_LICENSED_MODULE(OpenGL) -#endif -#if (QT_EDITION & QT_MODULE_OPENVG) -QT_LICENSED_MODULE(OpenVG) -#endif -#if (QT_EDITION & QT_MODULE_SQL) -QT_LICENSED_MODULE(Sql) -#endif -#if (QT_EDITION & QT_MODULE_MULTIMEDIA) -QT_LICENSED_MODULE(Multimedia) -#endif -#if (QT_EDITION & QT_MODULE_XML) -QT_LICENSED_MODULE(Xml) -#endif -#if (QT_EDITION & QT_MODULE_XMLPATTERNS) -QT_LICENSED_MODULE(XmlPatterns) -#endif -#if (QT_EDITION & QT_MODULE_HELP) -QT_LICENSED_MODULE(Help) -#endif -#if (QT_EDITION & QT_MODULE_SCRIPT) || defined(QT_BUILD_QMAKE) -QT_LICENSED_MODULE(Script) -#endif -#if (QT_EDITION & QT_MODULE_SCRIPTTOOLS) -QT_LICENSED_MODULE(ScriptTools) -#endif -#if (QT_EDITION & QT_MODULE_SVG) -QT_LICENSED_MODULE(Svg) -#endif -#if (QT_EDITION & QT_MODULE_DECLARATIVE) -QT_LICENSED_MODULE(Declarative) -#endif -#if (QT_EDITION & QT_MODULE_ACTIVEQT) -QT_LICENSED_MODULE(ActiveQt) -#endif -#if (QT_EDITION & QT_MODULE_TEST) -QT_LICENSED_MODULE(Test) -#endif -#if (QT_EDITION & QT_MODULE_DBUS) -QT_LICENSED_MODULE(DBus) -#endif - -#define QT_MODULE(x) \ - typedef QtValidLicenseFor##x##Module Qt##x##Module; +#define QT_MODULE(x) #ifdef QT_NO_CONCURRENT # define QT_NO_QFUTURE diff --git a/src/corelib/global/qlibraryinfo.h b/src/corelib/global/qlibraryinfo.h index 4da85b0dd23..8a8705f065e 100644 --- a/src/corelib/global/qlibraryinfo.h +++ b/src/corelib/global/qlibraryinfo.h @@ -49,7 +49,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Core) #ifndef QT_NO_SETTINGS diff --git a/src/corelib/global/qnamespace.h b/src/corelib/global/qnamespace.h index 3107d50bd9f..0986b19a2df 100644 --- a/src/corelib/global/qnamespace.h +++ b/src/corelib/global/qnamespace.h @@ -48,7 +48,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Core) #ifndef Q_MOC_RUN namespace diff --git a/src/corelib/global/qnumeric.h b/src/corelib/global/qnumeric.h index 2e72ff34f2b..2a6312291ad 100644 --- a/src/corelib/global/qnumeric.h +++ b/src/corelib/global/qnumeric.h @@ -48,7 +48,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Core) Q_CORE_EXPORT bool qIsInf(double d); Q_CORE_EXPORT bool qIsNaN(double d); diff --git a/src/corelib/io/qabstractfileengine.h b/src/corelib/io/qabstractfileengine.h index ed53ef11217..2073feac388 100644 --- a/src/corelib/io/qabstractfileengine.h +++ b/src/corelib/io/qabstractfileengine.h @@ -52,7 +52,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Core) class QFileExtension; class QFileExtensionResult; diff --git a/src/corelib/io/qbuffer.h b/src/corelib/io/qbuffer.h index ac9fbebd520..74d4fffa071 100644 --- a/src/corelib/io/qbuffer.h +++ b/src/corelib/io/qbuffer.h @@ -49,7 +49,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Core) class QObject; class QBufferPrivate; diff --git a/src/corelib/io/qdatastream.h b/src/corelib/io/qdatastream.h index 6d9bc5738f9..ca10304b301 100644 --- a/src/corelib/io/qdatastream.h +++ b/src/corelib/io/qdatastream.h @@ -54,7 +54,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Core) class QByteArray; class QIODevice; diff --git a/src/corelib/io/qdebug.h b/src/corelib/io/qdebug.h index 8e13c7e2ae8..161bb877db4 100644 --- a/src/corelib/io/qdebug.h +++ b/src/corelib/io/qdebug.h @@ -57,7 +57,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Core) class Q_CORE_EXPORT QDebug { diff --git a/src/corelib/io/qdir.h b/src/corelib/io/qdir.h index 503894f1e25..9022e30dad1 100644 --- a/src/corelib/io/qdir.h +++ b/src/corelib/io/qdir.h @@ -51,7 +51,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Core) class QDirPrivate; diff --git a/src/corelib/io/qdiriterator.h b/src/corelib/io/qdiriterator.h index d23aefe742f..3b0d7f6f641 100644 --- a/src/corelib/io/qdiriterator.h +++ b/src/corelib/io/qdiriterator.h @@ -48,7 +48,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Core) class QDirIteratorPrivate; class Q_CORE_EXPORT QDirIterator { diff --git a/src/corelib/io/qfile.h b/src/corelib/io/qfile.h index c0547a7feef..64f86bcb1eb 100644 --- a/src/corelib/io/qfile.h +++ b/src/corelib/io/qfile.h @@ -57,7 +57,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Core) class QAbstractFileEngine; class QFilePrivate; diff --git a/src/corelib/io/qfileinfo.h b/src/corelib/io/qfileinfo.h index 75767f8091a..72fdc59b3a8 100644 --- a/src/corelib/io/qfileinfo.h +++ b/src/corelib/io/qfileinfo.h @@ -50,7 +50,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Core) class QDir; class QDirIteratorPrivate; diff --git a/src/corelib/io/qfilesystemwatcher.h b/src/corelib/io/qfilesystemwatcher.h index ea2e73e71d2..73fef383c09 100644 --- a/src/corelib/io/qfilesystemwatcher.h +++ b/src/corelib/io/qfilesystemwatcher.h @@ -50,7 +50,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Core) class QFileSystemWatcherPrivate; diff --git a/src/corelib/io/qfsfileengine.h b/src/corelib/io/qfsfileengine.h index 0f72360e6d6..837ed5cba4d 100644 --- a/src/corelib/io/qfsfileengine.h +++ b/src/corelib/io/qfsfileengine.h @@ -53,7 +53,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Core) class QFSFileEnginePrivate; diff --git a/src/corelib/io/qiodevice.h b/src/corelib/io/qiodevice.h index 940755c4963..526c9c87438 100644 --- a/src/corelib/io/qiodevice.h +++ b/src/corelib/io/qiodevice.h @@ -58,7 +58,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Core) class QByteArray; class QIODevicePrivate; diff --git a/src/corelib/io/qprocess.h b/src/corelib/io/qprocess.h index 16acee9c372..8f74aca03cc 100644 --- a/src/corelib/io/qprocess.h +++ b/src/corelib/io/qprocess.h @@ -50,7 +50,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Core) #ifndef QT_NO_PROCESS diff --git a/src/corelib/io/qresource.h b/src/corelib/io/qresource.h index b3f5081cf98..ee363710689 100644 --- a/src/corelib/io/qresource.h +++ b/src/corelib/io/qresource.h @@ -51,7 +51,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Core) class QResourcePrivate; diff --git a/src/corelib/io/qsettings.h b/src/corelib/io/qsettings.h index 1c6448b062d..f23f2d23e24 100644 --- a/src/corelib/io/qsettings.h +++ b/src/corelib/io/qsettings.h @@ -49,7 +49,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Core) QT_END_NAMESPACE #ifndef QT_NO_SETTINGS diff --git a/src/corelib/io/qstandardpaths.h b/src/corelib/io/qstandardpaths.h index ad125d48d21..bdb8ce0b315 100644 --- a/src/corelib/io/qstandardpaths.h +++ b/src/corelib/io/qstandardpaths.h @@ -48,7 +48,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Core) #ifndef QT_NO_STANDARDPATHS diff --git a/src/corelib/io/qtemporarydir.h b/src/corelib/io/qtemporarydir.h index a8b26831b93..0a9bab0881b 100644 --- a/src/corelib/io/qtemporarydir.h +++ b/src/corelib/io/qtemporarydir.h @@ -49,7 +49,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Core) #ifndef QT_NO_TEMPORARYFILE diff --git a/src/corelib/io/qtemporaryfile.h b/src/corelib/io/qtemporaryfile.h index e8d34115d63..086bdaeb225 100644 --- a/src/corelib/io/qtemporaryfile.h +++ b/src/corelib/io/qtemporaryfile.h @@ -53,7 +53,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Core) #ifndef QT_NO_TEMPORARYFILE diff --git a/src/corelib/io/qtextstream.h b/src/corelib/io/qtextstream.h index ba25a2b6f26..5678279afff 100644 --- a/src/corelib/io/qtextstream.h +++ b/src/corelib/io/qtextstream.h @@ -58,7 +58,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Core) class QTextCodec; class QTextDecoder; diff --git a/src/corelib/io/qurl.h b/src/corelib/io/qurl.h index 23604dc88e8..a47272c193f 100644 --- a/src/corelib/io/qurl.h +++ b/src/corelib/io/qurl.h @@ -52,7 +52,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Core) class QUrlPrivate; class QDataStream; diff --git a/src/corelib/io/qwindowspipereader_p.h b/src/corelib/io/qwindowspipereader_p.h index 2d979c337b0..b76f306dc41 100644 --- a/src/corelib/io/qwindowspipereader_p.h +++ b/src/corelib/io/qwindowspipereader_p.h @@ -64,7 +64,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Core) class QWinOverlappedIoNotifier; diff --git a/src/corelib/io/qwindowspipewriter_p.h b/src/corelib/io/qwindowspipewriter_p.h index ae274a74f69..4d3782e4329 100644 --- a/src/corelib/io/qwindowspipewriter_p.h +++ b/src/corelib/io/qwindowspipewriter_p.h @@ -63,7 +63,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Core) #ifndef QT_NO_THREAD diff --git a/src/corelib/itemmodels/qabstractitemmodel.h b/src/corelib/itemmodels/qabstractitemmodel.h index 36de591b8af..f7702022133 100644 --- a/src/corelib/itemmodels/qabstractitemmodel.h +++ b/src/corelib/itemmodels/qabstractitemmodel.h @@ -51,7 +51,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Core) class QAbstractItemModel; class QPersistentModelIndex; diff --git a/src/corelib/itemmodels/qabstractproxymodel.h b/src/corelib/itemmodels/qabstractproxymodel.h index 97fd3e12704..8d7eb41445c 100644 --- a/src/corelib/itemmodels/qabstractproxymodel.h +++ b/src/corelib/itemmodels/qabstractproxymodel.h @@ -48,7 +48,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Core) #ifndef QT_NO_PROXYMODEL diff --git a/src/corelib/itemmodels/qidentityproxymodel.h b/src/corelib/itemmodels/qidentityproxymodel.h index c8c018f5541..9774d575825 100644 --- a/src/corelib/itemmodels/qidentityproxymodel.h +++ b/src/corelib/itemmodels/qidentityproxymodel.h @@ -51,7 +51,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Core) class QIdentityProxyModelPrivate; diff --git a/src/corelib/itemmodels/qitemselectionmodel.h b/src/corelib/itemmodels/qitemselectionmodel.h index 67fe8eee2ff..56969f94ca9 100644 --- a/src/corelib/itemmodels/qitemselectionmodel.h +++ b/src/corelib/itemmodels/qitemselectionmodel.h @@ -51,7 +51,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Core) #ifndef QT_NO_ITEMVIEWS diff --git a/src/corelib/itemmodels/qsortfilterproxymodel.h b/src/corelib/itemmodels/qsortfilterproxymodel.h index 212e173cec7..a25f5aa6e2b 100644 --- a/src/corelib/itemmodels/qsortfilterproxymodel.h +++ b/src/corelib/itemmodels/qsortfilterproxymodel.h @@ -52,7 +52,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Core) class QSortFilterProxyModelPrivate; class QSortFilterProxyModelLessThan; diff --git a/src/corelib/itemmodels/qstringlistmodel.h b/src/corelib/itemmodels/qstringlistmodel.h index 77251f24d7d..535006e6b99 100644 --- a/src/corelib/itemmodels/qstringlistmodel.h +++ b/src/corelib/itemmodels/qstringlistmodel.h @@ -49,7 +49,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Core) #ifndef QT_NO_STRINGLISTMODEL diff --git a/src/corelib/kernel/qabstracteventdispatcher.h b/src/corelib/kernel/qabstracteventdispatcher.h index df1d43e5d8d..badda593859 100644 --- a/src/corelib/kernel/qabstracteventdispatcher.h +++ b/src/corelib/kernel/qabstracteventdispatcher.h @@ -49,7 +49,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Core) class QAbstractEventDispatcherPrivate; class QSocketNotifier; diff --git a/src/corelib/kernel/qbasictimer.h b/src/corelib/kernel/qbasictimer.h index d6459c944e4..81af90dca82 100644 --- a/src/corelib/kernel/qbasictimer.h +++ b/src/corelib/kernel/qbasictimer.h @@ -49,7 +49,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Core) class QObject; diff --git a/src/corelib/kernel/qcoreapplication.h b/src/corelib/kernel/qcoreapplication.h index 15b9637eda1..4a07ffb5e1a 100644 --- a/src/corelib/kernel/qcoreapplication.h +++ b/src/corelib/kernel/qcoreapplication.h @@ -54,7 +54,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Core) class QCoreApplicationPrivate; class QTextCodec; diff --git a/src/corelib/kernel/qcoreevent.h b/src/corelib/kernel/qcoreevent.h index 9edeab85ffc..264a219cb49 100644 --- a/src/corelib/kernel/qcoreevent.h +++ b/src/corelib/kernel/qcoreevent.h @@ -50,7 +50,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Core) class QEventPrivate; class Q_CORE_EXPORT QEvent // event base class diff --git a/src/corelib/kernel/qeventloop.h b/src/corelib/kernel/qeventloop.h index b501db59373..d8429717d53 100644 --- a/src/corelib/kernel/qeventloop.h +++ b/src/corelib/kernel/qeventloop.h @@ -48,7 +48,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Core) class QEventLoopPrivate; diff --git a/src/corelib/kernel/qfunctions_nacl.h b/src/corelib/kernel/qfunctions_nacl.h index 56689fbec80..54170b7571f 100644 --- a/src/corelib/kernel/qfunctions_nacl.h +++ b/src/corelib/kernel/qfunctions_nacl.h @@ -56,7 +56,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Core) extern "C" { diff --git a/src/corelib/kernel/qfunctions_vxworks.h b/src/corelib/kernel/qfunctions_vxworks.h index ef6a30471c4..e5222dd42b8 100644 --- a/src/corelib/kernel/qfunctions_vxworks.h +++ b/src/corelib/kernel/qfunctions_vxworks.h @@ -65,7 +65,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE #ifdef QT_BUILD_CORE_LIB -QT_MODULE(Core) #endif QT_END_NAMESPACE diff --git a/src/corelib/kernel/qfunctions_wince.h b/src/corelib/kernel/qfunctions_wince.h index 3bfb86adcbc..d9542f96514 100644 --- a/src/corelib/kernel/qfunctions_wince.h +++ b/src/corelib/kernel/qfunctions_wince.h @@ -60,7 +60,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE #ifdef QT_BUILD_CORE_LIB -QT_MODULE(Core) #endif QT_END_NAMESPACE diff --git a/src/corelib/kernel/qmath.h b/src/corelib/kernel/qmath.h index b45e0a74fa9..8b5b445606f 100644 --- a/src/corelib/kernel/qmath.h +++ b/src/corelib/kernel/qmath.h @@ -50,7 +50,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Core) #define QT_SINE_TABLE_SIZE 256 diff --git a/src/corelib/kernel/qmetaobject.h b/src/corelib/kernel/qmetaobject.h index 0dec24ff292..3bdde84eceb 100644 --- a/src/corelib/kernel/qmetaobject.h +++ b/src/corelib/kernel/qmetaobject.h @@ -49,7 +49,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Core) template <typename T> class QList; diff --git a/src/corelib/kernel/qmetatype.h b/src/corelib/kernel/qmetatype.h index 7c38d1cd13d..5a55ca9bd7b 100644 --- a/src/corelib/kernel/qmetatype.h +++ b/src/corelib/kernel/qmetatype.h @@ -55,7 +55,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Core) // F is a tuple: (QMetaType::TypeName, QMetaType::TypeNameID, RealType) #define QT_FOR_EACH_STATIC_PRIMITIVE_TYPE(F)\ diff --git a/src/corelib/kernel/qmimedata.h b/src/corelib/kernel/qmimedata.h index 70a445b8782..e5b4148d3c6 100644 --- a/src/corelib/kernel/qmimedata.h +++ b/src/corelib/kernel/qmimedata.h @@ -49,7 +49,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Core) class QUrl; class QMimeDataPrivate; diff --git a/src/corelib/kernel/qobject.h b/src/corelib/kernel/qobject.h index fdcb956c117..31e42efad05 100644 --- a/src/corelib/kernel/qobject.h +++ b/src/corelib/kernel/qobject.h @@ -60,7 +60,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Core) class QEvent; class QTimerEvent; diff --git a/src/corelib/kernel/qobject_impl.h b/src/corelib/kernel/qobject_impl.h index 18e72e77aff..673f96b3f49 100644 --- a/src/corelib/kernel/qobject_impl.h +++ b/src/corelib/kernel/qobject_impl.h @@ -49,7 +49,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Core) namespace QtPrivate { template <typename T> struct RemoveRef { typedef T Type; }; diff --git a/src/corelib/kernel/qobjectcleanuphandler.h b/src/corelib/kernel/qobjectcleanuphandler.h index c78b6a482d4..2767efa592f 100644 --- a/src/corelib/kernel/qobjectcleanuphandler.h +++ b/src/corelib/kernel/qobjectcleanuphandler.h @@ -48,7 +48,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Core) class Q_CORE_EXPORT QObjectCleanupHandler : public QObject { diff --git a/src/corelib/kernel/qobjectdefs.h b/src/corelib/kernel/qobjectdefs.h index 52beac69534..38bc2008a8b 100644 --- a/src/corelib/kernel/qobjectdefs.h +++ b/src/corelib/kernel/qobjectdefs.h @@ -48,7 +48,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Core) class QByteArray; diff --git a/src/corelib/kernel/qpointer.h b/src/corelib/kernel/qpointer.h index 782d497db76..bf4c32d2c4c 100644 --- a/src/corelib/kernel/qpointer.h +++ b/src/corelib/kernel/qpointer.h @@ -48,7 +48,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Core) #if QT_DEPRECATED_SINCE(5,0) diff --git a/src/corelib/kernel/qsharedmemory.h b/src/corelib/kernel/qsharedmemory.h index 8a99352a5ae..0f0b3df9b50 100644 --- a/src/corelib/kernel/qsharedmemory.h +++ b/src/corelib/kernel/qsharedmemory.h @@ -48,7 +48,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Core) #ifndef QT_NO_SHAREDMEMORY diff --git a/src/corelib/kernel/qsignalmapper.h b/src/corelib/kernel/qsignalmapper.h index e5cbd264cea..d6b639094c7 100644 --- a/src/corelib/kernel/qsignalmapper.h +++ b/src/corelib/kernel/qsignalmapper.h @@ -48,7 +48,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Core) #ifndef QT_NO_SIGNALMAPPER class QSignalMapperPrivate; diff --git a/src/corelib/kernel/qsocketnotifier.h b/src/corelib/kernel/qsocketnotifier.h index cec029edc3d..0212f5f9813 100644 --- a/src/corelib/kernel/qsocketnotifier.h +++ b/src/corelib/kernel/qsocketnotifier.h @@ -48,7 +48,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Core) class Q_CORE_EXPORT QSocketNotifier : public QObject { diff --git a/src/corelib/kernel/qsystemsemaphore.h b/src/corelib/kernel/qsystemsemaphore.h index a8b69082e1c..dff3823f2c5 100644 --- a/src/corelib/kernel/qsystemsemaphore.h +++ b/src/corelib/kernel/qsystemsemaphore.h @@ -49,7 +49,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Core) #ifndef QT_NO_SYSTEMSEMAPHORE diff --git a/src/corelib/kernel/qtimer.h b/src/corelib/kernel/qtimer.h index ac94216ac76..c1d75cb1f37 100644 --- a/src/corelib/kernel/qtimer.h +++ b/src/corelib/kernel/qtimer.h @@ -51,7 +51,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Core) class Q_CORE_EXPORT QTimer : public QObject { diff --git a/src/corelib/kernel/qtranslator.h b/src/corelib/kernel/qtranslator.h index 306bf43e53e..a681ed01ecf 100644 --- a/src/corelib/kernel/qtranslator.h +++ b/src/corelib/kernel/qtranslator.h @@ -49,7 +49,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Core) #ifndef QT_NO_TRANSLATION diff --git a/src/corelib/kernel/qvariant.h b/src/corelib/kernel/qvariant.h index ff55f46b335..a23aaccfcc5 100644 --- a/src/corelib/kernel/qvariant.h +++ b/src/corelib/kernel/qvariant.h @@ -54,7 +54,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Core) class QBitArray; class QDataStream; diff --git a/src/corelib/kernel/qwineventnotifier.h b/src/corelib/kernel/qwineventnotifier.h index 0fb5b617f51..2c766eb5c0c 100644 --- a/src/corelib/kernel/qwineventnotifier.h +++ b/src/corelib/kernel/qwineventnotifier.h @@ -54,7 +54,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Core) class Q_CORE_EXPORT QWinEventNotifier : public QObject { diff --git a/src/corelib/plugin/qfactoryinterface.h b/src/corelib/plugin/qfactoryinterface.h index 92cfdf7906b..796bbd98d84 100644 --- a/src/corelib/plugin/qfactoryinterface.h +++ b/src/corelib/plugin/qfactoryinterface.h @@ -49,7 +49,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Core) struct Q_CORE_EXPORT QFactoryInterface { diff --git a/src/corelib/plugin/qlibrary.h b/src/corelib/plugin/qlibrary.h index 129414a13ee..46f00e3cacb 100644 --- a/src/corelib/plugin/qlibrary.h +++ b/src/corelib/plugin/qlibrary.h @@ -48,7 +48,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Core) #if defined(QT_NO_LIBRARY) && defined(Q_OS_WIN) #undef QT_NO_LIBRARY diff --git a/src/corelib/plugin/qplugin.h b/src/corelib/plugin/qplugin.h index e27d77b62e9..4bf49db3541 100644 --- a/src/corelib/plugin/qplugin.h +++ b/src/corelib/plugin/qplugin.h @@ -49,7 +49,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Core) #ifndef Q_EXTERN_C # ifdef __cplusplus diff --git a/src/corelib/plugin/qpluginloader.h b/src/corelib/plugin/qpluginloader.h index 60a664fc735..b504967c35b 100644 --- a/src/corelib/plugin/qpluginloader.h +++ b/src/corelib/plugin/qpluginloader.h @@ -55,7 +55,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Core) class QLibraryPrivate; diff --git a/src/corelib/plugin/quuid.h b/src/corelib/plugin/quuid.h index fdf289eb9df..d332d1d910a 100644 --- a/src/corelib/plugin/quuid.h +++ b/src/corelib/plugin/quuid.h @@ -63,7 +63,6 @@ typedef struct _GUID QT_BEGIN_NAMESPACE -QT_MODULE(Core) class Q_CORE_EXPORT QUuid { diff --git a/src/corelib/statemachine/qabstractstate.h b/src/corelib/statemachine/qabstractstate.h index 5e4e995cd8c..0b5b85fd31f 100644 --- a/src/corelib/statemachine/qabstractstate.h +++ b/src/corelib/statemachine/qabstractstate.h @@ -48,7 +48,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Core) #ifndef QT_NO_STATEMACHINE diff --git a/src/corelib/statemachine/qabstracttransition.h b/src/corelib/statemachine/qabstracttransition.h index 714d4dbb4d9..775e32c1281 100644 --- a/src/corelib/statemachine/qabstracttransition.h +++ b/src/corelib/statemachine/qabstracttransition.h @@ -50,7 +50,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Core) #ifndef QT_NO_STATEMACHINE diff --git a/src/corelib/statemachine/qeventtransition.h b/src/corelib/statemachine/qeventtransition.h index 8a6ac967cf3..451ea72c01b 100644 --- a/src/corelib/statemachine/qeventtransition.h +++ b/src/corelib/statemachine/qeventtransition.h @@ -49,7 +49,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Core) #ifndef QT_NO_STATEMACHINE diff --git a/src/corelib/statemachine/qfinalstate.h b/src/corelib/statemachine/qfinalstate.h index baf4520ee70..15a7caff61a 100644 --- a/src/corelib/statemachine/qfinalstate.h +++ b/src/corelib/statemachine/qfinalstate.h @@ -48,7 +48,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Core) #ifndef QT_NO_STATEMACHINE diff --git a/src/corelib/statemachine/qhistorystate.h b/src/corelib/statemachine/qhistorystate.h index 92994710e70..cc2ae95561d 100644 --- a/src/corelib/statemachine/qhistorystate.h +++ b/src/corelib/statemachine/qhistorystate.h @@ -48,7 +48,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Core) #ifndef QT_NO_STATEMACHINE diff --git a/src/corelib/statemachine/qsignaltransition.h b/src/corelib/statemachine/qsignaltransition.h index a8ce5e3ed87..fd5a54b5185 100644 --- a/src/corelib/statemachine/qsignaltransition.h +++ b/src/corelib/statemachine/qsignaltransition.h @@ -48,7 +48,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Core) #ifndef QT_NO_STATEMACHINE diff --git a/src/corelib/statemachine/qstate.h b/src/corelib/statemachine/qstate.h index 6348a24ce0e..0ac62741ef9 100644 --- a/src/corelib/statemachine/qstate.h +++ b/src/corelib/statemachine/qstate.h @@ -50,7 +50,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Core) #ifndef QT_NO_STATEMACHINE diff --git a/src/corelib/statemachine/qstatemachine.h b/src/corelib/statemachine/qstatemachine.h index 19261ec4673..52601a18b49 100644 --- a/src/corelib/statemachine/qstatemachine.h +++ b/src/corelib/statemachine/qstatemachine.h @@ -54,7 +54,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Core) #ifndef QT_NO_STATEMACHINE diff --git a/src/corelib/thread/qatomic.h b/src/corelib/thread/qatomic.h index 43cbe002aa9..8f8c6f76da6 100644 --- a/src/corelib/thread/qatomic.h +++ b/src/corelib/thread/qatomic.h @@ -50,7 +50,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Core) #if defined(__GNUC__) && (__GNUC__ * 100 + __GNUC_MINOR__ >= 406) # pragma GCC diagnostic push diff --git a/src/corelib/thread/qmutex.h b/src/corelib/thread/qmutex.h index 38775f962e5..c297db14a86 100644 --- a/src/corelib/thread/qmutex.h +++ b/src/corelib/thread/qmutex.h @@ -50,7 +50,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Core) #if !defined(QT_NO_THREAD) && !defined(qdoc) diff --git a/src/corelib/thread/qoldbasicatomic.h b/src/corelib/thread/qoldbasicatomic.h index 96feb2e4917..9825b2c936e 100644 --- a/src/corelib/thread/qoldbasicatomic.h +++ b/src/corelib/thread/qoldbasicatomic.h @@ -48,7 +48,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Core) #if 0 #pragma qt_no_master_include diff --git a/src/corelib/thread/qreadwritelock.h b/src/corelib/thread/qreadwritelock.h index d5211b6d9ce..201dce9dfde 100644 --- a/src/corelib/thread/qreadwritelock.h +++ b/src/corelib/thread/qreadwritelock.h @@ -49,7 +49,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Core) #ifndef QT_NO_THREAD diff --git a/src/corelib/thread/qsemaphore.h b/src/corelib/thread/qsemaphore.h index 4c4f251514c..8062b4a9deb 100644 --- a/src/corelib/thread/qsemaphore.h +++ b/src/corelib/thread/qsemaphore.h @@ -48,7 +48,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Core) #ifndef QT_NO_THREAD diff --git a/src/corelib/thread/qthread.h b/src/corelib/thread/qthread.h index 05eef4e9efd..7dbd90d25ff 100644 --- a/src/corelib/thread/qthread.h +++ b/src/corelib/thread/qthread.h @@ -50,7 +50,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Core) class QThreadData; class QThreadPrivate; diff --git a/src/corelib/thread/qthreadstorage.h b/src/corelib/thread/qthreadstorage.h index a08ce34aa1c..63593542e46 100644 --- a/src/corelib/thread/qthreadstorage.h +++ b/src/corelib/thread/qthreadstorage.h @@ -50,7 +50,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Core) class Q_CORE_EXPORT QThreadStorageData { diff --git a/src/corelib/thread/qwaitcondition.h b/src/corelib/thread/qwaitcondition.h index 798f156a9f2..697a27b444a 100644 --- a/src/corelib/thread/qwaitcondition.h +++ b/src/corelib/thread/qwaitcondition.h @@ -50,7 +50,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Core) #ifndef QT_NO_THREAD diff --git a/src/corelib/tools/qalgorithms.h b/src/corelib/tools/qalgorithms.h index 13b45d0c797..6d038955b9c 100644 --- a/src/corelib/tools/qalgorithms.h +++ b/src/corelib/tools/qalgorithms.h @@ -48,7 +48,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Core) /* Warning: The contents of QAlgorithmsPrivate is not a part of the public Qt API diff --git a/src/corelib/tools/qbitarray.h b/src/corelib/tools/qbitarray.h index 3501ff466cf..d946b6621f3 100644 --- a/src/corelib/tools/qbitarray.h +++ b/src/corelib/tools/qbitarray.h @@ -48,7 +48,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Core) class QBitRef; class Q_CORE_EXPORT QBitArray diff --git a/src/corelib/tools/qbytearray.h b/src/corelib/tools/qbytearray.h index 74b894ddfa5..46fc3685aa7 100644 --- a/src/corelib/tools/qbytearray.h +++ b/src/corelib/tools/qbytearray.h @@ -68,7 +68,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Core) /***************************************************************************** Safe and portable C string functions; extensions to standard string.h diff --git a/src/corelib/tools/qbytearraymatcher.h b/src/corelib/tools/qbytearraymatcher.h index 1d162745e40..29ddfc6641c 100644 --- a/src/corelib/tools/qbytearraymatcher.h +++ b/src/corelib/tools/qbytearraymatcher.h @@ -48,7 +48,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Core) class QByteArrayMatcherPrivate; diff --git a/src/corelib/tools/qcache.h b/src/corelib/tools/qcache.h index 7c9382f2a24..12b61cba81e 100644 --- a/src/corelib/tools/qcache.h +++ b/src/corelib/tools/qcache.h @@ -48,7 +48,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Core) template <class Key, class T> class QCache diff --git a/src/corelib/tools/qchar.h b/src/corelib/tools/qchar.h index 7f35fd42371..3a402dfdadc 100644 --- a/src/corelib/tools/qchar.h +++ b/src/corelib/tools/qchar.h @@ -48,7 +48,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Core) class QString; diff --git a/src/corelib/tools/qcontainerfwd.h b/src/corelib/tools/qcontainerfwd.h index c5d1c895a25..a80f3eaab0f 100644 --- a/src/corelib/tools/qcontainerfwd.h +++ b/src/corelib/tools/qcontainerfwd.h @@ -48,7 +48,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Core) template <class Key, class T> class QCache; template <class Key, class T> class QHash; diff --git a/src/corelib/tools/qcontiguouscache.h b/src/corelib/tools/qcontiguouscache.h index 3a92985a2d3..eecf4ebdae6 100644 --- a/src/corelib/tools/qcontiguouscache.h +++ b/src/corelib/tools/qcontiguouscache.h @@ -51,7 +51,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE #undef QT_QCONTIGUOUSCACHE_DEBUG -QT_MODULE(Core) struct Q_CORE_EXPORT QContiguousCacheData diff --git a/src/corelib/tools/qcryptographichash.h b/src/corelib/tools/qcryptographichash.h index 6781bcca538..951ece3cacd 100644 --- a/src/corelib/tools/qcryptographichash.h +++ b/src/corelib/tools/qcryptographichash.h @@ -48,7 +48,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Core) class QCryptographicHashPrivate; class QIODevice; diff --git a/src/corelib/tools/qdatetime.h b/src/corelib/tools/qdatetime.h index 0735dd92327..e60da887488 100644 --- a/src/corelib/tools/qdatetime.h +++ b/src/corelib/tools/qdatetime.h @@ -50,7 +50,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Core) class Q_CORE_EXPORT QDate { diff --git a/src/corelib/tools/qeasingcurve.h b/src/corelib/tools/qeasingcurve.h index 600a82a75f4..8d20f97666d 100644 --- a/src/corelib/tools/qeasingcurve.h +++ b/src/corelib/tools/qeasingcurve.h @@ -50,7 +50,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Core) class QEasingCurvePrivate; class QPointF; diff --git a/src/corelib/tools/qelapsedtimer.h b/src/corelib/tools/qelapsedtimer.h index 48499ca5f3e..12385dc737c 100644 --- a/src/corelib/tools/qelapsedtimer.h +++ b/src/corelib/tools/qelapsedtimer.h @@ -48,7 +48,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Core) class Q_CORE_EXPORT QElapsedTimer { diff --git a/src/corelib/tools/qfreelist_p.h b/src/corelib/tools/qfreelist_p.h index bf0776777a7..d8a0ad695e0 100644 --- a/src/corelib/tools/qfreelist_p.h +++ b/src/corelib/tools/qfreelist_p.h @@ -59,7 +59,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Core) /*! \internal diff --git a/src/corelib/tools/qhash.h b/src/corelib/tools/qhash.h index 8c5d509f8c9..5848afb7e4d 100644 --- a/src/corelib/tools/qhash.h +++ b/src/corelib/tools/qhash.h @@ -52,7 +52,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Core) class QBitArray; class QByteArray; diff --git a/src/corelib/tools/qiterator.h b/src/corelib/tools/qiterator.h index 48935b3fa76..04d4abc4022 100644 --- a/src/corelib/tools/qiterator.h +++ b/src/corelib/tools/qiterator.h @@ -53,7 +53,6 @@ namespace std { QT_BEGIN_NAMESPACE -QT_MODULE(Core) #define Q_DECLARE_SEQUENTIAL_ITERATOR(C) \ \ diff --git a/src/corelib/tools/qline.h b/src/corelib/tools/qline.h index 8887cbc70ba..0588076f201 100644 --- a/src/corelib/tools/qline.h +++ b/src/corelib/tools/qline.h @@ -48,7 +48,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Core) /******************************************************************************* * class QLine diff --git a/src/corelib/tools/qlinkedlist.h b/src/corelib/tools/qlinkedlist.h index cd5eb1356fa..909ccac303f 100644 --- a/src/corelib/tools/qlinkedlist.h +++ b/src/corelib/tools/qlinkedlist.h @@ -54,7 +54,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Core) struct Q_CORE_EXPORT QLinkedListData { diff --git a/src/corelib/tools/qlist.h b/src/corelib/tools/qlist.h index 7b3362a76dd..c0a044279b2 100644 --- a/src/corelib/tools/qlist.h +++ b/src/corelib/tools/qlist.h @@ -63,7 +63,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Core) template <typename T> class QVector; template <typename T> class QSet; diff --git a/src/corelib/tools/qlocale.h b/src/corelib/tools/qlocale.h index 42013819931..2f8d3eb7cad 100644 --- a/src/corelib/tools/qlocale.h +++ b/src/corelib/tools/qlocale.h @@ -50,7 +50,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Core) class QDataStream; class QDate; diff --git a/src/corelib/tools/qmap.h b/src/corelib/tools/qmap.h index f65260512bf..cecce2ca9e5 100644 --- a/src/corelib/tools/qmap.h +++ b/src/corelib/tools/qmap.h @@ -56,7 +56,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Core) struct Q_CORE_EXPORT QMapData { diff --git a/src/corelib/tools/qmargins.h b/src/corelib/tools/qmargins.h index 0b7bb6cc930..f1215be4da8 100644 --- a/src/corelib/tools/qmargins.h +++ b/src/corelib/tools/qmargins.h @@ -48,7 +48,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Core) class QMargins { diff --git a/src/corelib/tools/qpair.h b/src/corelib/tools/qpair.h index 50c704660ec..6596400f201 100644 --- a/src/corelib/tools/qpair.h +++ b/src/corelib/tools/qpair.h @@ -48,7 +48,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Core) template <class T1, class T2> struct QPair diff --git a/src/corelib/tools/qpodlist_p.h b/src/corelib/tools/qpodlist_p.h index 4aee4d6806a..c218df0a19e 100644 --- a/src/corelib/tools/qpodlist_p.h +++ b/src/corelib/tools/qpodlist_p.h @@ -59,7 +59,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Core) template <typename T, int Prealloc> class QPodList : public QVarLengthArray<T, Prealloc> diff --git a/src/corelib/tools/qpoint.h b/src/corelib/tools/qpoint.h index 3ad97e4de21..054d5cb61a6 100644 --- a/src/corelib/tools/qpoint.h +++ b/src/corelib/tools/qpoint.h @@ -48,7 +48,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Core) class Q_CORE_EXPORT QPoint { diff --git a/src/corelib/tools/qqueue.h b/src/corelib/tools/qqueue.h index 768bc22bcc6..890b7eba60b 100644 --- a/src/corelib/tools/qqueue.h +++ b/src/corelib/tools/qqueue.h @@ -48,7 +48,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Core) template <class T> class QQueue : public QList<T> diff --git a/src/corelib/tools/qrect.h b/src/corelib/tools/qrect.h index 212ada89ffb..6741a8082cf 100644 --- a/src/corelib/tools/qrect.h +++ b/src/corelib/tools/qrect.h @@ -53,7 +53,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Core) class Q_CORE_EXPORT QRect { diff --git a/src/corelib/tools/qrefcount.h b/src/corelib/tools/qrefcount.h index adfecf37f57..fece4633421 100644 --- a/src/corelib/tools/qrefcount.h +++ b/src/corelib/tools/qrefcount.h @@ -48,7 +48,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Core) namespace QtPrivate { diff --git a/src/corelib/tools/qregexp.h b/src/corelib/tools/qregexp.h index 5516429a55e..a0708af7097 100644 --- a/src/corelib/tools/qregexp.h +++ b/src/corelib/tools/qregexp.h @@ -50,7 +50,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Core) struct QRegExpPrivate; class QStringList; diff --git a/src/corelib/tools/qscopedpointer.h b/src/corelib/tools/qscopedpointer.h index 22758860e59..5d3912d1649 100644 --- a/src/corelib/tools/qscopedpointer.h +++ b/src/corelib/tools/qscopedpointer.h @@ -46,7 +46,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Core) template <typename T> struct QScopedPointerDeleter diff --git a/src/corelib/tools/qscopedpointer_p.h b/src/corelib/tools/qscopedpointer_p.h index dd099d8c674..ee2e4ab46d7 100644 --- a/src/corelib/tools/qscopedpointer_p.h +++ b/src/corelib/tools/qscopedpointer_p.h @@ -57,7 +57,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Core) /* Internal helper class - exposes the data through data_ptr (legacy from QShared). diff --git a/src/corelib/tools/qscopedvaluerollback.h b/src/corelib/tools/qscopedvaluerollback.h index 372af00f48f..48abd21ec1d 100644 --- a/src/corelib/tools/qscopedvaluerollback.h +++ b/src/corelib/tools/qscopedvaluerollback.h @@ -46,7 +46,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Core) template <typename T> class QScopedValueRollback diff --git a/src/corelib/tools/qset.h b/src/corelib/tools/qset.h index 3639741d705..d43255dbdc3 100644 --- a/src/corelib/tools/qset.h +++ b/src/corelib/tools/qset.h @@ -48,7 +48,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Core) template <class T> class QSet diff --git a/src/corelib/tools/qshareddata.h b/src/corelib/tools/qshareddata.h index 3efd0c4e689..90ca2cce5f9 100644 --- a/src/corelib/tools/qshareddata.h +++ b/src/corelib/tools/qshareddata.h @@ -49,7 +49,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Core) template <class T> class QSharedDataPointer; diff --git a/src/corelib/tools/qsharedpointer.h b/src/corelib/tools/qsharedpointer.h index dd540892c9f..363a2c48a58 100644 --- a/src/corelib/tools/qsharedpointer.h +++ b/src/corelib/tools/qsharedpointer.h @@ -54,7 +54,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Core) // These classes are here to fool qdoc into generating a better documentation diff --git a/src/corelib/tools/qsharedpointer_impl.h b/src/corelib/tools/qsharedpointer_impl.h index 78624498e9b..4cc38d232d7 100644 --- a/src/corelib/tools/qsharedpointer_impl.h +++ b/src/corelib/tools/qsharedpointer_impl.h @@ -52,7 +52,6 @@ // classes found in qsharedpointer.h QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Core) QT_END_NAMESPACE QT_END_HEADER #pragma qt_sync_stop_processing @@ -66,7 +65,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Core) // Macro QSHAREDPOINTER_VERIFY_AUTO_CAST // generates a compiler error if the following construct isn't valid: diff --git a/src/corelib/tools/qsimd_p.h b/src/corelib/tools/qsimd_p.h index 474b4e8d9b6..94e3acba81c 100644 --- a/src/corelib/tools/qsimd_p.h +++ b/src/corelib/tools/qsimd_p.h @@ -139,7 +139,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Core) enum CPUFeatures { None = 0, diff --git a/src/corelib/tools/qsize.h b/src/corelib/tools/qsize.h index 40977b059a5..af33db68e37 100644 --- a/src/corelib/tools/qsize.h +++ b/src/corelib/tools/qsize.h @@ -48,7 +48,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Core) class Q_CORE_EXPORT QSize { diff --git a/src/corelib/tools/qstack.h b/src/corelib/tools/qstack.h index 1a525ed3125..d6020b0c7f9 100644 --- a/src/corelib/tools/qstack.h +++ b/src/corelib/tools/qstack.h @@ -48,7 +48,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Core) template<class T> class QStack : public QVector<T> diff --git a/src/corelib/tools/qstring.h b/src/corelib/tools/qstring.h index ee8ce45cb2d..bc73a036adc 100644 --- a/src/corelib/tools/qstring.h +++ b/src/corelib/tools/qstring.h @@ -61,7 +61,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Core) class QCharRef; class QRegExp; diff --git a/src/corelib/tools/qstringbuilder.h b/src/corelib/tools/qstringbuilder.h index 2dfd8b9a550..fa1f81bec4e 100644 --- a/src/corelib/tools/qstringbuilder.h +++ b/src/corelib/tools/qstringbuilder.h @@ -57,7 +57,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Core) struct Q_CORE_EXPORT QAbstractConcatenable { diff --git a/src/corelib/tools/qstringlist.h b/src/corelib/tools/qstringlist.h index 9715fb7e5bd..93414d97e70 100644 --- a/src/corelib/tools/qstringlist.h +++ b/src/corelib/tools/qstringlist.h @@ -53,7 +53,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Core) class QRegExp; diff --git a/src/corelib/tools/qstringmatcher.h b/src/corelib/tools/qstringmatcher.h index a8448d0323d..143dacb958d 100644 --- a/src/corelib/tools/qstringmatcher.h +++ b/src/corelib/tools/qstringmatcher.h @@ -48,7 +48,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Core) class QStringMatcherPrivate; diff --git a/src/corelib/tools/qtextboundaryfinder.h b/src/corelib/tools/qtextboundaryfinder.h index 497775d983a..201df8b2a48 100644 --- a/src/corelib/tools/qtextboundaryfinder.h +++ b/src/corelib/tools/qtextboundaryfinder.h @@ -49,7 +49,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Core) class QTextBoundaryFinderPrivate; diff --git a/src/corelib/tools/qtimeline.h b/src/corelib/tools/qtimeline.h index 8e62ca845c0..ae3fde1c242 100644 --- a/src/corelib/tools/qtimeline.h +++ b/src/corelib/tools/qtimeline.h @@ -49,7 +49,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Core) class QTimeLinePrivate; class Q_CORE_EXPORT QTimeLine : public QObject diff --git a/src/corelib/tools/qvarlengtharray.h b/src/corelib/tools/qvarlengtharray.h index ada680fdb7a..7994bb282c1 100644 --- a/src/corelib/tools/qvarlengtharray.h +++ b/src/corelib/tools/qvarlengtharray.h @@ -53,7 +53,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Core) template<class T, int Prealloc> class QPodList; diff --git a/src/corelib/tools/qvector.h b/src/corelib/tools/qvector.h index ffe30470136..25f47001806 100644 --- a/src/corelib/tools/qvector.h +++ b/src/corelib/tools/qvector.h @@ -61,7 +61,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Core) struct Q_CORE_EXPORT QVectorData { diff --git a/src/corelib/xml/qxmlstream.h b/src/corelib/xml/qxmlstream.h index 752bde96e71..88bdabb0a81 100644 --- a/src/corelib/xml/qxmlstream.h +++ b/src/corelib/xml/qxmlstream.h @@ -54,7 +54,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Core) class Q_CORE_EXPORT QXmlStreamStringRef { QString m_string; diff --git a/src/dbus/qdbusabstractadaptor.h b/src/dbus/qdbusabstractadaptor.h index 4c72d67cf56..986ee2e0ecf 100644 --- a/src/dbus/qdbusabstractadaptor.h +++ b/src/dbus/qdbusabstractadaptor.h @@ -51,7 +51,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(DBus) class QDBusAbstractAdaptorPrivate; class Q_DBUS_EXPORT QDBusAbstractAdaptor: public QObject diff --git a/src/dbus/qdbusabstractinterface.h b/src/dbus/qdbusabstractinterface.h index 9deeaed5c0c..4adc59290d8 100644 --- a/src/dbus/qdbusabstractinterface.h +++ b/src/dbus/qdbusabstractinterface.h @@ -57,7 +57,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(DBus) class QDBusError; class QDBusPendingCall; diff --git a/src/dbus/qdbusargument.h b/src/dbus/qdbusargument.h index 00f41740370..87b80baa20f 100644 --- a/src/dbus/qdbusargument.h +++ b/src/dbus/qdbusargument.h @@ -59,7 +59,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(DBus) class QDBusUnixFileDescriptor; diff --git a/src/dbus/qdbusconnection.h b/src/dbus/qdbusconnection.h index 9279c01f06e..3c0455598df 100644 --- a/src/dbus/qdbusconnection.h +++ b/src/dbus/qdbusconnection.h @@ -51,7 +51,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(DBus) namespace QDBus { diff --git a/src/dbus/qdbusconnectioninterface.h b/src/dbus/qdbusconnectioninterface.h index 1311153dca4..4b523cfbf85 100644 --- a/src/dbus/qdbusconnectioninterface.h +++ b/src/dbus/qdbusconnectioninterface.h @@ -53,7 +53,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(DBus) class QDBusConnection; class QString; diff --git a/src/dbus/qdbuscontext.h b/src/dbus/qdbuscontext.h index 17161c482f3..412e2bdce33 100644 --- a/src/dbus/qdbuscontext.h +++ b/src/dbus/qdbuscontext.h @@ -51,7 +51,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(DBus) class QDBusConnection; class QDBusMessage; diff --git a/src/dbus/qdbuserror.h b/src/dbus/qdbuserror.h index 9323ecb501e..7e71a2b54f6 100644 --- a/src/dbus/qdbuserror.h +++ b/src/dbus/qdbuserror.h @@ -53,7 +53,6 @@ struct DBusError; QT_BEGIN_NAMESPACE -QT_MODULE(DBus) class QDBusMessage; diff --git a/src/dbus/qdbusextratypes.h b/src/dbus/qdbusextratypes.h index 656487483cb..74286afd432 100644 --- a/src/dbus/qdbusextratypes.h +++ b/src/dbus/qdbusextratypes.h @@ -54,7 +54,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(DBus) // defined in qhash.cpp Q_CORE_EXPORT uint qHash(const QString &key); diff --git a/src/dbus/qdbusinterface.h b/src/dbus/qdbusinterface.h index 59879ad8069..a6612756eb2 100644 --- a/src/dbus/qdbusinterface.h +++ b/src/dbus/qdbusinterface.h @@ -51,7 +51,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(DBus) class QDBusInterfacePrivate; class Q_DBUS_EXPORT QDBusInterface: public QDBusAbstractInterface diff --git a/src/dbus/qdbusmacros.h b/src/dbus/qdbusmacros.h index aabc53ed59f..6dd2a5609d6 100644 --- a/src/dbus/qdbusmacros.h +++ b/src/dbus/qdbusmacros.h @@ -62,7 +62,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(DBus) QT_END_NAMESPACE QT_END_HEADER diff --git a/src/dbus/qdbusmessage.h b/src/dbus/qdbusmessage.h index bd075b6916c..95db6591dbd 100644 --- a/src/dbus/qdbusmessage.h +++ b/src/dbus/qdbusmessage.h @@ -53,7 +53,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(DBus) class QDBusMessagePrivate; class Q_DBUS_EXPORT QDBusMessage diff --git a/src/dbus/qdbusmetatype.h b/src/dbus/qdbusmetatype.h index 9d89af541e6..e4d7cb48603 100644 --- a/src/dbus/qdbusmetatype.h +++ b/src/dbus/qdbusmetatype.h @@ -51,7 +51,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(DBus) class Q_DBUS_EXPORT QDBusMetaType { diff --git a/src/dbus/qdbuspendingcall.h b/src/dbus/qdbuspendingcall.h index 386714fd85e..03e454a9955 100644 --- a/src/dbus/qdbuspendingcall.h +++ b/src/dbus/qdbuspendingcall.h @@ -55,7 +55,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(DBus) class QDBusConnection; class QDBusError; diff --git a/src/dbus/qdbuspendingreply.h b/src/dbus/qdbuspendingreply.h index cb330d20a8a..47fe211fcb5 100644 --- a/src/dbus/qdbuspendingreply.h +++ b/src/dbus/qdbuspendingreply.h @@ -53,7 +53,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(DBus) class Q_DBUS_EXPORT QDBusPendingReplyData: public QDBusPendingCall { diff --git a/src/dbus/qdbusreply.h b/src/dbus/qdbusreply.h index d47e1c27a06..f4f250b035a 100644 --- a/src/dbus/qdbusreply.h +++ b/src/dbus/qdbusreply.h @@ -57,7 +57,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(DBus) Q_DBUS_EXPORT void qDBusReplyFill(const QDBusMessage &reply, QDBusError &error, QVariant &data); diff --git a/src/dbus/qdbusserver.h b/src/dbus/qdbusserver.h index bfefe652cbe..c0e6146d55d 100644 --- a/src/dbus/qdbusserver.h +++ b/src/dbus/qdbusserver.h @@ -51,7 +51,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(DBus) class QDBusConnectionPrivate; class QDBusError; diff --git a/src/dbus/qdbusservicewatcher.h b/src/dbus/qdbusservicewatcher.h index e9dd5596aff..ea319206b76 100644 --- a/src/dbus/qdbusservicewatcher.h +++ b/src/dbus/qdbusservicewatcher.h @@ -51,7 +51,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(DBus) class QDBusConnection; diff --git a/src/dbus/qdbusunixfiledescriptor.h b/src/dbus/qdbusunixfiledescriptor.h index e62cd875f49..c8155a64193 100644 --- a/src/dbus/qdbusunixfiledescriptor.h +++ b/src/dbus/qdbusunixfiledescriptor.h @@ -56,7 +56,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(DBus) class QDBusUnixFileDescriptorPrivate; template<> QExplicitlySharedDataPointer<QDBusUnixFileDescriptorPrivate>::~QExplicitlySharedDataPointer(); diff --git a/src/dbus/qdbusvirtualobject.h b/src/dbus/qdbusvirtualobject.h index a8f3e24fd28..5fa2dcc5078 100644 --- a/src/dbus/qdbusvirtualobject.h +++ b/src/dbus/qdbusvirtualobject.h @@ -52,7 +52,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(DBus) class QDBusMessage; class QDBusConnection; diff --git a/src/gui/accessible/qaccessible.h b/src/gui/accessible/qaccessible.h index e8cdb5501f5..5fa6affab96 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 23a635e2f98..724d52c83be 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 a3301247dc6..0ed9a2b6c8b 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 b2ac6c02e41..80a5c8d0d32 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 5939c676d01..1b0a66bb9d8 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 a33e2052424..25da28ce7c7 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 2fbc50fb7d0..9a03ed5856a 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 74114847e76..6a4017edb66 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 c69f7038909..5d3d55f0dd8 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 e61dfd24dbd..84fd8949ce6 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 09a64765a10..0b9b31dd70c 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 315e047ea2a..94664cfcc56 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 e6819c8fd33..a4dfbf1d73c 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 135ec23b529..6e9fdc275bb 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 7f0e81013cd..0172f790b5a 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 a8b2349786b..cb95a17d477 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 948891bbfb8..944d358a308 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 29d838a667d..9d0832c838e 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 49b13f3165e..07b38f8c35c 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 c857924457c..5be096bea04 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 8f0d76a58d2..101f580e2df 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 a6b368c078a..3aa22fe595d 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 2e9522187db..79fdd569d37 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 724f9af6cb7..e06df1de583 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 7881d8a9555..d771b55a4f4 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 ccdf77b2212..5cfe75d030a 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 37689299411..8f1a5eb36b3 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 29fed4400c4..2d86a6db31c 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 09cfbb2b4f8..bd5fae989b8 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 61d521a0524..e2ebb3e312d 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 18c2dc4ace8..d7e86d1606b 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 2f1e8e0e4ac..446eddc7d71 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 3670005d286..caab8f107f9 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 6d90d29eefa..4571c28ea4c 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 b8ff655534a..fc1a59daa3b 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 b2f35a440d8..370d7f0bb2c 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 754597b0ac5..f10e07d5f1e 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 178a1626a55..c168e383593 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 9a8edd27789..772fbdf06f4 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 04cc2ccc399..cf7150c888b 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 ad7c95a11ea..b2493629786 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 67720c2028a..42151a1270a 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 53243f3cdfb..606cd275118 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 497afe6238d..d6299e642fa 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 de5c955eba2..760b6ea08a7 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 aa3d750b416..a6b6b39f61a 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 a36e592e162..cfaef9d5204 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 0be45016714..58d6bcd1cab 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 82947305fae..e260c744bf8 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 c88d54ee11b..55f07ce6dc4 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 c589d4443e2..03e592a16d8 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 3bdaf521cda..ac6e1fa2aa2 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 088192d7149..1de5105b1c6 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 2e28205f862..6313f01f801 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 907340cc608..a6f8b9c6881 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 4b242abba51..624955aa3ea 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 43ce4c8585c..059a170baaf 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 d771636da71..ffceefba539 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 4e6d578f2a1..648afe3428d 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 95fe6185f7f..c066d1f5a8c 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 c86d300e2bc..4ac14afe2ee 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 692d7f8b0c5..46a48fd952d 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 f7d5952b47c..d12f7a9551c 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 c108d2f6b00..843a7585143 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 d76eb47be92..1c7b8c1024a 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 4f8626da26c..d800cc4416b 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 c4faceb7bf4..0c91579ed52 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 fb27f7b91d4..59bf34e9aa6 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 bcc650a5fe2..bd413f70022 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 c1c6a71b3cf..28b2f8240a7 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 8d1b4abec5d..99b35a3a93d 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 7738f6bb2ef..e9259d9b2a2 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 c0acedd53ce..404dcb11287 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 9ea796059e9..69b5f4eae70 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 e9214dab562..d4d6f54844e 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 2e5d94a4935..931b4374f3e 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 bc6a1377b08..823f52b8986 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 94b557dd235..897a7a83b32 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 a4ef52700f9..d756304e455 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 e206b2b2093..f5c6cbb7c8d 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 a3fadd371eb..633ece87504 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 ffc93146fe4..16f4df2d39d 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 1ace6242c88..e933a661e99 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 3d901d5ec7b..c198c4f286d 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 9234631c7cc..b463f377537 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 36f4f34b349..09df0755f24 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 935e0cdd7e6..309d821d607 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 45854f1d334..b28d2a5c6e7 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 00bc13727b8..6d899cb752a 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 b48b95b4a4a..aeed33a2b04 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 78b98a698f5..01393fa7aef 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 fa0a13c06b5..3d0dc46163f 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 f55bf72813f..344f3353986 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 b8d4e2340cc..58ba909c059 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 93ab2fbba30..2e05c0c0dc5 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 f478a7751cb..332175d65a3 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 15a503cc589..9014775331a 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 4b1fd27a480..2c4511bd22f 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 9df8d8f3235..c627c56e4f6 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 f900eb719fc..9a463e41437 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 b19e94ba4b0..a7451d94810 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 0e3c24c6eef..f2a17b98841 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 323b35020a4..4c97acca0c6 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 ab31f55c55a..0f24b0e4b85 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 4402d88cc57..0a6c09cf54f 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 631e9ea031c..40c32f382d1 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 278a9ec74bf..c5f0f1c96c6 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 fbcbd7f7294..dc8631ffa44 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 b64bbf76d77..efada98ab75 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 7ecbe783098..fddcb7f1940 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 ef5372bac8b..b3241b799fe 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 b6165084837..b396fd4d88c 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 dd4ba6b2e95..5837fc74fa8 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 6d22a2773e6..c1a3efcc3d4 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 b81d9738985..0a760c81288 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 a2240208275..e42ce428c78 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 3d76c40dd21..16bdcad7f7c 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 b8d7cd7098b..697d416c90e 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 c4393645251..96e985e9272 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 a5f6beec553..b8a6417251a 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 diff --git a/src/network/access/qabstractnetworkcache.h b/src/network/access/qabstractnetworkcache.h index 569c58e6cb9..2fb8458b695 100644 --- a/src/network/access/qabstractnetworkcache.h +++ b/src/network/access/qabstractnetworkcache.h @@ -51,7 +51,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Network) class QIODevice; class QDateTime; diff --git a/src/network/access/qftp_p.h b/src/network/access/qftp_p.h index 2ec78667a25..becf9369837 100644 --- a/src/network/access/qftp_p.h +++ b/src/network/access/qftp_p.h @@ -61,7 +61,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Network) #ifndef QT_NO_FTP diff --git a/src/network/access/qhttpmultipart.h b/src/network/access/qhttpmultipart.h index 2148ab0b733..fcc55350598 100644 --- a/src/network/access/qhttpmultipart.h +++ b/src/network/access/qhttpmultipart.h @@ -50,7 +50,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Network) class QHttpPartPrivate; class QHttpMultiPart; diff --git a/src/network/access/qnetworkaccessmanager.h b/src/network/access/qnetworkaccessmanager.h index daf957d25d5..c0bd21a5d10 100644 --- a/src/network/access/qnetworkaccessmanager.h +++ b/src/network/access/qnetworkaccessmanager.h @@ -48,7 +48,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Network) class QIODevice; class QAbstractNetworkCache; diff --git a/src/network/access/qnetworkcookie.h b/src/network/access/qnetworkcookie.h index cc222e37978..ff687977021 100644 --- a/src/network/access/qnetworkcookie.h +++ b/src/network/access/qnetworkcookie.h @@ -51,7 +51,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Network) class QByteArray; class QDateTime; diff --git a/src/network/access/qnetworkcookiejar.h b/src/network/access/qnetworkcookiejar.h index c9be31aad51..5f30f621799 100644 --- a/src/network/access/qnetworkcookiejar.h +++ b/src/network/access/qnetworkcookiejar.h @@ -49,7 +49,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Network) class QNetworkCookie; diff --git a/src/network/access/qnetworkdiskcache.h b/src/network/access/qnetworkdiskcache.h index 45c8a8fba5b..4cb0b9955c5 100644 --- a/src/network/access/qnetworkdiskcache.h +++ b/src/network/access/qnetworkdiskcache.h @@ -48,7 +48,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Network) #ifndef QT_NO_NETWORKDISKCACHE diff --git a/src/network/access/qnetworkreply.h b/src/network/access/qnetworkreply.h index 19ec2ff0135..2257849785a 100644 --- a/src/network/access/qnetworkreply.h +++ b/src/network/access/qnetworkreply.h @@ -53,7 +53,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Network) class QUrl; class QVariant; diff --git a/src/network/access/qnetworkrequest.h b/src/network/access/qnetworkrequest.h index 78c24c08ed0..e75f95f85b8 100644 --- a/src/network/access/qnetworkrequest.h +++ b/src/network/access/qnetworkrequest.h @@ -51,7 +51,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Network) class QSslConfiguration; diff --git a/src/network/bearer/qbearerplugin_p.h b/src/network/bearer/qbearerplugin_p.h index b6bcf2b07ea..d595fa1d889 100644 --- a/src/network/bearer/qbearerplugin_p.h +++ b/src/network/bearer/qbearerplugin_p.h @@ -64,7 +64,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Network) struct Q_NETWORK_EXPORT QBearerEngineFactoryInterface : public QFactoryInterface { diff --git a/src/network/bearer/qnetworkconfigmanager.h b/src/network/bearer/qnetworkconfigmanager.h index 5a7f2163196..2d34b85eb53 100644 --- a/src/network/bearer/qnetworkconfigmanager.h +++ b/src/network/bearer/qnetworkconfigmanager.h @@ -50,7 +50,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Network) class QNetworkConfigurationManagerPrivate; class Q_NETWORK_EXPORT QNetworkConfigurationManager : public QObject diff --git a/src/network/bearer/qnetworkconfiguration.h b/src/network/bearer/qnetworkconfiguration.h index e5087c093a8..72063cbd39a 100644 --- a/src/network/bearer/qnetworkconfiguration.h +++ b/src/network/bearer/qnetworkconfiguration.h @@ -51,7 +51,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Network) class QNetworkConfigurationPrivate; class Q_NETWORK_EXPORT QNetworkConfiguration diff --git a/src/network/bearer/qnetworksession.h b/src/network/bearer/qnetworksession.h index c95464f5587..ab4e8d3263f 100644 --- a/src/network/bearer/qnetworksession.h +++ b/src/network/bearer/qnetworksession.h @@ -58,7 +58,6 @@ QT_BEGIN_HEADER #include <QtCore/qshareddata.h> QT_BEGIN_NAMESPACE -QT_MODULE(Network) class QNetworkSessionPrivate; class Q_NETWORK_EXPORT QNetworkSession : public QObject diff --git a/src/network/kernel/qauthenticator.h b/src/network/kernel/qauthenticator.h index 3c3b4b6e93f..16e885ec42d 100644 --- a/src/network/kernel/qauthenticator.h +++ b/src/network/kernel/qauthenticator.h @@ -49,7 +49,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Network) class QAuthenticatorPrivate; class QUrl; diff --git a/src/network/kernel/qhostaddress.h b/src/network/kernel/qhostaddress.h index 212bf25de4b..61a268eac90 100644 --- a/src/network/kernel/qhostaddress.h +++ b/src/network/kernel/qhostaddress.h @@ -53,7 +53,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Network) class QHostAddressPrivate; diff --git a/src/network/kernel/qhostinfo.h b/src/network/kernel/qhostinfo.h index da8309285fc..40cfca87ccb 100644 --- a/src/network/kernel/qhostinfo.h +++ b/src/network/kernel/qhostinfo.h @@ -50,7 +50,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Network) class QObject; class QHostInfoPrivate; diff --git a/src/network/kernel/qnetworkinterface.h b/src/network/kernel/qnetworkinterface.h index d810fc8794c..95bd17580ca 100644 --- a/src/network/kernel/qnetworkinterface.h +++ b/src/network/kernel/qnetworkinterface.h @@ -52,7 +52,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Network) template<typename T> class QList; diff --git a/src/network/kernel/qnetworkproxy.h b/src/network/kernel/qnetworkproxy.h index 23818fd90a9..737dd46754d 100644 --- a/src/network/kernel/qnetworkproxy.h +++ b/src/network/kernel/qnetworkproxy.h @@ -52,7 +52,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Network) class QUrl; class QNetworkConfiguration; diff --git a/src/network/kernel/qurlinfo.h b/src/network/kernel/qurlinfo.h index d165624bc66..6dae02d71d1 100644 --- a/src/network/kernel/qurlinfo.h +++ b/src/network/kernel/qurlinfo.h @@ -50,7 +50,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Network) #ifndef QT_NO_URLINFO diff --git a/src/network/socket/qabstractsocket.h b/src/network/socket/qabstractsocket.h index 6d415d19972..6b85bd9c8cc 100644 --- a/src/network/socket/qabstractsocket.h +++ b/src/network/socket/qabstractsocket.h @@ -52,7 +52,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Network) class QHostAddress; #ifndef QT_NO_NETWORKPROXY diff --git a/src/network/socket/qlocalserver.h b/src/network/socket/qlocalserver.h index 3fc5a7cc550..aa19e2c5176 100644 --- a/src/network/socket/qlocalserver.h +++ b/src/network/socket/qlocalserver.h @@ -48,7 +48,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Network) #ifndef QT_NO_LOCALSERVER diff --git a/src/network/socket/qlocalsocket.h b/src/network/socket/qlocalsocket.h index 4a1624e96cc..094cd0ee5dc 100644 --- a/src/network/socket/qlocalsocket.h +++ b/src/network/socket/qlocalsocket.h @@ -49,7 +49,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Network) #ifndef QT_NO_LOCALSOCKET diff --git a/src/network/socket/qtcpserver.h b/src/network/socket/qtcpserver.h index 9f55f050db7..054633dffd4 100644 --- a/src/network/socket/qtcpserver.h +++ b/src/network/socket/qtcpserver.h @@ -50,7 +50,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Network) class QTcpServerPrivate; #ifndef QT_NO_NETWORKPROXY diff --git a/src/network/socket/qtcpsocket.h b/src/network/socket/qtcpsocket.h index e8f922deb63..6a7d4d58cad 100644 --- a/src/network/socket/qtcpsocket.h +++ b/src/network/socket/qtcpsocket.h @@ -49,7 +49,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Network) class QTcpSocketPrivate; diff --git a/src/network/socket/qudpsocket.h b/src/network/socket/qudpsocket.h index d080ceaea88..6f3292c6b2d 100644 --- a/src/network/socket/qudpsocket.h +++ b/src/network/socket/qudpsocket.h @@ -49,7 +49,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Network) #ifndef QT_NO_UDPSOCKET diff --git a/src/network/ssl/qssl.h b/src/network/ssl/qssl.h index d5fb018e705..e042b5f86dc 100644 --- a/src/network/ssl/qssl.h +++ b/src/network/ssl/qssl.h @@ -50,7 +50,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Network) namespace QSsl { enum KeyType { diff --git a/src/network/ssl/qsslcertificate.h b/src/network/ssl/qsslcertificate.h index 660d929f1aa..400bc10ed38 100644 --- a/src/network/ssl/qsslcertificate.h +++ b/src/network/ssl/qsslcertificate.h @@ -56,7 +56,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Network) #ifndef QT_NO_SSL diff --git a/src/network/ssl/qsslcertificateextension.h b/src/network/ssl/qsslcertificateextension.h index 3001a865e2d..dd731bf0ac1 100644 --- a/src/network/ssl/qsslcertificateextension.h +++ b/src/network/ssl/qsslcertificateextension.h @@ -51,7 +51,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Network) #ifndef QT_NO_SSL diff --git a/src/network/ssl/qsslcipher.h b/src/network/ssl/qsslcipher.h index 45ecc5468e0..9b05796e204 100644 --- a/src/network/ssl/qsslcipher.h +++ b/src/network/ssl/qsslcipher.h @@ -51,7 +51,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Network) #ifndef QT_NO_SSL diff --git a/src/network/ssl/qsslconfiguration.h b/src/network/ssl/qsslconfiguration.h index 8183e23ea75..e29c6b71f2b 100644 --- a/src/network/ssl/qsslconfiguration.h +++ b/src/network/ssl/qsslconfiguration.h @@ -65,7 +65,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Network) #ifndef QT_NO_SSL diff --git a/src/network/ssl/qsslerror.h b/src/network/ssl/qsslerror.h index 11775e76f28..94271326961 100644 --- a/src/network/ssl/qsslerror.h +++ b/src/network/ssl/qsslerror.h @@ -50,7 +50,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Network) #ifndef QT_NO_SSL diff --git a/src/network/ssl/qsslkey.h b/src/network/ssl/qsslkey.h index e1cfdd36044..9dcf6130548 100644 --- a/src/network/ssl/qsslkey.h +++ b/src/network/ssl/qsslkey.h @@ -52,7 +52,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Network) #ifndef QT_NO_SSL diff --git a/src/network/ssl/qsslsocket.h b/src/network/ssl/qsslsocket.h index 8e3b84e1eb4..cdd1e102178 100644 --- a/src/network/ssl/qsslsocket.h +++ b/src/network/ssl/qsslsocket.h @@ -54,7 +54,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Network) #ifndef QT_NO_SSL diff --git a/src/opengl/gl2paintengineex/qglcustomshaderstage_p.h b/src/opengl/gl2paintengineex/qglcustomshaderstage_p.h index 849602feaa5..b98e135ca0d 100644 --- a/src/opengl/gl2paintengineex/qglcustomshaderstage_p.h +++ b/src/opengl/gl2paintengineex/qglcustomshaderstage_p.h @@ -59,7 +59,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(OpenGL) class QGLCustomShaderStagePrivate; class Q_OPENGL_EXPORT QGLCustomShaderStage diff --git a/src/opengl/gl2paintengineex/qglengineshadermanager_p.h b/src/opengl/gl2paintengineex/qglengineshadermanager_p.h index 48764de3d06..809748bb137 100644 --- a/src/opengl/gl2paintengineex/qglengineshadermanager_p.h +++ b/src/opengl/gl2paintengineex/qglengineshadermanager_p.h @@ -232,7 +232,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(OpenGL) /* diff --git a/src/opengl/gl2paintengineex/qglengineshadersource_p.h b/src/opengl/gl2paintengineex/qglengineshadersource_p.h index 6ea2b2f9571..7e80b183ee6 100644 --- a/src/opengl/gl2paintengineex/qglengineshadersource_p.h +++ b/src/opengl/gl2paintengineex/qglengineshadersource_p.h @@ -60,7 +60,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(OpenGL) static const char* const qglslMainVertexShader = "\n\ diff --git a/src/opengl/gl2paintengineex/qglshadercache_meego_p.h b/src/opengl/gl2paintengineex/qglshadercache_meego_p.h index 36b9269f8b7..92d0cf9b209 100644 --- a/src/opengl/gl2paintengineex/qglshadercache_meego_p.h +++ b/src/opengl/gl2paintengineex/qglshadercache_meego_p.h @@ -400,7 +400,6 @@ static bool qt_cache_shader(const QGLShaderProgram *shader, const QGLContext *ct QT_BEGIN_NAMESPACE -QT_MODULE(OpenGL) class CachedShader { diff --git a/src/opengl/gl2paintengineex/qglshadercache_p.h b/src/opengl/gl2paintengineex/qglshadercache_p.h index 5ae5712be19..657dc93081a 100644 --- a/src/opengl/gl2paintengineex/qglshadercache_p.h +++ b/src/opengl/gl2paintengineex/qglshadercache_p.h @@ -63,7 +63,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(OpenGL) class QGLShaderProgram; class QGLContext; diff --git a/src/opengl/qgl.h b/src/opengl/qgl.h index 7121b801818..1979320fb13 100644 --- a/src/opengl/qgl.h +++ b/src/opengl/qgl.h @@ -80,7 +80,6 @@ typedef GLfloat GLdouble; QT_BEGIN_NAMESPACE -QT_MODULE(OpenGL) diff --git a/src/opengl/qglbuffer.h b/src/opengl/qglbuffer.h index fc598286bf3..c7a368ea75d 100644 --- a/src/opengl/qglbuffer.h +++ b/src/opengl/qglbuffer.h @@ -49,7 +49,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(OpenGL) class QGLBufferPrivate; diff --git a/src/opengl/qglcolormap.h b/src/opengl/qglcolormap.h index 1f9fe7cd333..4f76f338994 100644 --- a/src/opengl/qglcolormap.h +++ b/src/opengl/qglcolormap.h @@ -49,7 +49,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(OpenGL) class Q_OPENGL_EXPORT QGLColormap { diff --git a/src/opengl/qglframebufferobject.h b/src/opengl/qglframebufferobject.h index 3acf974c3ba..785065f65de 100644 --- a/src/opengl/qglframebufferobject.h +++ b/src/opengl/qglframebufferobject.h @@ -49,7 +49,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(OpenGL) class QGLFramebufferObjectPrivate; class QGLFramebufferObjectFormat; diff --git a/src/opengl/qglfunctions.h b/src/opengl/qglfunctions.h index 03c6d95b843..af6c583a105 100644 --- a/src/opengl/qglfunctions.h +++ b/src/opengl/qglfunctions.h @@ -53,7 +53,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(OpenGL) // Types that aren't defined in all system's gl.h files. typedef ptrdiff_t qgl_GLintptr; diff --git a/src/opengl/qglpixelbuffer.h b/src/opengl/qglpixelbuffer.h index ee7e46e6ea6..603364ec8b9 100644 --- a/src/opengl/qglpixelbuffer.h +++ b/src/opengl/qglpixelbuffer.h @@ -49,7 +49,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(OpenGL) class QGLPixelBufferPrivate; diff --git a/src/opengl/qglshaderprogram.h b/src/opengl/qglshaderprogram.h index 258da783164..bbc65778fed 100644 --- a/src/opengl/qglshaderprogram.h +++ b/src/opengl/qglshaderprogram.h @@ -52,7 +52,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(OpenGL) class QGLShaderProgram; class QGLShaderPrivate; diff --git a/src/opengl/qgraphicsshadereffect_p.h b/src/opengl/qgraphicsshadereffect_p.h index cc54702e156..a361c9e37a0 100644 --- a/src/opengl/qgraphicsshadereffect_p.h +++ b/src/opengl/qgraphicsshadereffect_p.h @@ -59,7 +59,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(OpenGL) class QGLShaderProgram; class QGLCustomShaderEffectStage; diff --git a/src/platformsupport/inputcontext/qplatforminputcontextfactory_qpa_p.h b/src/platformsupport/inputcontext/qplatforminputcontextfactory_qpa_p.h index 8dbae48b3bd..df6b119965e 100644 --- a/src/platformsupport/inputcontext/qplatforminputcontextfactory_qpa_p.h +++ b/src/platformsupport/inputcontext/qplatforminputcontextfactory_qpa_p.h @@ -59,7 +59,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Gui) class QPlatformInputContext; diff --git a/src/platformsupport/inputcontext/qplatforminputcontextplugin_qpa_p.h b/src/platformsupport/inputcontext/qplatforminputcontextplugin_qpa_p.h index d067029dd4f..262eb25c78d 100644 --- a/src/platformsupport/inputcontext/qplatforminputcontextplugin_qpa_p.h +++ b/src/platformsupport/inputcontext/qplatforminputcontextplugin_qpa_p.h @@ -60,7 +60,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Gui) class QPlatformInputContext; diff --git a/src/plugins/platforms/cocoa/qmacdefines_mac.h b/src/plugins/platforms/cocoa/qmacdefines_mac.h index 55e4e0fa49b..615f31525f2 100644 --- a/src/plugins/platforms/cocoa/qmacdefines_mac.h +++ b/src/plugins/platforms/cocoa/qmacdefines_mac.h @@ -83,7 +83,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Gui) QT_END_NAMESPACE diff --git a/src/printsupport/dialogs/qabstractpagesetupdialog.h b/src/printsupport/dialogs/qabstractpagesetupdialog.h index d7615f77a81..6a6bf7c9eb6 100644 --- a/src/printsupport/dialogs/qabstractpagesetupdialog.h +++ b/src/printsupport/dialogs/qabstractpagesetupdialog.h @@ -48,7 +48,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Gui) #ifndef QT_NO_PRINTDIALOG diff --git a/src/printsupport/dialogs/qabstractprintdialog.h b/src/printsupport/dialogs/qabstractprintdialog.h index 9f5f8189d75..3e223f32a85 100644 --- a/src/printsupport/dialogs/qabstractprintdialog.h +++ b/src/printsupport/dialogs/qabstractprintdialog.h @@ -48,7 +48,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Gui) #ifndef QT_NO_PRINTER diff --git a/src/printsupport/dialogs/qpagesetupdialog.h b/src/printsupport/dialogs/qpagesetupdialog.h index 5e5123e8819..a662d6ef5e2 100644 --- a/src/printsupport/dialogs/qpagesetupdialog.h +++ b/src/printsupport/dialogs/qpagesetupdialog.h @@ -48,7 +48,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Gui) #ifndef QT_NO_PRINTDIALOG diff --git a/src/printsupport/dialogs/qprintdialog.h b/src/printsupport/dialogs/qprintdialog.h index 7a86d0f4c80..0a2165f434d 100644 --- a/src/printsupport/dialogs/qprintdialog.h +++ b/src/printsupport/dialogs/qprintdialog.h @@ -48,7 +48,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Gui) #ifndef QT_NO_PRINTDIALOG diff --git a/src/printsupport/dialogs/qprintpreviewdialog.h b/src/printsupport/dialogs/qprintpreviewdialog.h index 35888de5860..0677c47689a 100644 --- a/src/printsupport/dialogs/qprintpreviewdialog.h +++ b/src/printsupport/dialogs/qprintpreviewdialog.h @@ -50,7 +50,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Gui) class QGraphicsView; class QPrintPreviewDialogPrivate; diff --git a/src/printsupport/kernel/qplatformprintersupport_qpa.h b/src/printsupport/kernel/qplatformprintersupport_qpa.h index 7aa55a7a5f7..2a9a3ed3c7c 100644 --- a/src/printsupport/kernel/qplatformprintersupport_qpa.h +++ b/src/printsupport/kernel/qplatformprintersupport_qpa.h @@ -48,7 +48,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Gui) #ifndef QT_NO_PRINTER diff --git a/src/printsupport/kernel/qplatformprintplugin_qpa.h b/src/printsupport/kernel/qplatformprintplugin_qpa.h index 8e2970643d4..19e3679514c 100644 --- a/src/printsupport/kernel/qplatformprintplugin_qpa.h +++ b/src/printsupport/kernel/qplatformprintplugin_qpa.h @@ -60,7 +60,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Gui) class QPlatformPrinterSupport; diff --git a/src/printsupport/kernel/qprintengine.h b/src/printsupport/kernel/qprintengine.h index 7fde2946a07..5a01a381da6 100644 --- a/src/printsupport/kernel/qprintengine.h +++ b/src/printsupport/kernel/qprintengine.h @@ -49,7 +49,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Gui) #ifndef QT_NO_PRINTER diff --git a/src/printsupport/kernel/qprinter.h b/src/printsupport/kernel/qprinter.h index 5519996a561..8efd701533e 100644 --- a/src/printsupport/kernel/qprinter.h +++ b/src/printsupport/kernel/qprinter.h @@ -50,7 +50,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Gui) #ifndef QT_NO_PRINTER diff --git a/src/printsupport/kernel/qprinterinfo.h b/src/printsupport/kernel/qprinterinfo.h index aef81ba3e86..80ee7d675fd 100644 --- a/src/printsupport/kernel/qprinterinfo.h +++ b/src/printsupport/kernel/qprinterinfo.h @@ -50,7 +50,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Gui) #ifndef QT_NO_PRINTER class QPrinterInfoPrivate; diff --git a/src/printsupport/widgets/qprintpreviewwidget.h b/src/printsupport/widgets/qprintpreviewwidget.h index 801caa4e6d3..1de55dfa546 100644 --- a/src/printsupport/widgets/qprintpreviewwidget.h +++ b/src/printsupport/widgets/qprintpreviewwidget.h @@ -51,7 +51,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Gui) class QPrintPreviewWidgetPrivate; diff --git a/src/sql/kernel/qsql.h b/src/sql/kernel/qsql.h index 0d3a95f1faf..3f0d75564ab 100644 --- a/src/sql/kernel/qsql.h +++ b/src/sql/kernel/qsql.h @@ -48,7 +48,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Sql) namespace QSql { diff --git a/src/sql/kernel/qsqldatabase.h b/src/sql/kernel/qsqldatabase.h index 058997db23d..5fad67e588c 100644 --- a/src/sql/kernel/qsqldatabase.h +++ b/src/sql/kernel/qsqldatabase.h @@ -49,7 +49,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Sql) class QSqlError; class QSqlDriver; diff --git a/src/sql/kernel/qsqldriver.h b/src/sql/kernel/qsqldriver.h index ee1ec69e54c..940e88c50dd 100644 --- a/src/sql/kernel/qsqldriver.h +++ b/src/sql/kernel/qsqldriver.h @@ -51,7 +51,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Sql) class QSqlDatabase; class QSqlDriverPrivate; diff --git a/src/sql/kernel/qsqldriverplugin.h b/src/sql/kernel/qsqldriverplugin.h index f29928522e3..4af6328a2a8 100644 --- a/src/sql/kernel/qsqldriverplugin.h +++ b/src/sql/kernel/qsqldriverplugin.h @@ -49,7 +49,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Sql) class QSqlDriver; diff --git a/src/sql/kernel/qsqlerror.h b/src/sql/kernel/qsqlerror.h index bbff8635b4a..ba3b5de3e05 100644 --- a/src/sql/kernel/qsqlerror.h +++ b/src/sql/kernel/qsqlerror.h @@ -48,7 +48,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Sql) class Q_SQL_EXPORT QSqlError { diff --git a/src/sql/kernel/qsqlfield.h b/src/sql/kernel/qsqlfield.h index 40a20a39bcf..38c56f9fbd2 100644 --- a/src/sql/kernel/qsqlfield.h +++ b/src/sql/kernel/qsqlfield.h @@ -49,7 +49,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Sql) class QSqlFieldPrivate; diff --git a/src/sql/kernel/qsqlindex.h b/src/sql/kernel/qsqlindex.h index bbebbd14b08..261b0316ef7 100644 --- a/src/sql/kernel/qsqlindex.h +++ b/src/sql/kernel/qsqlindex.h @@ -50,7 +50,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Sql) class Q_SQL_EXPORT QSqlIndex : public QSqlRecord { diff --git a/src/sql/kernel/qsqlquery.h b/src/sql/kernel/qsqlquery.h index 6f3fd9455da..5f888751828 100644 --- a/src/sql/kernel/qsqlquery.h +++ b/src/sql/kernel/qsqlquery.h @@ -50,7 +50,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Sql) class QVariant; class QSqlDriver; diff --git a/src/sql/kernel/qsqlrecord.h b/src/sql/kernel/qsqlrecord.h index 1663c9dc8cf..b2e9181aedf 100644 --- a/src/sql/kernel/qsqlrecord.h +++ b/src/sql/kernel/qsqlrecord.h @@ -48,7 +48,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Sql) class QSqlField; class QStringList; diff --git a/src/sql/kernel/qsqlresult.h b/src/sql/kernel/qsqlresult.h index 4f49527221a..bd9f7d13fa0 100644 --- a/src/sql/kernel/qsqlresult.h +++ b/src/sql/kernel/qsqlresult.h @@ -50,7 +50,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Sql) class QString; class QSqlRecord; diff --git a/src/sql/models/qsqlquerymodel.h b/src/sql/models/qsqlquerymodel.h index eafc2ed0bf8..76f4f059299 100644 --- a/src/sql/models/qsqlquerymodel.h +++ b/src/sql/models/qsqlquerymodel.h @@ -49,7 +49,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Sql) class QSqlQueryModelPrivate; class QSqlError; diff --git a/src/sql/models/qsqlrelationaldelegate.h b/src/sql/models/qsqlrelationaldelegate.h index f6647ca28d8..0884b1dbd9f 100644 --- a/src/sql/models/qsqlrelationaldelegate.h +++ b/src/sql/models/qsqlrelationaldelegate.h @@ -53,7 +53,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Sql) class QSqlRelationalDelegate: public QItemDelegate { diff --git a/src/sql/models/qsqlrelationaltablemodel.h b/src/sql/models/qsqlrelationaltablemodel.h index 0c3facb3a8b..408e0f7cd11 100644 --- a/src/sql/models/qsqlrelationaltablemodel.h +++ b/src/sql/models/qsqlrelationaltablemodel.h @@ -48,7 +48,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Sql) class Q_SQL_EXPORT QSqlRelation { diff --git a/src/sql/models/qsqltablemodel.h b/src/sql/models/qsqltablemodel.h index 98fe0f261ea..a2dbe73b565 100644 --- a/src/sql/models/qsqltablemodel.h +++ b/src/sql/models/qsqltablemodel.h @@ -49,7 +49,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Sql) class QSqlTableModelPrivate; class QSqlRecord; diff --git a/src/testlib/qbenchmark.h b/src/testlib/qbenchmark.h index 93ac011a733..d91fcf8f383 100644 --- a/src/testlib/qbenchmark.h +++ b/src/testlib/qbenchmark.h @@ -49,7 +49,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Test) namespace QTest { diff --git a/src/testlib/qbenchmarkmetric.h b/src/testlib/qbenchmarkmetric.h index 9ec7389b3b0..56f62f94797 100644 --- a/src/testlib/qbenchmarkmetric.h +++ b/src/testlib/qbenchmarkmetric.h @@ -48,7 +48,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Test) namespace QTest { diff --git a/src/testlib/qbenchmarkmetric_p.h b/src/testlib/qbenchmarkmetric_p.h index c0a9c1e2b45..c2a5dd40a6e 100644 --- a/src/testlib/qbenchmarkmetric_p.h +++ b/src/testlib/qbenchmarkmetric_p.h @@ -60,7 +60,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Test) namespace QTest { const char * benchmarkMetricName(QBenchmarkMetric metric); diff --git a/src/testlib/qsignalspy.h b/src/testlib/qsignalspy.h index 9534fafc061..d6673667b95 100644 --- a/src/testlib/qsignalspy.h +++ b/src/testlib/qsignalspy.h @@ -52,7 +52,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Test) class QVariant; diff --git a/src/testlib/qtest.h b/src/testlib/qtest.h index d67d3f0d34d..aade9529d38 100644 --- a/src/testlib/qtest.h +++ b/src/testlib/qtest.h @@ -64,7 +64,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Test) namespace QTest { diff --git a/src/testlib/qtest_global.h b/src/testlib/qtest_global.h index 4207493f290..d86c5e12e60 100644 --- a/src/testlib/qtest_global.h +++ b/src/testlib/qtest_global.h @@ -48,7 +48,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Test) #if !defined(QT_SHARED) && !defined(QT_DLL) # define Q_TESTLIB_EXPORT diff --git a/src/testlib/qtest_gui.h b/src/testlib/qtest_gui.h index 346b3ec6531..32502cc9a5f 100644 --- a/src/testlib/qtest_gui.h +++ b/src/testlib/qtest_gui.h @@ -73,7 +73,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Test) namespace QTest { diff --git a/src/testlib/qtestaccessible.h b/src/testlib/qtestaccessible.h index d20742157bb..de9fcc6e423 100644 --- a/src/testlib/qtestaccessible.h +++ b/src/testlib/qtestaccessible.h @@ -60,7 +60,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Test) class QObject; diff --git a/src/testlib/qtestassert.h b/src/testlib/qtestassert.h index ee989d1dbd4..c5f9efdd3dc 100644 --- a/src/testlib/qtestassert.h +++ b/src/testlib/qtestassert.h @@ -48,7 +48,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Test) #define QTEST_ASSERT(cond) do { if (!(cond)) qt_assert(#cond,__FILE__,__LINE__); } while (0) diff --git a/src/testlib/qtestcase.h b/src/testlib/qtestcase.h index 20e7bc9bafd..04b75e386b6 100644 --- a/src/testlib/qtestcase.h +++ b/src/testlib/qtestcase.h @@ -54,7 +54,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Test) #define QVERIFY(statement) \ do {\ diff --git a/src/testlib/qtestcoreelement_p.h b/src/testlib/qtestcoreelement_p.h index f7db07ac888..f5e04d66c58 100644 --- a/src/testlib/qtestcoreelement_p.h +++ b/src/testlib/qtestcoreelement_p.h @@ -60,7 +60,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Test) template <class ElementType> class QTestCoreElement: public QTestCoreList<ElementType> diff --git a/src/testlib/qtestcorelist_p.h b/src/testlib/qtestcorelist_p.h index 9723502d69e..32a5faaa972 100644 --- a/src/testlib/qtestcorelist_p.h +++ b/src/testlib/qtestcorelist_p.h @@ -59,7 +59,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Test) template <class T> class QTestCoreList diff --git a/src/testlib/qtestdata.h b/src/testlib/qtestdata.h index 654744acf0f..31843bf0bec 100644 --- a/src/testlib/qtestdata.h +++ b/src/testlib/qtestdata.h @@ -51,7 +51,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Test) class QTestTable; class QTestDataPrivate; diff --git a/src/testlib/qtestelement_p.h b/src/testlib/qtestelement_p.h index 0e355922744..bff88ce2764 100644 --- a/src/testlib/qtestelement_p.h +++ b/src/testlib/qtestelement_p.h @@ -59,7 +59,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Test) class QTestElement: public QTestCoreElement<QTestElement> { diff --git a/src/testlib/qtestelementattribute_p.h b/src/testlib/qtestelementattribute_p.h index 52fa1a2c230..310193607c5 100644 --- a/src/testlib/qtestelementattribute_p.h +++ b/src/testlib/qtestelementattribute_p.h @@ -59,7 +59,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Test) namespace QTest { diff --git a/src/testlib/qtestevent.h b/src/testlib/qtestevent.h index 4a0dfbef7f2..d51a30353a4 100644 --- a/src/testlib/qtestevent.h +++ b/src/testlib/qtestevent.h @@ -62,7 +62,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Test) class QTestEvent { diff --git a/src/testlib/qtesteventloop.h b/src/testlib/qtesteventloop.h index ab79368e1b2..92a8c1c5057 100644 --- a/src/testlib/qtesteventloop.h +++ b/src/testlib/qtesteventloop.h @@ -53,7 +53,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Test) class Q_TESTLIB_EXPORT QTestEventLoop : public QObject { diff --git a/src/testlib/qtestkeyboard.h b/src/testlib/qtestkeyboard.h index e6db251a02f..f2e516a22fd 100644 --- a/src/testlib/qtestkeyboard.h +++ b/src/testlib/qtestkeyboard.h @@ -67,7 +67,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Test) namespace QTest { diff --git a/src/testlib/qtestmouse.h b/src/testlib/qtestmouse.h index 429fab0b29e..04ae113513a 100644 --- a/src/testlib/qtestmouse.h +++ b/src/testlib/qtestmouse.h @@ -65,7 +65,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Test) namespace QTest { diff --git a/src/testlib/qtestspontaneevent.h b/src/testlib/qtestspontaneevent.h index b86f222eaf8..295042e1c3b 100644 --- a/src/testlib/qtestspontaneevent.h +++ b/src/testlib/qtestspontaneevent.h @@ -53,7 +53,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Test) #ifndef QTEST_NO_SIZEOF_CHECK template <int> diff --git a/src/testlib/qtestsystem.h b/src/testlib/qtestsystem.h index 189f7b7dd81..a2eee8b8a05 100644 --- a/src/testlib/qtestsystem.h +++ b/src/testlib/qtestsystem.h @@ -51,7 +51,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Test) class QWidget; #ifdef Q_WS_X11 diff --git a/src/testlib/qtesttouch.h b/src/testlib/qtesttouch.h index 308697ecfa0..ffbd7b22bd0 100644 --- a/src/testlib/qtesttouch.h +++ b/src/testlib/qtesttouch.h @@ -62,7 +62,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Test) namespace QTest { diff --git a/src/testlib/qtestxunitstreamer_p.h b/src/testlib/qtestxunitstreamer_p.h index f2c583770ca..64e138423fc 100644 --- a/src/testlib/qtestxunitstreamer_p.h +++ b/src/testlib/qtestxunitstreamer_p.h @@ -59,7 +59,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Test) class QTestElement; class QTestElementAttribute; diff --git a/src/widgets/accessible/qaccessiblewidget.h b/src/widgets/accessible/qaccessiblewidget.h index 2c0b27466e1..2e016e4a1b3 100644 --- a/src/widgets/accessible/qaccessiblewidget.h +++ b/src/widgets/accessible/qaccessiblewidget.h @@ -48,7 +48,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Gui) #ifndef QT_NO_ACCESSIBILITY diff --git a/src/widgets/dialogs/qcolordialog.h b/src/widgets/dialogs/qcolordialog.h index 6654d17ea17..c2cb0ed90aa 100644 --- a/src/widgets/dialogs/qcolordialog.h +++ b/src/widgets/dialogs/qcolordialog.h @@ -48,7 +48,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Gui) #ifndef QT_NO_COLORDIALOG diff --git a/src/widgets/dialogs/qdialog.h b/src/widgets/dialogs/qdialog.h index 7feaffdce7d..76c57ca88e1 100644 --- a/src/widgets/dialogs/qdialog.h +++ b/src/widgets/dialogs/qdialog.h @@ -48,7 +48,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Gui) class QPushButton; class QDialogPrivate; diff --git a/src/widgets/dialogs/qerrormessage.h b/src/widgets/dialogs/qerrormessage.h index 5f8a1383c2d..c0db4b3621c 100644 --- a/src/widgets/dialogs/qerrormessage.h +++ b/src/widgets/dialogs/qerrormessage.h @@ -48,7 +48,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Gui) #ifndef QT_NO_ERRORMESSAGE diff --git a/src/widgets/dialogs/qfiledialog.h b/src/widgets/dialogs/qfiledialog.h index 4d5d40b41ef..86050192c33 100644 --- a/src/widgets/dialogs/qfiledialog.h +++ b/src/widgets/dialogs/qfiledialog.h @@ -50,7 +50,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Gui) #ifndef QT_NO_FILEDIALOG diff --git a/src/widgets/dialogs/qfilesystemmodel.h b/src/widgets/dialogs/qfilesystemmodel.h index 51e03d2e795..594cf6cea1c 100644 --- a/src/widgets/dialogs/qfilesystemmodel.h +++ b/src/widgets/dialogs/qfilesystemmodel.h @@ -52,7 +52,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Gui) #ifndef QT_NO_FILESYSTEMMODEL diff --git a/src/widgets/dialogs/qfontdialog.h b/src/widgets/dialogs/qfontdialog.h index d45d84e467f..d09c00648cb 100644 --- a/src/widgets/dialogs/qfontdialog.h +++ b/src/widgets/dialogs/qfontdialog.h @@ -50,7 +50,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Gui) #ifndef QT_NO_FONTDIALOG diff --git a/src/widgets/dialogs/qinputdialog.h b/src/widgets/dialogs/qinputdialog.h index 3be8c370f2c..01a6619721c 100644 --- a/src/widgets/dialogs/qinputdialog.h +++ b/src/widgets/dialogs/qinputdialog.h @@ -50,7 +50,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Gui) #ifndef QT_NO_INPUTDIALOG diff --git a/src/widgets/dialogs/qmessagebox.h b/src/widgets/dialogs/qmessagebox.h index 760197c58f1..d72fb266f55 100644 --- a/src/widgets/dialogs/qmessagebox.h +++ b/src/widgets/dialogs/qmessagebox.h @@ -48,7 +48,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Gui) #ifndef QT_NO_MESSAGEBOX diff --git a/src/widgets/dialogs/qprogressdialog.h b/src/widgets/dialogs/qprogressdialog.h index 33dda9e405d..23c7ab2071c 100644 --- a/src/widgets/dialogs/qprogressdialog.h +++ b/src/widgets/dialogs/qprogressdialog.h @@ -48,7 +48,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Gui) #ifndef QT_NO_PROGRESSDIALOG diff --git a/src/widgets/dialogs/qwizard.h b/src/widgets/dialogs/qwizard.h index 9ff84f19071..fe9d5b2e3fd 100644 --- a/src/widgets/dialogs/qwizard.h +++ b/src/widgets/dialogs/qwizard.h @@ -48,7 +48,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Gui) #ifndef QT_NO_WIZARD diff --git a/src/widgets/effects/qgraphicseffect.h b/src/widgets/effects/qgraphicseffect.h index c4f8c661313..766d75946d5 100644 --- a/src/widgets/effects/qgraphicseffect.h +++ b/src/widgets/effects/qgraphicseffect.h @@ -53,7 +53,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Gui) class QGraphicsItem; class QStyleOption; diff --git a/src/widgets/effects/qpixmapfilter_p.h b/src/widgets/effects/qpixmapfilter_p.h index 2bdc4e17724..f055a489237 100644 --- a/src/widgets/effects/qpixmapfilter_p.h +++ b/src/widgets/effects/qpixmapfilter_p.h @@ -62,7 +62,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Gui) class QPainter; class QPlatformPixmap; diff --git a/src/widgets/graphicsview/graphicsview.pri b/src/widgets/graphicsview/graphicsview.pri index 547d7ce7ae5..a0fc4bc8d34 100644 --- a/src/widgets/graphicsview/graphicsview.pri +++ b/src/widgets/graphicsview/graphicsview.pri @@ -9,6 +9,7 @@ HEADERS += graphicsview/qgraphicsgridlayout.h \ graphicsview/qgraphicslayoutitem_p.h \ graphicsview/qgraphicslinearlayout.h \ graphicsview/qgraphicsproxywidget.h \ + graphicsview/qgraphicsproxywidget_p.h \ graphicsview/qgraphicsscene.h \ graphicsview/qgraphicsscene_bsp_p.h \ graphicsview/qgraphicsscene_p.h \ diff --git a/src/widgets/graphicsview/qgraphicsanchorlayout.h b/src/widgets/graphicsview/qgraphicsanchorlayout.h index 9843f654baa..4b0ddc292b4 100644 --- a/src/widgets/graphicsview/qgraphicsanchorlayout.h +++ b/src/widgets/graphicsview/qgraphicsanchorlayout.h @@ -50,9 +50,8 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Gui) -#if !defined(QT_NO_GRAPHICSVIEW) || (QT_EDITION & QT_MODULE_GRAPHICSVIEW) != QT_MODULE_GRAPHICSVIEW +#if !defined(QT_NO_GRAPHICSVIEW) class QGraphicsAnchorPrivate; class QGraphicsAnchorLayout; diff --git a/src/widgets/graphicsview/qgraphicsgridlayout.h b/src/widgets/graphicsview/qgraphicsgridlayout.h index d18ac726236..57933e43a12 100644 --- a/src/widgets/graphicsview/qgraphicsgridlayout.h +++ b/src/widgets/graphicsview/qgraphicsgridlayout.h @@ -49,9 +49,8 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Gui) -#if !defined(QT_NO_GRAPHICSVIEW) || (QT_EDITION & QT_MODULE_GRAPHICSVIEW) != QT_MODULE_GRAPHICSVIEW +#if !defined(QT_NO_GRAPHICSVIEW) class QGraphicsGridLayoutPrivate; diff --git a/src/widgets/graphicsview/qgraphicsitem.h b/src/widgets/graphicsview/qgraphicsitem.h index bf60831ab43..e054d9c4cdb 100644 --- a/src/widgets/graphicsview/qgraphicsitem.h +++ b/src/widgets/graphicsview/qgraphicsitem.h @@ -56,9 +56,8 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Gui) -#if !defined(QT_NO_GRAPHICSVIEW) || (QT_EDITION & QT_MODULE_GRAPHICSVIEW) != QT_MODULE_GRAPHICSVIEW +#if !defined(QT_NO_GRAPHICSVIEW) class QBrush; class QCursor; diff --git a/src/widgets/graphicsview/qgraphicsitem_p.h b/src/widgets/graphicsview/qgraphicsitem_p.h index 3aa8baefe9c..68e0f322ba5 100644 --- a/src/widgets/graphicsview/qgraphicsitem_p.h +++ b/src/widgets/graphicsview/qgraphicsitem_p.h @@ -65,7 +65,7 @@ #include <QtCore/qpoint.h> -#if !defined(QT_NO_GRAPHICSVIEW) || (QT_EDITION & QT_MODULE_GRAPHICSVIEW) != QT_MODULE_GRAPHICSVIEW +#if !defined(QT_NO_GRAPHICSVIEW) QT_BEGIN_NAMESPACE diff --git a/src/widgets/graphicsview/qgraphicsitemanimation.h b/src/widgets/graphicsview/qgraphicsitemanimation.h index 790ca9b56a1..64789f838b3 100644 --- a/src/widgets/graphicsview/qgraphicsitemanimation.h +++ b/src/widgets/graphicsview/qgraphicsitemanimation.h @@ -44,13 +44,12 @@ #include <QtCore/qobject.h> -#if !defined(QT_NO_GRAPHICSVIEW) || (QT_EDITION & QT_MODULE_GRAPHICSVIEW) != QT_MODULE_GRAPHICSVIEW +#if !defined(QT_NO_GRAPHICSVIEW) QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Gui) class QGraphicsItem; class QMatrix; diff --git a/src/widgets/graphicsview/qgraphicslayout.h b/src/widgets/graphicsview/qgraphicslayout.h index 782c6ca9ec1..958ec551f88 100644 --- a/src/widgets/graphicsview/qgraphicslayout.h +++ b/src/widgets/graphicsview/qgraphicslayout.h @@ -48,9 +48,8 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Gui) -#if !defined(QT_NO_GRAPHICSVIEW) || (QT_EDITION & QT_MODULE_GRAPHICSVIEW) != QT_MODULE_GRAPHICSVIEW +#if !defined(QT_NO_GRAPHICSVIEW) class QGraphicsLayoutPrivate; class QGraphicsLayoutItem; diff --git a/src/widgets/graphicsview/qgraphicslayout_p.h b/src/widgets/graphicsview/qgraphicslayout_p.h index 3c4908dc72f..b6185a7d693 100644 --- a/src/widgets/graphicsview/qgraphicslayout_p.h +++ b/src/widgets/graphicsview/qgraphicslayout_p.h @@ -55,7 +55,7 @@ #include <QtCore/qglobal.h> -#if !defined(QT_NO_GRAPHICSVIEW) || (QT_EDITION & QT_MODULE_GRAPHICSVIEW) != QT_MODULE_GRAPHICSVIEW +#if !defined(QT_NO_GRAPHICSVIEW) #include "qgraphicslayout.h" #include "qgraphicslayoutitem_p.h" diff --git a/src/widgets/graphicsview/qgraphicslayoutitem.h b/src/widgets/graphicsview/qgraphicslayoutitem.h index 19dd1c3d625..0fafe6f0ded 100644 --- a/src/widgets/graphicsview/qgraphicslayoutitem.h +++ b/src/widgets/graphicsview/qgraphicslayoutitem.h @@ -50,9 +50,8 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Gui) -#if !defined(QT_NO_GRAPHICSVIEW) || (QT_EDITION & QT_MODULE_GRAPHICSVIEW) != QT_MODULE_GRAPHICSVIEW +#if !defined(QT_NO_GRAPHICSVIEW) class QGraphicsLayoutItemPrivate; class QGraphicsItem; diff --git a/src/widgets/graphicsview/qgraphicslinearlayout.h b/src/widgets/graphicsview/qgraphicslinearlayout.h index fba5460855c..24542a6c219 100644 --- a/src/widgets/graphicsview/qgraphicslinearlayout.h +++ b/src/widgets/graphicsview/qgraphicslinearlayout.h @@ -49,9 +49,8 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Gui) -#if !defined(QT_NO_GRAPHICSVIEW) || (QT_EDITION & QT_MODULE_GRAPHICSVIEW) != QT_MODULE_GRAPHICSVIEW +#if !defined(QT_NO_GRAPHICSVIEW) class QGraphicsLinearLayoutPrivate; diff --git a/src/widgets/graphicsview/qgraphicsproxywidget.h b/src/widgets/graphicsview/qgraphicsproxywidget.h index 76a3f996a95..bed77fc62fb 100644 --- a/src/widgets/graphicsview/qgraphicsproxywidget.h +++ b/src/widgets/graphicsview/qgraphicsproxywidget.h @@ -48,9 +48,8 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Gui) -#if !defined(QT_NO_GRAPHICSVIEW) || (QT_EDITION & QT_MODULE_GRAPHICSVIEW) != QT_MODULE_GRAPHICSVIEW +#if !defined(QT_NO_GRAPHICSVIEW) class QGraphicsProxyWidgetPrivate; diff --git a/src/widgets/graphicsview/qgraphicsproxywidget_p.h b/src/widgets/graphicsview/qgraphicsproxywidget_p.h index 934c744b5e7..33f845d97bd 100644 --- a/src/widgets/graphicsview/qgraphicsproxywidget_p.h +++ b/src/widgets/graphicsview/qgraphicsproxywidget_p.h @@ -56,7 +56,7 @@ #include "qgraphicsproxywidget.h" #include "private/qgraphicswidget_p.h" -#if !defined(QT_NO_GRAPHICSVIEW) || (QT_EDITION & QT_MODULE_GRAPHICSVIEW) != QT_MODULE_GRAPHICSVIEW +#if !defined(QT_NO_GRAPHICSVIEW) QT_BEGIN_NAMESPACE diff --git a/src/widgets/graphicsview/qgraphicsscene.h b/src/widgets/graphicsview/qgraphicsscene.h index ad2a539a2e4..3847446d79a 100644 --- a/src/widgets/graphicsview/qgraphicsscene.h +++ b/src/widgets/graphicsview/qgraphicsscene.h @@ -55,9 +55,8 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Gui) -#if !defined(QT_NO_GRAPHICSVIEW) || (QT_EDITION & QT_MODULE_GRAPHICSVIEW) != QT_MODULE_GRAPHICSVIEW +#if !defined(QT_NO_GRAPHICSVIEW) template<typename T> class QList; class QFocusEvent; diff --git a/src/widgets/graphicsview/qgraphicsscene_bsp_p.h b/src/widgets/graphicsview/qgraphicsscene_bsp_p.h index 8444a2a1c4c..0c69fa74b6d 100644 --- a/src/widgets/graphicsview/qgraphicsscene_bsp_p.h +++ b/src/widgets/graphicsview/qgraphicsscene_bsp_p.h @@ -55,7 +55,7 @@ #include <QtCore/qlist.h> -#if !defined(QT_NO_GRAPHICSVIEW) || (QT_EDITION & QT_MODULE_GRAPHICSVIEW) != QT_MODULE_GRAPHICSVIEW +#if !defined(QT_NO_GRAPHICSVIEW) #include <QtCore/qrect.h> #include <QtCore/qset.h> diff --git a/src/widgets/graphicsview/qgraphicsscene_p.h b/src/widgets/graphicsview/qgraphicsscene_p.h index 9a2f08c0603..89fac8c9f50 100644 --- a/src/widgets/graphicsview/qgraphicsscene_p.h +++ b/src/widgets/graphicsview/qgraphicsscene_p.h @@ -55,7 +55,7 @@ #include "qgraphicsscene.h" -#if !defined(QT_NO_GRAPHICSVIEW) || (QT_EDITION & QT_MODULE_GRAPHICSVIEW) != QT_MODULE_GRAPHICSVIEW +#if !defined(QT_NO_GRAPHICSVIEW) #include "qgraphicssceneevent.h" #include "qgraphicsview.h" diff --git a/src/widgets/graphicsview/qgraphicsscenebsptreeindex_p.h b/src/widgets/graphicsview/qgraphicsscenebsptreeindex_p.h index e62bcafa427..4926e615f3f 100644 --- a/src/widgets/graphicsview/qgraphicsscenebsptreeindex_p.h +++ b/src/widgets/graphicsview/qgraphicsscenebsptreeindex_p.h @@ -55,7 +55,7 @@ #include <QtCore/qglobal.h> -#if !defined(QT_NO_GRAPHICSVIEW) || (QT_EDITION & QT_MODULE_GRAPHICSVIEW) != QT_MODULE_GRAPHICSVIEW +#if !defined(QT_NO_GRAPHICSVIEW) #include "qgraphicssceneindex_p.h" #include "qgraphicsitem_p.h" diff --git a/src/widgets/graphicsview/qgraphicssceneevent.h b/src/widgets/graphicsview/qgraphicssceneevent.h index 006ed86300c..9ffd6a55614 100644 --- a/src/widgets/graphicsview/qgraphicssceneevent.h +++ b/src/widgets/graphicsview/qgraphicssceneevent.h @@ -54,9 +54,8 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Gui) -#if !defined(QT_NO_GRAPHICSVIEW) || (QT_EDITION & QT_MODULE_GRAPHICSVIEW) != QT_MODULE_GRAPHICSVIEW +#if !defined(QT_NO_GRAPHICSVIEW) class QMimeData; class QPointF; diff --git a/src/widgets/graphicsview/qgraphicssceneindex_p.h b/src/widgets/graphicsview/qgraphicssceneindex_p.h index e818865c5d8..4dc33c20f92 100644 --- a/src/widgets/graphicsview/qgraphicssceneindex_p.h +++ b/src/widgets/graphicsview/qgraphicssceneindex_p.h @@ -65,9 +65,8 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Gui) -#if !defined(QT_NO_GRAPHICSVIEW) || (QT_EDITION & QT_MODULE_GRAPHICSVIEW) != QT_MODULE_GRAPHICSVIEW +#if !defined(QT_NO_GRAPHICSVIEW) class QGraphicsSceneIndexIntersector; class QGraphicsSceneIndexPointIntersector; diff --git a/src/widgets/graphicsview/qgraphicsscenelinearindex_p.h b/src/widgets/graphicsview/qgraphicsscenelinearindex_p.h index 2ddd75633fd..db8b3b582d9 100644 --- a/src/widgets/graphicsview/qgraphicsscenelinearindex_p.h +++ b/src/widgets/graphicsview/qgraphicsscenelinearindex_p.h @@ -55,7 +55,7 @@ #include <QtCore/qglobal.h> -#if !defined(QT_NO_GRAPHICSVIEW) || (QT_EDITION & QT_MODULE_GRAPHICSVIEW) != QT_MODULE_GRAPHICSVIEW +#if !defined(QT_NO_GRAPHICSVIEW) #include <QtCore/qrect.h> #include <QtCore/qlist.h> @@ -66,7 +66,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Gui) class Q_AUTOTEST_EXPORT QGraphicsSceneLinearIndex : public QGraphicsSceneIndex { diff --git a/src/widgets/graphicsview/qgraphicstransform.h b/src/widgets/graphicsview/qgraphicstransform.h index 17c3c18ddee..371e80fb1ff 100644 --- a/src/widgets/graphicsview/qgraphicstransform.h +++ b/src/widgets/graphicsview/qgraphicstransform.h @@ -52,7 +52,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Gui) class QGraphicsItem; class QGraphicsTransformPrivate; diff --git a/src/widgets/graphicsview/qgraphicsview.h b/src/widgets/graphicsview/qgraphicsview.h index b3ed327be82..7c2bef00032 100644 --- a/src/widgets/graphicsview/qgraphicsview.h +++ b/src/widgets/graphicsview/qgraphicsview.h @@ -51,9 +51,8 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Gui) -#if !defined(QT_NO_GRAPHICSVIEW) || (QT_EDITION & QT_MODULE_GRAPHICSVIEW) != QT_MODULE_GRAPHICSVIEW +#if !defined(QT_NO_GRAPHICSVIEW) class QGraphicsItem; class QPainterPath; diff --git a/src/widgets/graphicsview/qgraphicsview_p.h b/src/widgets/graphicsview/qgraphicsview_p.h index 0bf25fe1c6e..a3500f07c85 100644 --- a/src/widgets/graphicsview/qgraphicsview_p.h +++ b/src/widgets/graphicsview/qgraphicsview_p.h @@ -55,7 +55,7 @@ #include "qgraphicsview.h" -#if !defined(QT_NO_GRAPHICSVIEW) || (QT_EDITION & QT_MODULE_GRAPHICSVIEW) != QT_MODULE_GRAPHICSVIEW +#if !defined(QT_NO_GRAPHICSVIEW) #include <QtGui/qevent.h> #include <QtCore/qcoreapplication.h> diff --git a/src/widgets/graphicsview/qgraphicswidget.h b/src/widgets/graphicsview/qgraphicswidget.h index b8fd0227f11..aadd89717d4 100644 --- a/src/widgets/graphicsview/qgraphicswidget.h +++ b/src/widgets/graphicsview/qgraphicswidget.h @@ -51,7 +51,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Gui) class QFont; class QFontMetrics; @@ -62,7 +61,7 @@ class QGraphicsSceneResizeEvent; class QStyle; class QStyleOption; -#if !defined(QT_NO_GRAPHICSVIEW) || (QT_EDITION & QT_MODULE_GRAPHICSVIEW) != QT_MODULE_GRAPHICSVIEW +#if !defined(QT_NO_GRAPHICSVIEW) class QGraphicsWidgetPrivate; diff --git a/src/widgets/graphicsview/qgraphicswidget_p.h b/src/widgets/graphicsview/qgraphicswidget_p.h index b9dfefffc6d..7e5a965dcb7 100644 --- a/src/widgets/graphicsview/qgraphicswidget_p.h +++ b/src/widgets/graphicsview/qgraphicswidget_p.h @@ -66,7 +66,7 @@ QT_BEGIN_NAMESPACE class QGraphicsLayout; class QStyleOptionTitleBar; -#if !defined(QT_NO_GRAPHICSVIEW) || (QT_EDITION & QT_MODULE_GRAPHICSVIEW) != QT_MODULE_GRAPHICSVIEW +#if !defined(QT_NO_GRAPHICSVIEW) class QGraphicsWidgetPrivate : public QGraphicsItemPrivate { @@ -218,7 +218,7 @@ public: #endif }; -#endif //!defined(QT_NO_GRAPHICSVIEW) || (QT_EDITION & QT_MODULE_GRAPHICSVIEW) != QT_MODULE_GRAPHICSVIEW +#endif QT_END_NAMESPACE diff --git a/src/widgets/itemviews/qabstractitemdelegate.h b/src/widgets/itemviews/qabstractitemdelegate.h index 431f551c383..d309ee51d2c 100644 --- a/src/widgets/itemviews/qabstractitemdelegate.h +++ b/src/widgets/itemviews/qabstractitemdelegate.h @@ -49,7 +49,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Gui) #ifndef QT_NO_ITEMVIEWS diff --git a/src/widgets/itemviews/qabstractitemview.h b/src/widgets/itemviews/qabstractitemview.h index 919980392d6..d2c9af26941 100644 --- a/src/widgets/itemviews/qabstractitemview.h +++ b/src/widgets/itemviews/qabstractitemview.h @@ -51,7 +51,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Gui) #ifndef QT_NO_ITEMVIEWS diff --git a/src/widgets/itemviews/qcolumnview.h b/src/widgets/itemviews/qcolumnview.h index e986ec306fa..5de10c8b474 100644 --- a/src/widgets/itemviews/qcolumnview.h +++ b/src/widgets/itemviews/qcolumnview.h @@ -48,7 +48,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Gui) #ifndef QT_NO_COLUMNVIEW diff --git a/src/widgets/itemviews/qdatawidgetmapper.h b/src/widgets/itemviews/qdatawidgetmapper.h index 09e8f99b7c2..0ca5049da51 100644 --- a/src/widgets/itemviews/qdatawidgetmapper.h +++ b/src/widgets/itemviews/qdatawidgetmapper.h @@ -50,7 +50,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Gui) class QAbstractItemDelegate; class QAbstractItemModel; diff --git a/src/widgets/itemviews/qdirmodel.h b/src/widgets/itemviews/qdirmodel.h index ef43b496a91..ec5d89ee0ed 100644 --- a/src/widgets/itemviews/qdirmodel.h +++ b/src/widgets/itemviews/qdirmodel.h @@ -50,7 +50,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Gui) #ifndef QT_NO_DIRMODEL diff --git a/src/widgets/itemviews/qfileiconprovider.h b/src/widgets/itemviews/qfileiconprovider.h index 1caec48656a..9d01360db8d 100644 --- a/src/widgets/itemviews/qfileiconprovider.h +++ b/src/widgets/itemviews/qfileiconprovider.h @@ -50,7 +50,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Gui) #ifndef QT_NO_FILEICONPROVIDER diff --git a/src/widgets/itemviews/qheaderview.h b/src/widgets/itemviews/qheaderview.h index 91e4327ba01..b30162fa515 100644 --- a/src/widgets/itemviews/qheaderview.h +++ b/src/widgets/itemviews/qheaderview.h @@ -48,7 +48,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Gui) #ifndef QT_NO_ITEMVIEWS diff --git a/src/widgets/itemviews/qitemdelegate.h b/src/widgets/itemviews/qitemdelegate.h index 297e0ee8446..2ce044c6560 100644 --- a/src/widgets/itemviews/qitemdelegate.h +++ b/src/widgets/itemviews/qitemdelegate.h @@ -51,7 +51,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Gui) #ifndef QT_NO_ITEMVIEWS diff --git a/src/widgets/itemviews/qitemeditorfactory.h b/src/widgets/itemviews/qitemeditorfactory.h index a8cb1c5f0e0..248922bbd61 100644 --- a/src/widgets/itemviews/qitemeditorfactory.h +++ b/src/widgets/itemviews/qitemeditorfactory.h @@ -51,7 +51,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Gui) #ifndef QT_NO_ITEMVIEWS diff --git a/src/widgets/itemviews/qlistview.h b/src/widgets/itemviews/qlistview.h index f66e5bcdf8d..fc5ed3e48b5 100644 --- a/src/widgets/itemviews/qlistview.h +++ b/src/widgets/itemviews/qlistview.h @@ -48,7 +48,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Gui) #ifndef QT_NO_LISTVIEW diff --git a/src/widgets/itemviews/qlistwidget.h b/src/widgets/itemviews/qlistwidget.h index 25b178de47d..d56d709d6fb 100644 --- a/src/widgets/itemviews/qlistwidget.h +++ b/src/widgets/itemviews/qlistwidget.h @@ -51,7 +51,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Gui) #ifndef QT_NO_LISTWIDGET diff --git a/src/widgets/itemviews/qproxymodel.h b/src/widgets/itemviews/qproxymodel.h index f9846c33d74..60e61773ec4 100644 --- a/src/widgets/itemviews/qproxymodel.h +++ b/src/widgets/itemviews/qproxymodel.h @@ -48,7 +48,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Gui) #ifndef QT_NO_PROXYMODEL diff --git a/src/widgets/itemviews/qstandarditemmodel.h b/src/widgets/itemviews/qstandarditemmodel.h index c2961f96bda..bd5b9f90640 100644 --- a/src/widgets/itemviews/qstandarditemmodel.h +++ b/src/widgets/itemviews/qstandarditemmodel.h @@ -54,7 +54,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Gui) #ifndef QT_NO_STANDARDITEMMODEL diff --git a/src/widgets/itemviews/qstyleditemdelegate.h b/src/widgets/itemviews/qstyleditemdelegate.h index d61b75a4862..8369162f40c 100644 --- a/src/widgets/itemviews/qstyleditemdelegate.h +++ b/src/widgets/itemviews/qstyleditemdelegate.h @@ -51,7 +51,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Gui) #ifndef QT_NO_ITEMVIEWS diff --git a/src/widgets/itemviews/qtableview.h b/src/widgets/itemviews/qtableview.h index 4f68ea746e1..9cd7dbb3083 100644 --- a/src/widgets/itemviews/qtableview.h +++ b/src/widgets/itemviews/qtableview.h @@ -48,7 +48,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Gui) #ifndef QT_NO_TABLEVIEW diff --git a/src/widgets/itemviews/qtablewidget.h b/src/widgets/itemviews/qtablewidget.h index ecd0a823a11..8c0bd905e33 100644 --- a/src/widgets/itemviews/qtablewidget.h +++ b/src/widgets/itemviews/qtablewidget.h @@ -51,7 +51,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Gui) #ifndef QT_NO_TABLEWIDGET diff --git a/src/widgets/itemviews/qtreeview.h b/src/widgets/itemviews/qtreeview.h index 7f1bfd3f38b..6a92a07b789 100644 --- a/src/widgets/itemviews/qtreeview.h +++ b/src/widgets/itemviews/qtreeview.h @@ -48,7 +48,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Gui) #ifndef QT_NO_TREEVIEW diff --git a/src/widgets/itemviews/qtreewidget.h b/src/widgets/itemviews/qtreewidget.h index 9a3baa9879b..308c4cc21df 100644 --- a/src/widgets/itemviews/qtreewidget.h +++ b/src/widgets/itemviews/qtreewidget.h @@ -51,7 +51,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Gui) #ifndef QT_NO_TREEWIDGET diff --git a/src/widgets/itemviews/qtreewidgetitemiterator.h b/src/widgets/itemviews/qtreewidgetitemiterator.h index 21e02ddbd09..32549bdba31 100644 --- a/src/widgets/itemviews/qtreewidgetitemiterator.h +++ b/src/widgets/itemviews/qtreewidgetitemiterator.h @@ -49,7 +49,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Gui) #ifndef QT_NO_TREEWIDGET diff --git a/src/widgets/kernel/qaction.h b/src/widgets/kernel/qaction.h index 2755210a796..b5209e9ff00 100644 --- a/src/widgets/kernel/qaction.h +++ b/src/widgets/kernel/qaction.h @@ -52,7 +52,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Gui) #ifndef QT_NO_ACTION diff --git a/src/widgets/kernel/qactiongroup.h b/src/widgets/kernel/qactiongroup.h index a63885448d6..56d2e846c07 100644 --- a/src/widgets/kernel/qactiongroup.h +++ b/src/widgets/kernel/qactiongroup.h @@ -48,7 +48,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Gui) #ifndef QT_NO_ACTION diff --git a/src/widgets/kernel/qapplication.h b/src/widgets/kernel/qapplication.h index 06fc85beabd..84c4cfbe6a0 100644 --- a/src/widgets/kernel/qapplication.h +++ b/src/widgets/kernel/qapplication.h @@ -56,7 +56,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Gui) class QSessionManager; class QDesktopWidget; diff --git a/src/widgets/kernel/qboxlayout.h b/src/widgets/kernel/qboxlayout.h index d5f66ba9f01..d515f2f466b 100644 --- a/src/widgets/kernel/qboxlayout.h +++ b/src/widgets/kernel/qboxlayout.h @@ -53,7 +53,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Gui) class QBoxLayoutPrivate; diff --git a/src/widgets/kernel/qdesktopwidget.h b/src/widgets/kernel/qdesktopwidget.h index ed2eb4cfe93..51a05a3c714 100644 --- a/src/widgets/kernel/qdesktopwidget.h +++ b/src/widgets/kernel/qdesktopwidget.h @@ -48,7 +48,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Gui) class QApplication; class QDesktopWidgetPrivate; diff --git a/src/widgets/kernel/qformlayout.h b/src/widgets/kernel/qformlayout.h index c04037312b7..8ee8cad2867 100644 --- a/src/widgets/kernel/qformlayout.h +++ b/src/widgets/kernel/qformlayout.h @@ -48,7 +48,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Gui) class QFormLayoutPrivate; diff --git a/src/widgets/kernel/qgesture.h b/src/widgets/kernel/qgesture.h index f9bdad93686..b627e9448b6 100644 --- a/src/widgets/kernel/qgesture.h +++ b/src/widgets/kernel/qgesture.h @@ -59,7 +59,6 @@ Q_DECLARE_METATYPE(Qt::GestureType) QT_BEGIN_NAMESPACE -QT_MODULE(Gui) class QGesturePrivate; class Q_WIDGETS_EXPORT QGesture : public QObject diff --git a/src/widgets/kernel/qgesturerecognizer.h b/src/widgets/kernel/qgesturerecognizer.h index 7c4e6a1784b..876c969f9df 100644 --- a/src/widgets/kernel/qgesturerecognizer.h +++ b/src/widgets/kernel/qgesturerecognizer.h @@ -51,7 +51,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Gui) class QObject; class QEvent; diff --git a/src/widgets/kernel/qgridlayout.h b/src/widgets/kernel/qgridlayout.h index 06c9f445672..f20779c0a8d 100644 --- a/src/widgets/kernel/qgridlayout.h +++ b/src/widgets/kernel/qgridlayout.h @@ -53,7 +53,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Gui) class QGridLayoutPrivate; diff --git a/src/widgets/kernel/qguiplatformplugin_p.h b/src/widgets/kernel/qguiplatformplugin_p.h index 322e9b5066d..c8e752ac0ce 100644 --- a/src/widgets/kernel/qguiplatformplugin_p.h +++ b/src/widgets/kernel/qguiplatformplugin_p.h @@ -61,7 +61,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Gui) class QStyle; class QPalette; diff --git a/src/widgets/kernel/qicon.h b/src/widgets/kernel/qicon.h index f43ed9ca004..2021e3fe6f4 100644 --- a/src/widgets/kernel/qicon.h +++ b/src/widgets/kernel/qicon.h @@ -51,7 +51,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Gui) class QIconPrivate; class QIconEngine; diff --git a/src/widgets/kernel/qiconengine.h b/src/widgets/kernel/qiconengine.h index ad8ccc6fabe..2aaecc22459 100644 --- a/src/widgets/kernel/qiconengine.h +++ b/src/widgets/kernel/qiconengine.h @@ -50,7 +50,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Gui) class Q_WIDGETS_EXPORT QIconEngine { diff --git a/src/widgets/kernel/qiconengineplugin.h b/src/widgets/kernel/qiconengineplugin.h index d75ca7e0e78..d6ba69f910e 100644 --- a/src/widgets/kernel/qiconengineplugin.h +++ b/src/widgets/kernel/qiconengineplugin.h @@ -49,7 +49,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Gui) class QIconEngine; class QIconEngineV2; diff --git a/src/widgets/kernel/qinputcontext.h b/src/widgets/kernel/qinputcontext.h index 5521f1c81c7..7c175c63a36 100644 --- a/src/widgets/kernel/qinputcontext.h +++ b/src/widgets/kernel/qinputcontext.h @@ -69,7 +69,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Gui) class QWidget; class QFont; diff --git a/src/widgets/kernel/qlayout.h b/src/widgets/kernel/qlayout.h index 6906683f98a..37f02dbfe06 100644 --- a/src/widgets/kernel/qlayout.h +++ b/src/widgets/kernel/qlayout.h @@ -54,7 +54,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Gui) class QLayout; class QSize; diff --git a/src/widgets/kernel/qlayoutitem.h b/src/widgets/kernel/qlayoutitem.h index 67989da13d9..dc401f9129d 100644 --- a/src/widgets/kernel/qlayoutitem.h +++ b/src/widgets/kernel/qlayoutitem.h @@ -51,7 +51,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Gui) static const int QLAYOUTSIZE_MAX = INT_MAX/256/16; diff --git a/src/widgets/kernel/qplatformdialoghelper_qpa.h b/src/widgets/kernel/qplatformdialoghelper_qpa.h index 014e58a855b..36bb94c5d52 100644 --- a/src/widgets/kernel/qplatformdialoghelper_qpa.h +++ b/src/widgets/kernel/qplatformdialoghelper_qpa.h @@ -54,7 +54,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Gui) class QString; class QColor; diff --git a/src/widgets/kernel/qplatformmenu_qpa.h b/src/widgets/kernel/qplatformmenu_qpa.h index a3f8efef7a7..7c89abe16ad 100644 --- a/src/widgets/kernel/qplatformmenu_qpa.h +++ b/src/widgets/kernel/qplatformmenu_qpa.h @@ -50,7 +50,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Gui) class QMenuPrivate; class Q_WIDGETS_EXPORT QPlatformMenuAction diff --git a/src/widgets/kernel/qshortcut.h b/src/widgets/kernel/qshortcut.h index 4ff37fd8a75..84ad69e5ec2 100644 --- a/src/widgets/kernel/qshortcut.h +++ b/src/widgets/kernel/qshortcut.h @@ -49,7 +49,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Gui) #ifndef QT_NO_SHORTCUT diff --git a/src/widgets/kernel/qsizepolicy.h b/src/widgets/kernel/qsizepolicy.h index b2bec76b37b..954888e9b81 100644 --- a/src/widgets/kernel/qsizepolicy.h +++ b/src/widgets/kernel/qsizepolicy.h @@ -48,7 +48,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Gui) class QVariant; diff --git a/src/widgets/kernel/qstackedlayout.h b/src/widgets/kernel/qstackedlayout.h index 1e50f3d33db..7305f77ee8c 100644 --- a/src/widgets/kernel/qstackedlayout.h +++ b/src/widgets/kernel/qstackedlayout.h @@ -48,7 +48,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Gui) class QStackedLayoutPrivate; diff --git a/src/widgets/kernel/qtooltip.h b/src/widgets/kernel/qtooltip.h index 3dd408770b4..4a908afe33a 100644 --- a/src/widgets/kernel/qtooltip.h +++ b/src/widgets/kernel/qtooltip.h @@ -48,7 +48,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Gui) #ifndef QT_NO_TOOLTIP diff --git a/src/widgets/kernel/qwhatsthis.h b/src/widgets/kernel/qwhatsthis.h index 8e0c64f22f7..b5d904ff491 100644 --- a/src/widgets/kernel/qwhatsthis.h +++ b/src/widgets/kernel/qwhatsthis.h @@ -49,7 +49,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Gui) #ifndef QT_NO_WHATSTHIS diff --git a/src/widgets/kernel/qwidget.h b/src/widgets/kernel/qwidget.h index ef2faa6bd60..e9c166a1ba8 100644 --- a/src/widgets/kernel/qwidget.h +++ b/src/widgets/kernel/qwidget.h @@ -64,7 +64,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Gui) class QLayout; class QWSRegionManager; diff --git a/src/widgets/kernel/qwidgetaction.h b/src/widgets/kernel/qwidgetaction.h index e5a72172e14..eaff853fa77 100644 --- a/src/widgets/kernel/qwidgetaction.h +++ b/src/widgets/kernel/qwidgetaction.h @@ -48,7 +48,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Gui) #ifndef QT_NO_ACTION diff --git a/src/widgets/kernel/qwidgetwindow_qpa_p.h b/src/widgets/kernel/qwidgetwindow_qpa_p.h index 1d429007d32..6b949593540 100644 --- a/src/widgets/kernel/qwidgetwindow_qpa_p.h +++ b/src/widgets/kernel/qwidgetwindow_qpa_p.h @@ -51,7 +51,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Gui) class QCloseEvent; class QMoveEvent; diff --git a/src/widgets/statemachine/qkeyeventtransition.h b/src/widgets/statemachine/qkeyeventtransition.h index bdd1cd71fd2..0810fb06fa3 100644 --- a/src/widgets/statemachine/qkeyeventtransition.h +++ b/src/widgets/statemachine/qkeyeventtransition.h @@ -48,7 +48,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Gui) #ifndef QT_NO_STATEMACHINE diff --git a/src/widgets/statemachine/qmouseeventtransition.h b/src/widgets/statemachine/qmouseeventtransition.h index 4afe6775fc5..37f21099d2f 100644 --- a/src/widgets/statemachine/qmouseeventtransition.h +++ b/src/widgets/statemachine/qmouseeventtransition.h @@ -48,7 +48,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Gui) #ifndef QT_NO_STATEMACHINE diff --git a/src/widgets/styles/qcdestyle.h b/src/widgets/styles/qcdestyle.h index 176d3943d09..6259de8145c 100644 --- a/src/widgets/styles/qcdestyle.h +++ b/src/widgets/styles/qcdestyle.h @@ -49,7 +49,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Gui) #if !defined(QT_NO_STYLE_CDE) diff --git a/src/widgets/styles/qcleanlooksstyle.h b/src/widgets/styles/qcleanlooksstyle.h index 4cb12b49d32..ad7614a4142 100644 --- a/src/widgets/styles/qcleanlooksstyle.h +++ b/src/widgets/styles/qcleanlooksstyle.h @@ -48,7 +48,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Gui) #if !defined(QT_NO_STYLE_CLEANLOOKS) diff --git a/src/widgets/styles/qcommonstyle.h b/src/widgets/styles/qcommonstyle.h index 374c19b007d..b00413d10c4 100644 --- a/src/widgets/styles/qcommonstyle.h +++ b/src/widgets/styles/qcommonstyle.h @@ -47,7 +47,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Gui) class QCommonStylePrivate; diff --git a/src/widgets/styles/qdrawutil.h b/src/widgets/styles/qdrawutil.h index 7138faafae7..ce4977bb274 100644 --- a/src/widgets/styles/qdrawutil.h +++ b/src/widgets/styles/qdrawutil.h @@ -50,7 +50,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Gui) class QPainter; class QPalette; diff --git a/src/widgets/styles/qgtkstyle.h b/src/widgets/styles/qgtkstyle.h index 6768d9403eb..9ae65b7bb23 100644 --- a/src/widgets/styles/qgtkstyle.h +++ b/src/widgets/styles/qgtkstyle.h @@ -51,7 +51,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Gui) #if !defined(QT_NO_STYLE_GTK) diff --git a/src/widgets/styles/qmacstyle_mac.h b/src/widgets/styles/qmacstyle_mac.h index 474ce07eb24..0154996a9dd 100644 --- a/src/widgets/styles/qmacstyle_mac.h +++ b/src/widgets/styles/qmacstyle_mac.h @@ -48,7 +48,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Gui) #if defined(Q_OS_MAC) && !defined(QT_NO_STYLE_MAC) diff --git a/src/widgets/styles/qmotifstyle.h b/src/widgets/styles/qmotifstyle.h index b92cc1e135b..b7f14703951 100644 --- a/src/widgets/styles/qmotifstyle.h +++ b/src/widgets/styles/qmotifstyle.h @@ -49,7 +49,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Gui) #if !defined(QT_NO_STYLE_MOTIF) diff --git a/src/widgets/styles/qplastiquestyle.h b/src/widgets/styles/qplastiquestyle.h index ce97dcd36d5..34794e4c9ba 100644 --- a/src/widgets/styles/qplastiquestyle.h +++ b/src/widgets/styles/qplastiquestyle.h @@ -48,7 +48,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Gui) #if !defined(QT_NO_STYLE_PLASTIQUE) diff --git a/src/widgets/styles/qproxystyle.h b/src/widgets/styles/qproxystyle.h index 87a4f8f6115..5f70bbe6513 100644 --- a/src/widgets/styles/qproxystyle.h +++ b/src/widgets/styles/qproxystyle.h @@ -48,7 +48,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Gui) #if !defined(QT_NO_STYLE_PROXY) diff --git a/src/widgets/styles/qstyle.h b/src/widgets/styles/qstyle.h index 7cbadfa5de5..2446a1f3ab6 100644 --- a/src/widgets/styles/qstyle.h +++ b/src/widgets/styles/qstyle.h @@ -54,7 +54,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Gui) class QAction; class QDebug; diff --git a/src/widgets/styles/qstylefactory.h b/src/widgets/styles/qstylefactory.h index 1a382bf7d79..87dd176ea2d 100644 --- a/src/widgets/styles/qstylefactory.h +++ b/src/widgets/styles/qstylefactory.h @@ -48,7 +48,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Gui) class QStyle; diff --git a/src/widgets/styles/qstyleoption.h b/src/widgets/styles/qstyleoption.h index 71775ff44d9..79c10818650 100644 --- a/src/widgets/styles/qstyleoption.h +++ b/src/widgets/styles/qstyleoption.h @@ -60,7 +60,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Gui) class QDebug; diff --git a/src/widgets/styles/qstylepainter.h b/src/widgets/styles/qstylepainter.h index 527f581d080..1a849582f1e 100644 --- a/src/widgets/styles/qstylepainter.h +++ b/src/widgets/styles/qstylepainter.h @@ -50,7 +50,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Gui) class QStylePainter : public QPainter { diff --git a/src/widgets/styles/qstyleplugin.h b/src/widgets/styles/qstyleplugin.h index 18708ce4cf6..7bbc887c3cf 100644 --- a/src/widgets/styles/qstyleplugin.h +++ b/src/widgets/styles/qstyleplugin.h @@ -49,7 +49,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Gui) class QStyle; diff --git a/src/widgets/styles/qwindowscestyle.h b/src/widgets/styles/qwindowscestyle.h index ff010000c76..f4005f7806a 100644 --- a/src/widgets/styles/qwindowscestyle.h +++ b/src/widgets/styles/qwindowscestyle.h @@ -48,7 +48,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Gui) #if !defined(QT_NO_STYLE_WINDOWSCE) diff --git a/src/widgets/styles/qwindowsmobilestyle.h b/src/widgets/styles/qwindowsmobilestyle.h index 4005ddee8dd..76388bebd09 100644 --- a/src/widgets/styles/qwindowsmobilestyle.h +++ b/src/widgets/styles/qwindowsmobilestyle.h @@ -48,7 +48,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Gui) #if !defined(QT_NO_STYLE_WINDOWSMOBILE) diff --git a/src/widgets/styles/qwindowsstyle.h b/src/widgets/styles/qwindowsstyle.h index b950dd55942..6fa3afd009a 100644 --- a/src/widgets/styles/qwindowsstyle.h +++ b/src/widgets/styles/qwindowsstyle.h @@ -48,7 +48,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Gui) #if !defined(QT_NO_STYLE_WINDOWS) diff --git a/src/widgets/styles/qwindowsvistastyle.h b/src/widgets/styles/qwindowsvistastyle.h index e13a85aaafe..310d0440505 100644 --- a/src/widgets/styles/qwindowsvistastyle.h +++ b/src/widgets/styles/qwindowsvistastyle.h @@ -48,7 +48,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Gui) #if !defined(QT_NO_STYLE_WINDOWSVISTA) diff --git a/src/widgets/styles/qwindowsxpstyle.h b/src/widgets/styles/qwindowsxpstyle.h index b0eb968a0a1..d77196a477a 100644 --- a/src/widgets/styles/qwindowsxpstyle.h +++ b/src/widgets/styles/qwindowsxpstyle.h @@ -48,7 +48,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Gui) #if !defined(QT_NO_STYLE_WINDOWSXP) diff --git a/src/widgets/util/qcolormap.h b/src/widgets/util/qcolormap.h index 096843cad59..d35a9cee52f 100644 --- a/src/widgets/util/qcolormap.h +++ b/src/widgets/util/qcolormap.h @@ -51,7 +51,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Gui) class QColor; class QColormapPrivate; diff --git a/src/widgets/util/qcompleter.h b/src/widgets/util/qcompleter.h index 332ad11c4f5..d66357cc3c1 100644 --- a/src/widgets/util/qcompleter.h +++ b/src/widgets/util/qcompleter.h @@ -52,7 +52,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Gui) #ifndef QT_NO_COMPLETER diff --git a/src/widgets/util/qscroller.h b/src/widgets/util/qscroller.h index e54db3239d5..90cabf3314e 100644 --- a/src/widgets/util/qscroller.h +++ b/src/widgets/util/qscroller.h @@ -50,7 +50,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Gui) class QWidget; class QScrollerPrivate; diff --git a/src/widgets/util/qscrollerproperties.h b/src/widgets/util/qscrollerproperties.h index 633b335f0d1..e970f2814e9 100644 --- a/src/widgets/util/qscrollerproperties.h +++ b/src/widgets/util/qscrollerproperties.h @@ -50,7 +50,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Gui) class QScroller; class QScrollerPrivate; diff --git a/src/widgets/util/qsystemtrayicon.h b/src/widgets/util/qsystemtrayicon.h index c397a6da3de..a670310007e 100644 --- a/src/widgets/util/qsystemtrayicon.h +++ b/src/widgets/util/qsystemtrayicon.h @@ -52,7 +52,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Gui) class QSystemTrayIconPrivate; diff --git a/src/widgets/util/qundogroup.h b/src/widgets/util/qundogroup.h index 0aa82fd02ef..9795f135295 100644 --- a/src/widgets/util/qundogroup.h +++ b/src/widgets/util/qundogroup.h @@ -53,7 +53,6 @@ class QUndoGroupPrivate; class QUndoStack; class QAction; -QT_MODULE(Gui) #ifndef QT_NO_UNDOGROUP diff --git a/src/widgets/util/qundostack.h b/src/widgets/util/qundostack.h index bb5d50d1a1d..dce2b84be45 100644 --- a/src/widgets/util/qundostack.h +++ b/src/widgets/util/qundostack.h @@ -49,7 +49,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Gui) class QAction; class QUndoCommandPrivate; diff --git a/src/widgets/util/qundoview.h b/src/widgets/util/qundoview.h index ecd2b592cac..e72c45f7259 100644 --- a/src/widgets/util/qundoview.h +++ b/src/widgets/util/qundoview.h @@ -56,7 +56,6 @@ class QUndoStack; class QUndoGroup; class QIcon; -QT_MODULE(Gui) class Q_WIDGETS_EXPORT QUndoView : public QListView { diff --git a/src/widgets/widgets/qabstractbutton.h b/src/widgets/widgets/qabstractbutton.h index f36c9b4fa61..1c92cd3da1e 100644 --- a/src/widgets/widgets/qabstractbutton.h +++ b/src/widgets/widgets/qabstractbutton.h @@ -50,7 +50,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Gui) class QButtonGroup; class QAbstractButtonPrivate; diff --git a/src/widgets/widgets/qabstractscrollarea.h b/src/widgets/widgets/qabstractscrollarea.h index d587a7caa1b..d3938059c63 100644 --- a/src/widgets/widgets/qabstractscrollarea.h +++ b/src/widgets/widgets/qabstractscrollarea.h @@ -48,7 +48,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Gui) #ifndef QT_NO_SCROLLAREA diff --git a/src/widgets/widgets/qabstractslider.h b/src/widgets/widgets/qabstractslider.h index 79bef5f9072..52c3f6b4a74 100644 --- a/src/widgets/widgets/qabstractslider.h +++ b/src/widgets/widgets/qabstractslider.h @@ -48,7 +48,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Gui) class QAbstractSliderPrivate; diff --git a/src/widgets/widgets/qabstractspinbox.h b/src/widgets/widgets/qabstractspinbox.h index f8cf0f7f477..90838458e00 100644 --- a/src/widgets/widgets/qabstractspinbox.h +++ b/src/widgets/widgets/qabstractspinbox.h @@ -49,7 +49,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Gui) #ifndef QT_NO_SPINBOX diff --git a/src/widgets/widgets/qbuttongroup.h b/src/widgets/widgets/qbuttongroup.h index 904206a233b..360d142d563 100644 --- a/src/widgets/widgets/qbuttongroup.h +++ b/src/widgets/widgets/qbuttongroup.h @@ -48,7 +48,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Gui) #ifndef QT_NO_BUTTONGROUP diff --git a/src/widgets/widgets/qcalendarwidget.h b/src/widgets/widgets/qcalendarwidget.h index 7fdc577a5e1..6e6ff2db3ec 100644 --- a/src/widgets/widgets/qcalendarwidget.h +++ b/src/widgets/widgets/qcalendarwidget.h @@ -49,7 +49,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Gui) #ifndef QT_NO_CALENDARWIDGET diff --git a/src/widgets/widgets/qcheckbox.h b/src/widgets/widgets/qcheckbox.h index f269d83e522..b1138d55b95 100644 --- a/src/widgets/widgets/qcheckbox.h +++ b/src/widgets/widgets/qcheckbox.h @@ -48,7 +48,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Gui) class QCheckBoxPrivate; class QStyleOptionButton; diff --git a/src/widgets/widgets/qcombobox.h b/src/widgets/widgets/qcombobox.h index 1d674a2716d..c135187febc 100644 --- a/src/widgets/widgets/qcombobox.h +++ b/src/widgets/widgets/qcombobox.h @@ -51,7 +51,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Gui) #ifndef QT_NO_COMBOBOX class QAbstractItemView; diff --git a/src/widgets/widgets/qcommandlinkbutton.h b/src/widgets/widgets/qcommandlinkbutton.h index 0a733e15b07..2cf28895244 100644 --- a/src/widgets/widgets/qcommandlinkbutton.h +++ b/src/widgets/widgets/qcommandlinkbutton.h @@ -48,7 +48,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Gui) class QCommandLinkButtonPrivate; diff --git a/src/widgets/widgets/qdatetimeedit.h b/src/widgets/widgets/qdatetimeedit.h index a5812b80a2b..7af43db183f 100644 --- a/src/widgets/widgets/qdatetimeedit.h +++ b/src/widgets/widgets/qdatetimeedit.h @@ -50,7 +50,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Gui) #ifndef QT_NO_DATETIMEEDIT diff --git a/src/widgets/widgets/qdial.h b/src/widgets/widgets/qdial.h index 1818fff973f..d17d68c3543 100644 --- a/src/widgets/widgets/qdial.h +++ b/src/widgets/widgets/qdial.h @@ -49,7 +49,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Gui) #ifndef QT_NO_DIAL diff --git a/src/widgets/widgets/qdialogbuttonbox.h b/src/widgets/widgets/qdialogbuttonbox.h index 001b6018d79..4b708a0a933 100644 --- a/src/widgets/widgets/qdialogbuttonbox.h +++ b/src/widgets/widgets/qdialogbuttonbox.h @@ -48,7 +48,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Gui) class QAbstractButton; class QPushButton; diff --git a/src/widgets/widgets/qdockwidget.h b/src/widgets/widgets/qdockwidget.h index 75b2621dfb6..eb0a3f65ab9 100644 --- a/src/widgets/widgets/qdockwidget.h +++ b/src/widgets/widgets/qdockwidget.h @@ -48,7 +48,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Gui) #ifndef QT_NO_DOCKWIDGET diff --git a/src/widgets/widgets/qfocusframe.h b/src/widgets/widgets/qfocusframe.h index 8e01e6e4503..935f1b2643e 100644 --- a/src/widgets/widgets/qfocusframe.h +++ b/src/widgets/widgets/qfocusframe.h @@ -48,7 +48,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Gui) class QFocusFramePrivate; class QStyleOption; diff --git a/src/widgets/widgets/qfontcombobox.h b/src/widgets/widgets/qfontcombobox.h index 56e72ae6e21..2467d250cbe 100644 --- a/src/widgets/widgets/qfontcombobox.h +++ b/src/widgets/widgets/qfontcombobox.h @@ -51,7 +51,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Gui) class QFontComboBoxPrivate; diff --git a/src/widgets/widgets/qframe.h b/src/widgets/widgets/qframe.h index 2b045beae7e..e57952efdac 100644 --- a/src/widgets/widgets/qframe.h +++ b/src/widgets/widgets/qframe.h @@ -48,7 +48,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Gui) class QFramePrivate; diff --git a/src/widgets/widgets/qgroupbox.h b/src/widgets/widgets/qgroupbox.h index affffcda33d..410266ad758 100644 --- a/src/widgets/widgets/qgroupbox.h +++ b/src/widgets/widgets/qgroupbox.h @@ -48,7 +48,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Gui) #ifndef QT_NO_GROUPBOX diff --git a/src/widgets/widgets/qlabel.h b/src/widgets/widgets/qlabel.h index edbf51ed7b1..30a669ccd38 100644 --- a/src/widgets/widgets/qlabel.h +++ b/src/widgets/widgets/qlabel.h @@ -48,7 +48,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Gui) class QLabelPrivate; diff --git a/src/widgets/widgets/qlcdnumber.h b/src/widgets/widgets/qlcdnumber.h index 49c72467425..48e675fee77 100644 --- a/src/widgets/widgets/qlcdnumber.h +++ b/src/widgets/widgets/qlcdnumber.h @@ -49,7 +49,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Gui) #ifndef QT_NO_LCDNUMBER diff --git a/src/widgets/widgets/qlineedit.h b/src/widgets/widgets/qlineedit.h index a6beb7e29d4..a2a7eb805ae 100644 --- a/src/widgets/widgets/qlineedit.h +++ b/src/widgets/widgets/qlineedit.h @@ -51,7 +51,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Gui) #ifndef QT_NO_LINEEDIT diff --git a/src/widgets/widgets/qmaccocoaviewcontainer_mac.h b/src/widgets/widgets/qmaccocoaviewcontainer_mac.h index b7bcb3ba5a5..6c50e3a3b38 100644 --- a/src/widgets/widgets/qmaccocoaviewcontainer_mac.h +++ b/src/widgets/widgets/qmaccocoaviewcontainer_mac.h @@ -48,7 +48,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Gui) class QMacCocoaViewContainerPrivate; diff --git a/src/widgets/widgets/qmacnativewidget_mac.h b/src/widgets/widgets/qmacnativewidget_mac.h index faf8f15d448..aa92161f704 100644 --- a/src/widgets/widgets/qmacnativewidget_mac.h +++ b/src/widgets/widgets/qmacnativewidget_mac.h @@ -48,7 +48,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Gui) class QMacNativeWidgetPrivate; class Q_WIDGETS_EXPORT QMacNativeWidget : public QWidget diff --git a/src/widgets/widgets/qmainwindow.h b/src/widgets/widgets/qmainwindow.h index 944c807f97d..74308469b58 100644 --- a/src/widgets/widgets/qmainwindow.h +++ b/src/widgets/widgets/qmainwindow.h @@ -49,7 +49,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Gui) #ifndef QT_NO_MAINWINDOW diff --git a/src/widgets/widgets/qmdiarea.h b/src/widgets/widgets/qmdiarea.h index bd681dd2d3e..03ee11022d5 100644 --- a/src/widgets/widgets/qmdiarea.h +++ b/src/widgets/widgets/qmdiarea.h @@ -49,7 +49,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Gui) #ifndef QT_NO_MDIAREA diff --git a/src/widgets/widgets/qmdisubwindow.h b/src/widgets/widgets/qmdisubwindow.h index 4571b10e33e..de849601613 100644 --- a/src/widgets/widgets/qmdisubwindow.h +++ b/src/widgets/widgets/qmdisubwindow.h @@ -48,7 +48,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Gui) #ifndef QT_NO_MDIAREA diff --git a/src/widgets/widgets/qmenu.h b/src/widgets/widgets/qmenu.h index 3255637558e..7b6dcbda314 100644 --- a/src/widgets/widgets/qmenu.h +++ b/src/widgets/widgets/qmenu.h @@ -56,7 +56,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Gui) #ifndef QT_NO_MENU diff --git a/src/widgets/widgets/qmenubar.h b/src/widgets/widgets/qmenubar.h index b082d1a0270..6a97eb1f6b6 100644 --- a/src/widgets/widgets/qmenubar.h +++ b/src/widgets/widgets/qmenubar.h @@ -48,7 +48,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Gui) #ifndef QT_NO_MENUBAR diff --git a/src/widgets/widgets/qplaintextedit.h b/src/widgets/widgets/qplaintextedit.h index f1da8506e28..31134b63cb0 100644 --- a/src/widgets/widgets/qplaintextedit.h +++ b/src/widgets/widgets/qplaintextedit.h @@ -57,7 +57,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Gui) class QStyleSheet; class QTextDocument; diff --git a/src/widgets/widgets/qprogressbar.h b/src/widgets/widgets/qprogressbar.h index 5a7de9939c7..ed6cb105ba5 100644 --- a/src/widgets/widgets/qprogressbar.h +++ b/src/widgets/widgets/qprogressbar.h @@ -48,7 +48,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Gui) #ifndef QT_NO_PROGRESSBAR diff --git a/src/widgets/widgets/qpushbutton.h b/src/widgets/widgets/qpushbutton.h index c3912ece83d..635b71dbdda 100644 --- a/src/widgets/widgets/qpushbutton.h +++ b/src/widgets/widgets/qpushbutton.h @@ -48,7 +48,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Gui) class QPushButtonPrivate; class QMenu; diff --git a/src/widgets/widgets/qradiobutton.h b/src/widgets/widgets/qradiobutton.h index 4ff888b7bee..9661130f893 100644 --- a/src/widgets/widgets/qradiobutton.h +++ b/src/widgets/widgets/qradiobutton.h @@ -48,7 +48,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Gui) class QRadioButtonPrivate; class QStyleOptionButton; diff --git a/src/widgets/widgets/qrubberband.h b/src/widgets/widgets/qrubberband.h index ca42a4e6930..c5d41da227a 100644 --- a/src/widgets/widgets/qrubberband.h +++ b/src/widgets/widgets/qrubberband.h @@ -48,7 +48,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Gui) #ifndef QT_NO_RUBBERBAND diff --git a/src/widgets/widgets/qscrollarea.h b/src/widgets/widgets/qscrollarea.h index 96104385d9d..7b402d99f94 100644 --- a/src/widgets/widgets/qscrollarea.h +++ b/src/widgets/widgets/qscrollarea.h @@ -48,7 +48,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Gui) #ifndef QT_NO_SCROLLAREA diff --git a/src/widgets/widgets/qscrollbar.h b/src/widgets/widgets/qscrollbar.h index 89659024317..9c0ef6fac73 100644 --- a/src/widgets/widgets/qscrollbar.h +++ b/src/widgets/widgets/qscrollbar.h @@ -49,7 +49,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Gui) #ifndef QT_NO_SCROLLBAR diff --git a/src/widgets/widgets/qsizegrip.h b/src/widgets/widgets/qsizegrip.h index 5c49fdc54cf..44b27b29767 100644 --- a/src/widgets/widgets/qsizegrip.h +++ b/src/widgets/widgets/qsizegrip.h @@ -48,7 +48,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Gui) #ifndef QT_NO_SIZEGRIP class QSizeGripPrivate; diff --git a/src/widgets/widgets/qslider.h b/src/widgets/widgets/qslider.h index 569582e0733..a63e7b9318a 100644 --- a/src/widgets/widgets/qslider.h +++ b/src/widgets/widgets/qslider.h @@ -48,7 +48,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Gui) #ifndef QT_NO_SLIDER diff --git a/src/widgets/widgets/qspinbox.h b/src/widgets/widgets/qspinbox.h index 71fd41d67c4..97d636a5c83 100644 --- a/src/widgets/widgets/qspinbox.h +++ b/src/widgets/widgets/qspinbox.h @@ -48,7 +48,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Gui) #ifndef QT_NO_SPINBOX diff --git a/src/widgets/widgets/qsplashscreen.h b/src/widgets/widgets/qsplashscreen.h index 482a67839b0..501c9ca9cb9 100644 --- a/src/widgets/widgets/qsplashscreen.h +++ b/src/widgets/widgets/qsplashscreen.h @@ -49,7 +49,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Gui) #ifndef QT_NO_SPLASHSCREEN class QSplashScreenPrivate; diff --git a/src/widgets/widgets/qsplitter.h b/src/widgets/widgets/qsplitter.h index 5b42282f14c..08bb398cc3c 100644 --- a/src/widgets/widgets/qsplitter.h +++ b/src/widgets/widgets/qsplitter.h @@ -49,7 +49,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Gui) #ifndef QT_NO_SPLITTER diff --git a/src/widgets/widgets/qstackedwidget.h b/src/widgets/widgets/qstackedwidget.h index 0c0313301e0..d6b83eb8d37 100644 --- a/src/widgets/widgets/qstackedwidget.h +++ b/src/widgets/widgets/qstackedwidget.h @@ -48,7 +48,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Gui) #ifndef QT_NO_STACKEDWIDGET diff --git a/src/widgets/widgets/qstatusbar.h b/src/widgets/widgets/qstatusbar.h index 3598957282f..d46e6c9f9a7 100644 --- a/src/widgets/widgets/qstatusbar.h +++ b/src/widgets/widgets/qstatusbar.h @@ -48,7 +48,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Gui) #ifndef QT_NO_STATUSBAR diff --git a/src/widgets/widgets/qtabbar.h b/src/widgets/widgets/qtabbar.h index b8405da2108..c9550011695 100644 --- a/src/widgets/widgets/qtabbar.h +++ b/src/widgets/widgets/qtabbar.h @@ -48,7 +48,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Gui) #ifndef QT_NO_TABBAR diff --git a/src/widgets/widgets/qtabwidget.h b/src/widgets/widgets/qtabwidget.h index ac2f8a4149d..c540beccf1b 100644 --- a/src/widgets/widgets/qtabwidget.h +++ b/src/widgets/widgets/qtabwidget.h @@ -49,7 +49,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Gui) #ifndef QT_NO_TABWIDGET diff --git a/src/widgets/widgets/qtextbrowser.h b/src/widgets/widgets/qtextbrowser.h index a27244e7036..ac38ea4fcb6 100644 --- a/src/widgets/widgets/qtextbrowser.h +++ b/src/widgets/widgets/qtextbrowser.h @@ -49,7 +49,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Gui) #ifndef QT_NO_TEXTBROWSER diff --git a/src/widgets/widgets/qtextedit.h b/src/widgets/widgets/qtextedit.h index f6534993397..e59c85e195e 100644 --- a/src/widgets/widgets/qtextedit.h +++ b/src/widgets/widgets/qtextedit.h @@ -55,7 +55,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Gui) class QStyleSheet; class QTextDocument; diff --git a/src/widgets/widgets/qtoolbar.h b/src/widgets/widgets/qtoolbar.h index d55223d6164..38356999993 100644 --- a/src/widgets/widgets/qtoolbar.h +++ b/src/widgets/widgets/qtoolbar.h @@ -48,7 +48,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Gui) #ifndef QT_NO_TOOLBAR diff --git a/src/widgets/widgets/qtoolbox.h b/src/widgets/widgets/qtoolbox.h index c89764eb428..c11c7eb3f03 100644 --- a/src/widgets/widgets/qtoolbox.h +++ b/src/widgets/widgets/qtoolbox.h @@ -49,7 +49,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Gui) #ifndef QT_NO_TOOLBOX diff --git a/src/widgets/widgets/qtoolbutton.h b/src/widgets/widgets/qtoolbutton.h index 122938938f0..d97fd1a7704 100644 --- a/src/widgets/widgets/qtoolbutton.h +++ b/src/widgets/widgets/qtoolbutton.h @@ -48,7 +48,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Gui) #ifndef QT_NO_TOOLBUTTON diff --git a/src/widgets/widgets/qwidgetlinecontrol_p.h b/src/widgets/widgets/qwidgetlinecontrol_p.h index 8e76ccaaa2a..4355b9232db 100644 --- a/src/widgets/widgets/qwidgetlinecontrol_p.h +++ b/src/widgets/widgets/qwidgetlinecontrol_p.h @@ -79,7 +79,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Gui) class Q_WIDGETS_EXPORT QWidgetLineControl : public QObject { diff --git a/src/widgets/widgets/qwidgettextcontrol_p.h b/src/widgets/widgets/qwidgettextcontrol_p.h index 613191ba4f1..1a4ddb6b1ba 100644 --- a/src/widgets/widgets/qwidgettextcontrol_p.h +++ b/src/widgets/widgets/qwidgettextcontrol_p.h @@ -69,7 +69,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Gui) class QStyleSheet; class QTextDocument; diff --git a/src/widgets/widgets/qworkspace.h b/src/widgets/widgets/qworkspace.h index 8ebda9ece43..630de4edf4f 100644 --- a/src/widgets/widgets/qworkspace.h +++ b/src/widgets/widgets/qworkspace.h @@ -48,7 +48,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Gui) #ifndef QT_NO_WORKSPACE diff --git a/src/xml/dom/qdom.h b/src/xml/dom/qdom.h index 8aa4f48ba97..ceca96657ad 100644 --- a/src/xml/dom/qdom.h +++ b/src/xml/dom/qdom.h @@ -48,7 +48,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Xml) #ifndef QT_NO_DOM diff --git a/src/xml/sax/qxml.h b/src/xml/sax/qxml.h index c74a3d665b9..8f82f893803 100644 --- a/src/xml/sax/qxml.h +++ b/src/xml/sax/qxml.h @@ -53,7 +53,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Xml) class QXmlNamespaceSupport; class QXmlAttributes; diff --git a/tests/auto/corelib/thread/qthreadonce/qthreadonce.h b/tests/auto/corelib/thread/qthreadonce/qthreadonce.h index 0a3b5600dcc..79e8446ab7a 100644 --- a/tests/auto/corelib/thread/qthreadonce/qthreadonce.h +++ b/tests/auto/corelib/thread/qthreadonce/qthreadonce.h @@ -48,7 +48,6 @@ QT_BEGIN_HEADER -QT_MODULE(Core) #ifndef QT_NO_THREAD diff --git a/tests/benchmarks/corelib/io/qdiriterator/qfilesystemiterator.h b/tests/benchmarks/corelib/io/qdiriterator/qfilesystemiterator.h index cd37e70d52d..6c46e9dce66 100644 --- a/tests/benchmarks/corelib/io/qdiriterator/qfilesystemiterator.h +++ b/tests/benchmarks/corelib/io/qdiriterator/qfilesystemiterator.h @@ -48,7 +48,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Core) class QFileSystemIteratorPrivate; class //Q_CORE_EXPORT diff --git a/tests/benchmarks/corelib/tools/qvector/qrawvector.h b/tests/benchmarks/corelib/tools/qvector/qrawvector.h index 79d2c267007..25f12c46649 100644 --- a/tests/benchmarks/corelib/tools/qvector/qrawvector.h +++ b/tests/benchmarks/corelib/tools/qvector/qrawvector.h @@ -60,7 +60,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Core) |