diff options
| author | Bradley T. Hughes <bradley.hughes@nokia.com> | 2012-02-06 11:42:27 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-02-06 14:50:43 +0100 |
| commit | 86ee853f47ebe9d9705434ab4311caf20c1db7d6 (patch) | |
| tree | 1375df5f06659eec44cf1774a83cae8d214f642b /src/corelib/thread | |
| parent | 73e8ba9aff63e72c000d804c48aedacc9a8ee071 (diff) | |
Silence syncqt warnings for atomic implementation headers
Most of these headers are either forwarding headers, or we explicitly
stop syncqt so that it doesn't generate class includes for the atomic
implementation. Either way, syncqt doesn't see the QT_END_* (and
sometimes not QT_BEGIN_*), which this commit fixes.
Change-Id: Icc8da6f384f38b1ff4eb265c731ce2f2ed92a1a3
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/corelib/thread')
| -rw-r--r-- | src/corelib/thread/qbasicatomic.h | 4 | ||||
| -rw-r--r-- | src/corelib/thread/qgenericatomic.h | 4 | ||||
| -rw-r--r-- | src/corelib/thread/qoldbasicatomic.h | 4 |
3 files changed, 12 insertions, 0 deletions
diff --git a/src/corelib/thread/qbasicatomic.h b/src/corelib/thread/qbasicatomic.h index 47d690c13f..527031bbd1 100644 --- a/src/corelib/thread/qbasicatomic.h +++ b/src/corelib/thread/qbasicatomic.h @@ -78,6 +78,10 @@ QT_BEGIN_NAMESPACE QT_MODULE(Core) #if 0 +// silence syncqt warnings +QT_END_NAMESPACE +QT_END_HEADER + #pragma qt_no_master_include #pragma qt_sync_stop_processing #endif diff --git a/src/corelib/thread/qgenericatomic.h b/src/corelib/thread/qgenericatomic.h index 984ebed47b..f4d5e2f8d9 100644 --- a/src/corelib/thread/qgenericatomic.h +++ b/src/corelib/thread/qgenericatomic.h @@ -48,6 +48,10 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE #if 0 +// silence syncqt warnings +QT_END_NAMESPACE +QT_END_HEADER + #pragma qt_sync_stop_processing #endif diff --git a/src/corelib/thread/qoldbasicatomic.h b/src/corelib/thread/qoldbasicatomic.h index a1985793ed..4697da6301 100644 --- a/src/corelib/thread/qoldbasicatomic.h +++ b/src/corelib/thread/qoldbasicatomic.h @@ -50,6 +50,10 @@ QT_BEGIN_NAMESPACE #if 0 +// silence syncqt warnings +QT_END_NAMESPACE +QT_END_HEADER + #pragma qt_no_master_include #pragma qt_sync_stop_processing #endif |