From 4ecf82795de54fba530ac9c386f3afff2174edbd Mon Sep 17 00:00:00 2001 From: Gunnar Sletta Date: Mon, 9 Jan 2012 08:53:17 +0100 Subject: 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 --- src/corelib/arch/qatomic_arm.h | 10 ---------- src/corelib/arch/qatomic_armv7.h | 6 ------ 2 files changed, 16 deletions(-) (limited to 'src/corelib/arch') 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 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 -- cgit v1.2.3