From 612152fad8f531e66ecda9ef72eae32061af7139 Mon Sep 17 00:00:00 2001
From: Stephen Kelly <stephen.kelly@kdab.com>
Date: Mon, 27 Feb 2012 21:57:12 +0100
Subject: 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>
---
 src/corelib/kernel/qobject.cpp | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'src/corelib/kernel/qobject.cpp')

diff --git a/src/corelib/kernel/qobject.cpp b/src/corelib/kernel/qobject.cpp
index 8fa5dcdcff..2231518253 100644
--- a/src/corelib/kernel/qobject.cpp
+++ b/src/corelib/kernel/qobject.cpp
@@ -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)
-- 
cgit v1.2.3