diff options
Diffstat (limited to 'src/corelib/thread')
| -rw-r--r-- | src/corelib/thread/qbasicatomic.h | 5 | ||||
| -rw-r--r-- | src/corelib/thread/qoldbasicatomic.h | 4 |
2 files changed, 5 insertions, 4 deletions
diff --git a/src/corelib/thread/qbasicatomic.h b/src/corelib/thread/qbasicatomic.h index 91df7501a0..fd32c55ed0 100644 --- a/src/corelib/thread/qbasicatomic.h +++ b/src/corelib/thread/qbasicatomic.h @@ -43,7 +43,11 @@ #include <QtCore/qglobal.h> +#if defined(QT_MOC) || defined(QT_BUILD_QMAKE) || defined(QT_RCC) || defined(QT_UIC) || defined(QT_BOOTSTRAPPED) +# include <QtCore/qatomic_bootstrap.h> +#else # define QT_OLD_ATOMICS +#endif #ifdef QT_OLD_ATOMICS # include "qoldbasicatomic.h" @@ -207,4 +211,5 @@ QT_END_HEADER #endif // QT_OLD_ATOMICS + #endif // QBASIC_ATOMIC diff --git a/src/corelib/thread/qoldbasicatomic.h b/src/corelib/thread/qoldbasicatomic.h index 0842bf5f4c..96feb2e491 100644 --- a/src/corelib/thread/qoldbasicatomic.h +++ b/src/corelib/thread/qoldbasicatomic.h @@ -171,10 +171,6 @@ public: QT_END_NAMESPACE QT_END_HEADER -#if defined(QT_MOC) || defined(QT_BUILD_QMAKE) || defined(QT_RCC) || defined(QT_UIC) || defined(QT_BOOTSTRAPPED) -# include <QtCore/qatomic_bootstrap.h> -#else # include <QtCore/qatomic_arch.h> -#endif #endif // QBASIC_ATOMIC |