diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2012-06-19 11:48:08 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-06-19 12:24:12 +0200 |
| commit | 442447e703936a3c8f737e1cb966f93d987c6ea6 (patch) | |
| tree | 4d7677af0f98faf9c3286962491d1323affe899d /src/declarative | |
| parent | 89db9a3b1c42e793a5da1eaf9cb3eff2569aaed7 (diff) | |
Include <QDataStream> properly where QDataStream is used
And add the missing forward-declaration to QMetaObject in one place. I
guess no one noticed that QObject was actually fully-declared, despite
the existing forward declaration. This was caused by qpair.h including
qdatastream.h, which includes qiodevice.h, then qobject.h, then
qobjectdefs.h.
Change-Id: Idd3aef1acecf0c045a63c154c3ce2d7835afa71b
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
Diffstat (limited to 'src/declarative')
| -rw-r--r-- | src/declarative/debugger/qdeclarativeenginedebug.cpp | 1 | ||||
| -rw-r--r-- | src/declarative/debugger/qjsdebuggeragent_p.h | 1 | ||||
| -rw-r--r-- | src/declarative/qml/qdeclarativefastproperties_p.h | 1 |
3 files changed, 3 insertions, 0 deletions
diff --git a/src/declarative/debugger/qdeclarativeenginedebug.cpp b/src/declarative/debugger/qdeclarativeenginedebug.cpp index 9a1a5104..3232eeab 100644 --- a/src/declarative/debugger/qdeclarativeenginedebug.cpp +++ b/src/declarative/debugger/qdeclarativeenginedebug.cpp @@ -46,6 +46,7 @@ #include <qdeclarativeenginedebugservice_p.h> #include <private/qobject_p.h> +#include <qdatastream.h> QT_BEGIN_NAMESPACE diff --git a/src/declarative/debugger/qjsdebuggeragent_p.h b/src/declarative/debugger/qjsdebuggeragent_p.h index 8bf6a22e..e1752111 100644 --- a/src/declarative/debugger/qjsdebuggeragent_p.h +++ b/src/declarative/debugger/qjsdebuggeragent_p.h @@ -54,6 +54,7 @@ // #include <QtScript/qscriptengineagent.h> +#include <QtCore/qdatastream.h> #include <QtCore/qset.h> QT_BEGIN_NAMESPACE diff --git a/src/declarative/qml/qdeclarativefastproperties_p.h b/src/declarative/qml/qdeclarativefastproperties_p.h index da4411d7..dce8cf5a 100644 --- a/src/declarative/qml/qdeclarativefastproperties_p.h +++ b/src/declarative/qml/qdeclarativefastproperties_p.h @@ -50,6 +50,7 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE class QObject; +class QMetaObject; class QDeclarativeNotifierEndpoint; class QDeclarativeFastProperties { |