From 4bdfa2025c266fcf5f713a9b1bdbee25878bce73 Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Tue, 26 Jun 2012 15:59:57 +0200 Subject: [PATCH] Do not depend on indirect inclusions: #include and forward-declare QObject is now no longer indirectly included by qpair.h, so let's make sure it's forward-declared before use. qpair.h also no longer includes qdatastream.h, so #include "qdatastream.h" before using QDataStream. Change-Id: I698b905cb55d9dce0637f534dc5efeffe5ff882e Reviewed-by: Lars Knoll --- src/quick/designer/designersupport.h | 2 +- tests/auto/qml/debugger/shared/qqmlinspectorclient.cpp | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/quick/designer/designersupport.h b/src/quick/designer/designersupport.h index a31c8c3..54003cf 100644 --- a/src/quick/designer/designersupport.h +++ b/src/quick/designer/designersupport.h @@ -69,7 +69,7 @@ class QImage; class QTransform; class QQmlContext; class QQuickView; - +class QObject; class Q_QUICK_EXPORT DesignerSupport { diff --git a/tests/auto/qml/debugger/shared/qqmlinspectorclient.cpp b/tests/auto/qml/debugger/shared/qqmlinspectorclient.cpp index 604e970..10124e7 100644 --- a/tests/auto/qml/debugger/shared/qqmlinspectorclient.cpp +++ b/tests/auto/qml/debugger/shared/qqmlinspectorclient.cpp @@ -40,6 +40,7 @@ ****************************************************************************/ #include "qqmlinspectorclient.h" +#include "qdatastream.h" void QQmlInspectorClient::setShowAppOnTop(bool showOnTop) { -- 2.7.4