AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make qobject_p.h not need qvariant.h.

Browse Source 
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:
Stephen Kelly 2012-02-27 21:57:12 +01:00 committed by Qt by Nokia
parent 85e050b0b3
commit 612152fad8
5 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/corelib/io/qfilesystemwatcher_polling_p.h
View File

@ -58,6 +58,7 @@
#include <QtCore/qdatetime.h>
#include <QtCore/qdir.h>
#include <QtCore/qtimer.h>
#include <QtCore/qhash.h>
#include "qfilesystemwatcher_p.h"

1
src/corelib/kernel/qeventdispatcher_win_p.h
View File

@ -55,6 +55,7 @@
#include "QtCore/qabstracteventdispatcher.h"
#include "QtCore/qt_windows.h"
#include "QtCore/qhash.h"
#include "qabstracteventdispatcher_p.h"

10
src/corelib/kernel/qobject.cpp
View File

@ -69,6 +69,16 @@
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 *queuedConnectionTypes(const QList<QByteArray> &typeNames)

11
src/corelib/kernel/qobject_p.h
View File

@ -60,7 +60,6 @@
#include "QtCore/qlist.h"
#include "QtCore/qvector.h"
#include "QtCore/qreadwritelock.h"
#include "QtCore/qvariant.h"
QT_BEGIN_NAMESPACE
@ -98,16 +97,8 @@ class Q_CORE_EXPORT QObjectPrivate : public QObjectData
{
Q_DECLARE_PUBLIC(QObject)
struct ExtraData;
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 **);
struct Connection

2
src/gui/kernel/qopenglcontext_p.h
View File

@ -49,9 +49,7 @@
#include <private/qobject_p.h>
#include <qmutex.h>
#ifndef QT_NO_DEBUG
#include <QtCore/QHash>
#endif
QT_BEGIN_HEADER