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]>
pkubaj · Jan 25, 2012 · 4ecf827 · 4ecf827
1 parent 00c8984
commit 4ecf827
Show file tree

Hide file tree

Showing 561 changed files with 25 additions and 732 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -55,7 +55,6 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Core)
 
 /*
  * ENDIAN FUNCTIONS
Original file line number	Diff line number	Diff line change
Expand Up		@@ -54,7 +54,6 @@ QT_BEGIN_HEADER

		QT_BEGIN_NAMESPACE

		QT_MODULE(Gui)

		#ifndef QT_NO_ANIMATION

Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -48,7 +48,6 @@ QT_BEGIN_HEADER

		QT_BEGIN_NAMESPACE

		QT_MODULE(Core)

		#ifndef QT_NO_ANIMATION

Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -52,7 +52,6 @@ QT_BEGIN_HEADER

		QT_BEGIN_NAMESPACE

		QT_MODULE(Core)

		#ifndef QT_NO_ANIMATION

Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -49,7 +49,6 @@ QT_BEGIN_HEADER

		QT_BEGIN_NAMESPACE

		QT_MODULE(Core)

		#ifndef QT_NO_TEXTCODEC

Expand Down
-Original file line number
+Diff line change
@@ Expand Up / @@ -55,7 +55,6 @@ QT_BEGIN_HEADER @@
     QT_BEGIN_NAMESPACE
-    QT_MODULE(Core)
     /*
      * ENDIAN FUNCTIONS
@@ Expand Down @@