diff options
| author | Gunnar Sletta <gunnar.sletta@nokia.com> | 2012-01-09 08:53:17 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-01-25 10:19:44 +0100 |
| commit | 4ecf82795de54fba530ac9c386f3afff2174edbd (patch) | |
| tree | 7e453145b49364176c3e4a881464e16fe6049e5b /src/corelib/arch/qatomic_armv7.h | |
| 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 <lars.knoll@nokia.com>
Diffstat (limited to 'src/corelib/arch/qatomic_armv7.h')
| -rw-r--r-- | src/corelib/arch/qatomic_armv7.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/src/corelib/arch/qatomic_armv7.h b/src/corelib/arch/qatomic_armv7.h index d734b15893..523f827c69 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 |