From: Thiago Macieira <thiago.macieira@intel.com>
Date: Mon, 17 Dec 2012 23:25:35 +0000 (-0800)
Subject: Fix direct compilation of qtypeinfo.h and others
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e14dd5a65d1ba9cd37c8ca9924886e0b36de9911;p=profile%2Fivi%2Fqtbase.git

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 <ogoffart@woboq.com>
(cherry picked from commit 797f3c0a01e9adf0af3bc7c0bd3f7f63849d99b9)
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
---

diff --git a/src/corelib/global/qflags.h b/src/corelib/global/qflags.h
index 3edbef3..cbd7185 100644
--- a/src/corelib/global/qflags.h
+++ b/src/corelib/global/qflags.h
@@ -39,10 +39,11 @@
 **
 ****************************************************************************/
 
+#include <QtCore/qglobal.h>
+
 #ifndef QFLAGS_H
 #define QFLAGS_H
 
-#include <QtCore/qglobal.h>
 #include <QtCore/qtypeinfo.h>
 #include <QtCore/qtypetraits.h>
 
diff --git a/src/corelib/global/qsysinfo.h b/src/corelib/global/qsysinfo.h
index 275b899..867acd4 100644
--- a/src/corelib/global/qsysinfo.h
+++ b/src/corelib/global/qsysinfo.h
@@ -39,11 +39,11 @@
 **
 ****************************************************************************/
 
+#include <QtCore/qglobal.h>
+
 #ifndef QSYSINFO_H
 #define QSYSINFO_H
 
-#include <QtCore/qglobal.h>
-
 QT_BEGIN_HEADER
 QT_BEGIN_NAMESPACE
 
diff --git a/src/corelib/global/qtypeinfo.h b/src/corelib/global/qtypeinfo.h
index a4b12fe..68df50a 100644
--- a/src/corelib/global/qtypeinfo.h
+++ b/src/corelib/global/qtypeinfo.h
@@ -39,11 +39,11 @@
 **
 ****************************************************************************/
 
+#include <QtCore/qglobal.h>
+
 #ifndef QTYPEINFO_H
 #define QTYPEINFO_H
 
-#include <QtCore/qglobal.h>
-
 QT_BEGIN_HEADER
 QT_BEGIN_NAMESPACE