diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-04-04 15:58:47 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-04-04 16:59:05 +0000 |
| commit | 7d02fb304536047164e0d9c5041cf2cfc1d676ae (patch) | |
| tree | d3050e080e3a8c461c02690fa7962ff0bc362e9d /src/corelib | |
| parent | 4eb865cd38200263da034a3ee05f972b6e39d876 (diff) | |
Fix recursive include
qatomic.h included qbasicatomic.h which included qatomic.h.
Due to a define in qbasicatomic.h, the definitions from QAtomic would
change depending on which was included first. Fortunately qbasicatomic
does not need qatomic.h so the include can be removed.
Change-Id: I086009f2e16a6e20b2b76fc6b3bf66a343414206
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/corelib')
| -rw-r--r-- | src/corelib/thread/qbasicatomic.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/thread/qbasicatomic.h b/src/corelib/thread/qbasicatomic.h index a0304697b8..6b6ac10713 100644 --- a/src/corelib/thread/qbasicatomic.h +++ b/src/corelib/thread/qbasicatomic.h @@ -38,7 +38,7 @@ ** ****************************************************************************/ -#include <QtCore/qatomic.h> +#include <QtCore/qglobal.h> #ifndef QBASICATOMIC_H #define QBASICATOMIC_H |