Make qobject_p.h not need qvariant.h.
Move definition of ExtraData to the implementation file. As a side effect, we need to include qhash.h in some other places. Change-Id: I8bb4ec0940ae51c7d6961c9a51adb80fd444e1e3 Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
This commit is contained in:
parent
85e050b0b3
commit
612152fad8
@ -58,6 +58,7 @@
|
|||||||
#include <QtCore/qdatetime.h>
|
#include <QtCore/qdatetime.h>
|
||||||
#include <QtCore/qdir.h>
|
#include <QtCore/qdir.h>
|
||||||
#include <QtCore/qtimer.h>
|
#include <QtCore/qtimer.h>
|
||||||
|
#include <QtCore/qhash.h>
|
||||||
|
|
||||||
#include "qfilesystemwatcher_p.h"
|
#include "qfilesystemwatcher_p.h"
|
||||||
|
|
||||||
|
@ -55,6 +55,7 @@
|
|||||||
|
|
||||||
#include "QtCore/qabstracteventdispatcher.h"
|
#include "QtCore/qabstracteventdispatcher.h"
|
||||||
#include "QtCore/qt_windows.h"
|
#include "QtCore/qt_windows.h"
|
||||||
|
#include "QtCore/qhash.h"
|
||||||
|
|
||||||
#include "qabstracteventdispatcher_p.h"
|
#include "qabstracteventdispatcher_p.h"
|
||||||
|
|
||||||
|
@ -69,6 +69,16 @@
|
|||||||
|
|
||||||
QT_BEGIN_NAMESPACE
|
QT_BEGIN_NAMESPACE
|
||||||
|
|
||||||
|
struct QObjectPrivate::ExtraData
|
||||||
|
{
|
||||||
|
ExtraData() {}
|
||||||
|
#ifndef QT_NO_USERDATA
|
||||||
|
QVector<QObjectUserData *> userData;
|
||||||
|
#endif
|
||||||
|
QList<QByteArray> propertyNames;
|
||||||
|
QList<QVariant> propertyValues;
|
||||||
|
};
|
||||||
|
|
||||||
static int DIRECT_CONNECTION_ONLY = 0;
|
static int DIRECT_CONNECTION_ONLY = 0;
|
||||||
|
|
||||||
static int *queuedConnectionTypes(const QList<QByteArray> &typeNames)
|
static int *queuedConnectionTypes(const QList<QByteArray> &typeNames)
|
||||||
|
@ -60,7 +60,6 @@
|
|||||||
#include "QtCore/qlist.h"
|
#include "QtCore/qlist.h"
|
||||||
#include "QtCore/qvector.h"
|
#include "QtCore/qvector.h"
|
||||||
#include "QtCore/qreadwritelock.h"
|
#include "QtCore/qreadwritelock.h"
|
||||||
#include "QtCore/qvariant.h"
|
|
||||||
|
|
||||||
QT_BEGIN_NAMESPACE
|
QT_BEGIN_NAMESPACE
|
||||||
|
|
||||||
@ -98,16 +97,8 @@ class Q_CORE_EXPORT QObjectPrivate : public QObjectData
|
|||||||
{
|
{
|
||||||
Q_DECLARE_PUBLIC(QObject)
|
Q_DECLARE_PUBLIC(QObject)
|
||||||
|
|
||||||
|
struct ExtraData;
|
||||||
public:
|
public:
|
||||||
struct ExtraData
|
|
||||||
{
|
|
||||||
ExtraData() {}
|
|
||||||
#ifndef QT_NO_USERDATA
|
|
||||||
QVector<QObjectUserData *> userData;
|
|
||||||
#endif
|
|
||||||
QList<QByteArray> propertyNames;
|
|
||||||
QList<QVariant> propertyValues;
|
|
||||||
};
|
|
||||||
|
|
||||||
typedef void (*StaticMetaCallFunction)(QObject *, QMetaObject::Call, int, void **);
|
typedef void (*StaticMetaCallFunction)(QObject *, QMetaObject::Call, int, void **);
|
||||||
struct Connection
|
struct Connection
|
||||||
|
@ -49,9 +49,7 @@
|
|||||||
#include <private/qobject_p.h>
|
#include <private/qobject_p.h>
|
||||||
#include <qmutex.h>
|
#include <qmutex.h>
|
||||||
|
|
||||||
#ifndef QT_NO_DEBUG
|
|
||||||
#include <QtCore/QHash>
|
#include <QtCore/QHash>
|
||||||
#endif
|
|
||||||
|
|
||||||
QT_BEGIN_HEADER
|
QT_BEGIN_HEADER
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user