diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-11-17 07:14:01 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-11-17 07:14:16 +0100 |
| commit | 17dc773221c402308ddf15bcdb622b00ab7a95c3 (patch) | |
| tree | 2e0b5a076b6b51e5fb77aec0ce379227ef681f3d /src/corelib/thread/qbasicatomic.h | |
| parent | 99d061ffd5ea9fc52d96b92cdf3dce93685b4205 (diff) | |
| parent | 9daef8a54c32162a50b0f558dac829333165618f (diff) | |
Merge remote-tracking branch 'origin/5.5' into 5.6
Change-Id: I6b1fe0c6c360a0d5285911869f0f4f93d86d822e
Diffstat (limited to 'src/corelib/thread/qbasicatomic.h')
| -rw-r--r-- | src/corelib/thread/qbasicatomic.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/corelib/thread/qbasicatomic.h b/src/corelib/thread/qbasicatomic.h index a747134df3..c29b80d3d0 100644 --- a/src/corelib/thread/qbasicatomic.h +++ b/src/corelib/thread/qbasicatomic.h @@ -62,8 +62,6 @@ # include "QtCore/qatomic_armv5.h" #elif defined(Q_PROCESSOR_IA64) # include "QtCore/qatomic_ia64.h" -#elif defined(Q_PROCESSOR_MIPS) -# include "QtCore/qatomic_mips.h" #elif defined(Q_PROCESSOR_X86) # include <QtCore/qatomic_x86.h> |