summaryrefslogtreecommitdiffstats
path: root/src/corelib/arch/arch.pri
diff options
context:
space:
mode:
authorBradley T. Hughes <bradley.hughes@nokia.com>2012-01-25 16:12:53 +0100
committerQt by Nokia <qt-info@nokia.com>2012-01-26 13:24:11 +0100
commit68e5fd9ebc8a3f510e3144e981a0cb358945fb9c (patch)
tree3d85d56e042f1822637f358ad6687df8b1dae076 /src/corelib/arch/arch.pri
parent61e8487e8e922f82811cda67550a0aa3905761bc (diff)
Remove the 'macosx' arch
The new atomic implementation chooses which header to include based on what #define's are set by the compiler (i.e. __x86_64__ or __i386__). Because of this, the qatomic_macosx.h header isn't used anymore. This also means that the configure script does not need to use or look for this file anymore, it should just use the normal uname -m detection. Change-Id: Ibf275488735483268286196952299c0e496dfd1f Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Diffstat (limited to 'src/corelib/arch/arch.pri')
-rw-r--r--src/corelib/arch/arch.pri3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/corelib/arch/arch.pri b/src/corelib/arch/arch.pri
index 2921f8edc5..e8699a27c6 100644
--- a/src/corelib/arch/arch.pri
+++ b/src/corelib/arch/arch.pri
@@ -4,7 +4,8 @@ win32:HEADERS += arch/qatomic_windows.h \
win32-g++*:HEADERS += arch/qatomic_i386.h \
arch/qatomic_x86_64.h
-mac:HEADERS += arch/qatomic_macosx.h \
+mac:HEADERS += arch/qatomic_i386.h \
+ arch/qatomic_x86_64.h \
arch/qatomic_generic.h
vxworks:HEADERS += arch/qatomic_vxworks.h