1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix direct compilation of qtypeinfo.h and others

Browse Source 
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>
This commit is contained in:
Thiago Macieira 2012-12-17 15:25:35 -08:00 committed by The Qt Project
parent c8b1c9dcea
commit e14dd5a65d
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/corelib/global/qflags.h
View File

@ -39,10 +39,11 @@
** **
****************************************************************************/ ****************************************************************************/
#include <QtCore/qglobal.h>
#ifndef QFLAGS_H #ifndef QFLAGS_H
#define QFLAGS_H #define QFLAGS_H
#include <QtCore/qglobal.h>
#include <QtCore/qtypeinfo.h> #include <QtCore/qtypeinfo.h>
#include <QtCore/qtypetraits.h> #include <QtCore/qtypetraits.h>

4
src/corelib/global/qsysinfo.h
View File

@ -39,11 +39,11 @@
** **
****************************************************************************/ ****************************************************************************/
#include <QtCore/qglobal.h>
#ifndef QSYSINFO_H #ifndef QSYSINFO_H
#define QSYSINFO_H #define QSYSINFO_H
#include <QtCore/qglobal.h>
QT_BEGIN_HEADER QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE

4
src/corelib/global/qtypeinfo.h
View File

@ -39,11 +39,11 @@
** **
****************************************************************************/ ****************************************************************************/
#include <QtCore/qglobal.h>
#ifndef QTYPEINFO_H #ifndef QTYPEINFO_H
#define QTYPEINFO_H #define QTYPEINFO_H
#include <QtCore/qglobal.h>
QT_BEGIN_HEADER QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE