diff options
| author | Morten Sorvig <morten.sorvig@nokia.com> | 2009-11-30 17:52:39 -0600 |
|---|---|---|
| committer | Morten Sorvig <morten.sorvig@nokia.com> | 2009-11-30 17:52:39 -0600 |
| commit | dcb1bbe180580a168e783c4a024fd73bd416d67f (patch) | |
| tree | 3aac26fca160536dd5a0eb78800e0fa13d096e35 | |
| parent | 43b36fce161117dbb26a12c1a79d5faee8f694d9 (diff) | |
Use the i386 atomics on NaCl
| -rw-r--r-- | src/corelib/arch/arch.pri | 4 | ||||
| -rw-r--r-- | src/corelib/arch/nacl/dummy | 0 | ||||
| -rw-r--r-- | src/corelib/arch/qatomic_arch.h | 2 |
3 files changed, 6 insertions, 0 deletions
diff --git a/src/corelib/arch/arch.pri b/src/corelib/arch/arch.pri index 57bc80a725..422ee28df1 100644 --- a/src/corelib/arch/arch.pri +++ b/src/corelib/arch/arch.pri @@ -29,6 +29,10 @@ vxworks:HEADERS += arch/qatomic_vxworks.h arch/qatomic_sh.h \ arch/qatomic_sh4a.h +nacl { + HEADERS += arch/qatomic_i386.h +} + QT_ARCH_CPP = $$QT_SOURCE_TREE/src/corelib/arch/$$QT_ARCH DEPENDPATH += $$QT_ARCH_CPP include($$QT_ARCH_CPP/arch.pri, "", true) diff --git a/src/corelib/arch/nacl/dummy b/src/corelib/arch/nacl/dummy new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/src/corelib/arch/nacl/dummy diff --git a/src/corelib/arch/qatomic_arch.h b/src/corelib/arch/qatomic_arch.h index 548a5e9c49..d04208dea5 100644 --- a/src/corelib/arch/qatomic_arch.h +++ b/src/corelib/arch/qatomic_arch.h @@ -88,6 +88,8 @@ QT_BEGIN_HEADER # include "QtCore/qatomic_sh.h" #elif defined(QT_ARCH_SH4A) # include "QtCore/qatomic_sh4a.h" +#elif defined (QT_ARCH_NACL) +# include "QtCore/qatomic_i386.h" #else # error "Qt has not been ported to this architecture" #endif |