diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2013-03-20 13:46:57 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2013-03-20 13:49:28 +0100 |
| commit | 76c0be34cd4ff4564693162fa7528463e23ce9d8 (patch) | |
| tree | f165b7bc319548fb0082365411a871028f92e89e /src/corelib/arch/qatomic_alpha.h | |
| parent | 27b4fe96b59e9e63d1e570e802c072e9afdfb2d4 (diff) | |
| parent | 36cb3f3f655a9090c82de609010cbfb88651a0f3 (diff) | |
Merge branch 'dev' into stable
This starts Qt 5.1 release cycle
Conflicts:
src/gui/text/qfontdatabase.cpp
src/gui/text/qharfbuzz_copy_p.h
src/widgets/kernel/qapplication.cpp
src/widgets/kernel/qcoreapplication.cpp
Change-Id: I72fbf83ab3c2206aeea1b089428b0fc2a89bd62b
Diffstat (limited to 'src/corelib/arch/qatomic_alpha.h')
| -rw-r--r-- | src/corelib/arch/qatomic_alpha.h | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/src/corelib/arch/qatomic_alpha.h b/src/corelib/arch/qatomic_alpha.h index b842859336..71cb112d47 100644 --- a/src/corelib/arch/qatomic_alpha.h +++ b/src/corelib/arch/qatomic_alpha.h @@ -44,10 +44,17 @@ #include <QtCore/qoldbasicatomic.h> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE +#if 0 +// silence syncqt warnings +QT_END_NAMESPACE +QT_END_HEADER + +#pragma qt_sync_skip_header_check +#pragma qt_sync_stop_processing +#endif + #define Q_ATOMIC_INT_REFERENCE_COUNTING_IS_ALWAYS_NATIVE inline bool QBasicAtomicInt::isReferenceCountingNative() @@ -517,6 +524,4 @@ Q_INLINE_TEMPLATE T *QBasicAtomicPointer<T>::fetchAndAddOrdered(qptrdiff valueTo QT_END_NAMESPACE -QT_END_HEADER - #endif // QATOMIC_ALPHA_H |