diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2012-12-17 15:25:35 -0800 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-12-18 07:21:39 +0100 |
| commit | e14dd5a65d1ba9cd37c8ca9924886e0b36de9911 (patch) | |
| tree | 7de8d744bd38c909de7df74fa6df91a99278c787 | |
| parent | c8b1c9dceaee73df30b6c154df5eed6d119242fe (diff) | |
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>
| -rw-r--r-- | src/corelib/global/qflags.h | 3 | ||||
| -rw-r--r-- | src/corelib/global/qsysinfo.h | 4 | ||||
| -rw-r--r-- | src/corelib/global/qtypeinfo.h | 4 |
3 files changed, 6 insertions, 5 deletions
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 <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 275b899662..867acd4d60 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 a4b12feae3..68df50a2af 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 |