diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-04-05 10:57:23 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-04-05 10:57:24 +0200 |
| commit | 0998a9d1d53361e572d7377af8cb41a49bbfad72 (patch) | |
| tree | 809a10e4f17ca05dd657dbe78c660a6204096017 /src/corelib/thread/qbasicatomic.h | |
| parent | e227c33455ef364353dd9f6d24934b9c35ff15ec (diff) | |
| parent | 808758ad14ab3cc752cb69e9ae791b4fbd462380 (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13
Change-Id: I010a6322d12e038fdce247a58dfb05e204c2ff3b
Diffstat (limited to 'src/corelib/thread/qbasicatomic.h')
| -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 a0304697b88..6b6ac107134 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 |