summaryrefslogtreecommitdiffstats
path: root/src/corelib/arch/qatomic_arm.h
diff options
context:
space:
mode:
authorGunnar Sletta <gunnar.sletta@nokia.com>2012-01-09 08:53:17 +0100
committerQt by Nokia <qt-info@nokia.com>2012-01-25 10:19:44 +0100
commit4ecf82795de54fba530ac9c386f3afff2174edbd (patch)
tree7e453145b49364176c3e4a881464e16fe6049e5b /src/corelib/arch/qatomic_arm.h
parent00c8984b4e48b2a7eadfee6c3cd0cbb19f586118 (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_arm.h')
-rw-r--r--src/corelib/arch/qatomic_arm.h10
1 files changed, 0 insertions, 10 deletions
diff --git a/src/corelib/arch/qatomic_arm.h b/src/corelib/arch/qatomic_arm.h
index 7516a81fce..a4b826261d 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