diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2012-12-17 16:13:41 -0800 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-12-19 23:43:17 +0100 |
| commit | 22ce26234ed9b5c8e35fb10f54c769db76eefbbb (patch) | |
| tree | b6f01aa5a2850fb8680105422f338f3f617e7a2f /src/corelib/thread | |
| parent | c9aa1f2c2a7f6d7a238fa2554a419a80cc64752d (diff) | |
Similarly to the 797f3c0a01e9, fix qbasicatomic.h inclusion
qatomic.h includes qbasicatomic.h, so break the cyclic inclusion
problem.
Change-Id: If72bacbcfa36993336786f31e8980fbd43df8bdc
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
Diffstat (limited to 'src/corelib/thread')
| -rw-r--r-- | src/corelib/thread/qbasicatomic.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/corelib/thread/qbasicatomic.h b/src/corelib/thread/qbasicatomic.h index 4177ddbd39..70b69827c2 100644 --- a/src/corelib/thread/qbasicatomic.h +++ b/src/corelib/thread/qbasicatomic.h @@ -39,11 +39,11 @@ ** ****************************************************************************/ +#include <QtCore/qatomic.h> + #ifndef QBASICATOMIC_H #define QBASICATOMIC_H -#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> |