diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-04-05 23:01:15 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2019-04-06 01:16:27 +0000 |
| commit | 980755bbcfae1b5da4b5dbdd039b28d05bfdf938 (patch) | |
| tree | 1251b1f00d512c0029cad83a10f2f05dc9e194ed /src/corelib/thread/qbasicatomic.h | |
| parent | dbf7706413bb8d624ac17b24398eaf4ef542ed6b (diff) | |
| parent | 3460e6e941181ccdc56e74d5bd1ed190b6e6f417 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.13' into dev" into refs/staging/dev
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 ad6cba04dd..4c3c1fc01f 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 |