aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@intel.com>2012-06-26 15:59:57 +0200
committerQt by Nokia <qt-info@nokia.com>2012-06-27 00:56:08 +0200
commit4bdfa2025c266fcf5f713a9b1bdbee25878bce73 (patch)
treef67209bb08fedf8e1b05f48de1b24954574ee7c8
parentfb5c74a07dac7deedb9ab3b8b4390941e5dd0762 (diff)
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 <lars.knoll@nokia.com>
-rw-r--r--src/quick/designer/designersupport.h2
-rw-r--r--tests/auto/qml/debugger/shared/qqmlinspectorclient.cpp1
2 files changed, 2 insertions, 1 deletions
diff --git a/src/quick/designer/designersupport.h b/src/quick/designer/designersupport.h
index a31c8c3d46..54003cf3ba 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 604e970e93..10124e78e2 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)
{