From 7d02fb304536047164e0d9c5041cf2cfc1d676ae Mon Sep 17 00:00:00 2001
From: Allan Sandfeld Jensen <allan.jensen@qt.io>
Date: Thu, 4 Apr 2019 15:58:47 +0200
Subject: 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>
---
 src/corelib/thread/qbasicatomic.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/corelib/thread/qbasicatomic.h')

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
-- 
cgit v1.2.3