From fcec903da7ce0ec2b95d0b1d639885c6fc71f9c3 Mon Sep 17 00:00:00 2001
From: Thiago Macieira <thiago.macieira@intel.com>
Date: Wed, 28 Mar 2012 16:28:46 -0300
Subject: [PATCH] Ensure that qXXXdetection.h can be included directly

Those files might have dependency on one another, on qconfig.h and on
early qglobal.h definitions, so ensure that the only correct include
order is that of qglobal.h.

Change-Id: I89098bacaf16353ee8b51604ee885508dc8e201a
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
---
 config.tests/arch/arch.cpp               | 1 +
 src/corelib/global/qcompilerdetection.h  | 4 ++++
 src/corelib/global/qprocessordetection.h | 4 ++++
 src/corelib/global/qsystemdetection.h    | 4 ++++
 4 files changed, 13 insertions(+)

diff --git a/config.tests/arch/arch.cpp b/config.tests/arch/arch.cpp
index 1a96fb982f1..b1ec3d7111f 100644
--- a/config.tests/arch/arch.cpp
+++ b/config.tests/arch/arch.cpp
@@ -40,6 +40,7 @@
 ****************************************************************************/
 
 // NOTE: This file is not meant to be compiled, only preprocessed.
+#define QGLOBAL_H
 #include "../../src/corelib/global/qprocessordetection.h"
 #undef alpha
 #undef arm
diff --git a/src/corelib/global/qcompilerdetection.h b/src/corelib/global/qcompilerdetection.h
index 67baf42f8bb..e1563b06450 100644
--- a/src/corelib/global/qcompilerdetection.h
+++ b/src/corelib/global/qcompilerdetection.h
@@ -40,6 +40,10 @@
 **
 ****************************************************************************/
 
+#ifndef QGLOBAL_H
+# include <QtCore/qglobal.h>
+#endif
+
 #ifndef QCOMPILERDETECTION_H
 #define QCOMPILERDETECTION_H
 
diff --git a/src/corelib/global/qprocessordetection.h b/src/corelib/global/qprocessordetection.h
index 04e0f19f06a..109545c10ec 100644
--- a/src/corelib/global/qprocessordetection.h
+++ b/src/corelib/global/qprocessordetection.h
@@ -39,6 +39,10 @@
 **
 ****************************************************************************/
 
+#ifndef QGLOBAL_H
+# include <QtCore/qglobal.h>
+#endif
+
 #ifndef QPROCESSORDETECTION_H
 #define QPROCESSORDETECTION_H
 
diff --git a/src/corelib/global/qsystemdetection.h b/src/corelib/global/qsystemdetection.h
index db5775d0214..94ff42a789f 100644
--- a/src/corelib/global/qsystemdetection.h
+++ b/src/corelib/global/qsystemdetection.h
@@ -39,6 +39,10 @@
 **
 ****************************************************************************/
 
+#ifndef QGLOBAL_H
+# include <QtCore/qglobal.h>
+#endif
+
 #ifndef QSYSTEMDETECTION_H
 #define QSYSTEMDETECTION_H