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>

diff --git a/config.tests/arch/arch.cpp b/config.tests/arch/arch.cpp
index 1a96fb9..b1ec3d7 100644 (file)
--- 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 67baf42..e1563b0 100644 (file)
--- 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 04e0f19..109545c 100644 (file)
--- 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 db5775d..94ff42a 100644 (file)
--- 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