From 797f3c0a01e9adf0af3bc7c0bd3f7f63849d99b9 Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Mon, 17 Dec 2012 15:25:35 -0800 Subject: Fix direct compilation of qtypeinfo.h and others qtypeinfo.h is included by qglobal.h, so it needs to include that before the #ifdef. Otherwise, we get a circular dependency problem with qflags.h: ./QtCore/../../src/corelib/global/qflags.h:60:27: error: "Q_PRIMITIVE_TYPE" has not been declared Also, take the opportunity to fix the other headers that are included from qglobal.h to avoid similar problems in the future. Change-Id: I99a56f42775c24bdcc796995b06509c1ca0cb849 Reviewed-by: Olivier Goffart --- src/corelib/global/qflags.h | 3 ++- src/corelib/global/qsysinfo.h | 4 ++-- src/corelib/global/qtypeinfo.h | 4 ++-- 3 files changed, 6 insertions(+), 5 deletions(-) (limited to 'src/corelib') diff --git a/src/corelib/global/qflags.h b/src/corelib/global/qflags.h index 3edbef3bd6..cbd7185a92 100644 --- a/src/corelib/global/qflags.h +++ b/src/corelib/global/qflags.h @@ -39,10 +39,11 @@ ** ****************************************************************************/ +#include + #ifndef QFLAGS_H #define QFLAGS_H -#include #include #include diff --git a/src/corelib/global/qsysinfo.h b/src/corelib/global/qsysinfo.h index 275b899662..867acd4d60 100644 --- a/src/corelib/global/qsysinfo.h +++ b/src/corelib/global/qsysinfo.h @@ -39,11 +39,11 @@ ** ****************************************************************************/ +#include + #ifndef QSYSINFO_H #define QSYSINFO_H -#include - QT_BEGIN_HEADER QT_BEGIN_NAMESPACE diff --git a/src/corelib/global/qtypeinfo.h b/src/corelib/global/qtypeinfo.h index a4b12feae3..68df50a2af 100644 --- a/src/corelib/global/qtypeinfo.h +++ b/src/corelib/global/qtypeinfo.h @@ -39,11 +39,11 @@ ** ****************************************************************************/ +#include + #ifndef QTYPEINFO_H #define QTYPEINFO_H -#include - QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -- cgit v1.2.3