AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename qatomic_x86_64.h to qatomic_x86.h

Browse Source 
This is the first step in merging the i386 and x86-64
architectures. The next commit will bring i386 support into
qatomic_x86.h.

Change-Id: I24105ea70f3fc29b3fb779a70053f99117440573
Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
This commit is contained in:
Thiago Macieira 2012-02-27 15:32:47 +01:00 committed by Qt by Nokia
parent d4c8509a83
commit 4408d0ccd8
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/corelib/arch/arch.pri
View File

@ -16,7 +16,7 @@ HEADERS += \
arch/qatomic_s390.h \
arch/qatomic_sh4a.h \
arch/qatomic_sparc.h \
arch/qatomic_x86_64.h \
arch/qatomic_x86.h \
arch/qatomic_gcc.h \
arch/qatomic_cxx11.h

0
src/corelib/arch/qatomic_x86_64.h → src/corelib/arch/qatomic_x86.h
View File

4
src/corelib/thread/qbasicatomic.h
View File

@ -82,8 +82,8 @@
# include "QtCore/qatomic_sparc.h"
#elif defined(Q_PROCESSOR_X86_32)
# include <QtCore/qatomic_i386.h>
#elif defined(Q_PROCESSOR_X86_64)
# include <QtCore/qatomic_x86_64.h>
#elif defined(Q_PROCESSOR_X86)
# include <QtCore/qatomic_x86.h>
// Fallback compiler dependent implementation
#elif defined(Q_COMPILER_ATOMICS) && defined(Q_COMPILER_CONSTEXPR)