Fix direct compilation of qtypeinfo.h and others
authorThiago Macieira <thiago.macieira@intel.com>
Mon, 17 Dec 2012 23:25:35 +0000 (15:25 -0800)
committerThe Qt Project <gerrit-noreply@qt-project.org>
Tue, 18 Dec 2012 06:21:39 +0000 (07:21 +0100)
commite14dd5a65d1ba9cd37c8ca9924886e0b36de9911
tree7de8d744bd38c909de7df74fa6df91a99278c787
parentc8b1c9dceaee73df30b6c154df5eed6d119242fe
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>
src/corelib/global/qflags.h
src/corelib/global/qsysinfo.h
src/corelib/global/qtypeinfo.h