Tidy up some more declarative includes

Remove file dependencies that aren't needed.

Change-Id: I0496ef9435141528f680bbd326da55c3a31e5978
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>

diff --git a/src/declarative/items/qsgpathview_p_p.h b/src/declarative/items/qsgpathview_p_p.h
index 520de42..10549d9 100644 (file)
--- a/src/declarative/items/qsgpathview_p_p.h
+++ b/src/declarative/items/qsgpathview_p_p.h
@@ -64,6 +64,7 @@
 
 #include <private/qdeclarativeanimation_p_p.h>
 #include <private/qdeclarativeguard_p.h>
+#include <private/qdeclarativetimeline_p_p.h>
 
 QT_BEGIN_NAMESPACE
 

diff --git a/src/declarative/qml/qdeclarativebinding.cpp b/src/declarative/qml/qdeclarativebinding.cpp
index 609057d..531842a 100644 (file)
--- a/src/declarative/qml/qdeclarativebinding.cpp
+++ b/src/declarative/qml/qdeclarativebinding.cpp
@@ -45,10 +45,8 @@
 #include "qdeclarative.h"
 #include "qdeclarativecontext.h"
 #include "qdeclarativeinfo.h"
-#include "qdeclarativecontext_p.h"
 #include "qdeclarativecompiler_p.h"
 #include "qdeclarativedata_p.h"
-#include "qdeclarativestringconverters_p.h"
 #include <private/qdeclarativedebugtrace_p.h>
 
 #include <QVariant>

diff --git a/src/declarative/util/qdeclarativeanimation.cpp b/src/declarative/util/qdeclarativeanimation.cpp
index 2fe2aa0..8c21d11 100644 (file)
--- a/src/declarative/util/qdeclarativeanimation.cpp
+++ b/src/declarative/util/qdeclarativeanimation.cpp
@@ -42,7 +42,6 @@
 #include "qdeclarativeanimation_p.h"
 #include "qdeclarativeanimation_p_p.h"
 
-#include <private/qdeclarativebehavior_p.h>
 #include <private/qdeclarativestateoperations_p.h>
 #include <private/qdeclarativecontext_p.h>
 

diff --git a/src/declarative/util/qdeclarativeanimation_p.h b/src/declarative/util/qdeclarativeanimation_p.h
index ac2cb3c..c84af5a 100644 (file)
--- a/src/declarative/util/qdeclarativeanimation_p.h
+++ b/src/declarative/util/qdeclarativeanimation_p.h
@@ -42,7 +42,6 @@
 #ifndef QDECLARATIVEANIMATION_H
 #define QDECLARATIVEANIMATION_H
 
-#include "qdeclarativetransition_p.h"
 #include "qdeclarativestate_p.h"
 #include <QtGui/qvector3d.h>
 

diff --git a/src/declarative/util/qdeclarativeanimation_p_p.h b/src/declarative/util/qdeclarativeanimation_p_p.h
index a14356d..dfeb767 100644 (file)
--- a/src/declarative/util/qdeclarativeanimation_p_p.h
+++ b/src/declarative/util/qdeclarativeanimation_p_p.h
@@ -56,7 +56,6 @@
 #include "qdeclarativeanimation_p.h"
 
 #include <private/qdeclarativenullablevalue_p_p.h>
-#include <private/qdeclarativetimeline_p_p.h>
 
 #include <qdeclarative.h>
 #include <qdeclarativecontext.h>

diff --git a/src/declarative/util/qdeclarativebehavior.cpp b/src/declarative/util/qdeclarativebehavior.cpp
index 3b0ec86..8ff1a06 100644 (file)
--- a/src/declarative/util/qdeclarativebehavior.cpp
+++ b/src/declarative/util/qdeclarativebehavior.cpp
@@ -42,8 +42,6 @@
 #include "qdeclarativebehavior_p.h"
 
 #include "qdeclarativeanimation_p.h"
-#include "qdeclarativetransition_p.h"
-
 #include <qdeclarativecontext.h>
 #include <qdeclarativeinfo.h>
 #include <private/qdeclarativeproperty_p.h>

diff --git a/src/declarative/util/qdeclarativebehavior_p.h b/src/declarative/util/qdeclarativebehavior_p.h
index 233be2b..3918d34 100644 (file)
--- a/src/declarative/util/qdeclarativebehavior_p.h
+++ b/src/declarative/util/qdeclarativebehavior_p.h
@@ -42,9 +42,8 @@
 #ifndef QDECLARATIVEBEHAVIOR_H
 #define QDECLARATIVEBEHAVIOR_H
 
-#include "qdeclarativestate_p.h"
+#include <private/qdeclarativeglobal_p.h>
 
-#include <qdeclarativepropertyvaluesource.h>
 #include <qdeclarativepropertyvalueinterceptor.h>
 #include <qdeclarative.h>
 #include <QtCore/QAbstractAnimation>

diff --git a/src/declarative/util/qdeclarativebind.cpp b/src/declarative/util/qdeclarativebind.cpp
index 5d62830..20b2caa 100644 (file)
--- a/src/declarative/util/qdeclarativebind.cpp
+++ b/src/declarative/util/qdeclarativebind.cpp
@@ -53,8 +53,6 @@
 
 #include <QtCore/qfile.h>
 #include <QtCore/qdebug.h>
-#include <QtDeclarative/qjsvalue.h>
-#include <QtDeclarative/qjsengine.h>
 
 #include <private/qobject_p.h>
 

diff --git a/src/declarative/util/qdeclarativeconnections_p.h b/src/declarative/util/qdeclarativeconnections_p.h
index af652fc..86e1341 100644 (file)
--- a/src/declarative/util/qdeclarativeconnections_p.h
+++ b/src/declarative/util/qdeclarativeconnections_p.h
@@ -43,7 +43,6 @@
 #define QDECLARATIVECONNECTIONS_H
 
 #include <qdeclarative.h>
-#include <qdeclarativescriptstring.h>
 #include <private/qdeclarativecustomparser_p.h>
 
 #include <QtCore/qobject.h>

diff --git a/src/declarative/util/qdeclarativepropertychanges.cpp b/src/declarative/util/qdeclarativepropertychanges.cpp
index fc55943..818c163 100644 (file)
--- a/src/declarative/util/qdeclarativepropertychanges.cpp
+++ b/src/declarative/util/qdeclarativepropertychanges.cpp
@@ -44,7 +44,6 @@
 #include "qdeclarativeopenmetaobject_p.h"
 #include <private/qdeclarativerewrite_p.h>
 #include <private/qdeclarativeengine_p.h>
-#include <private/qdeclarativecompiler_p.h>
 
 #include <qdeclarativeinfo.h>
 #include <private/qdeclarativecustomparser_p.h>

diff --git a/src/declarative/util/qdeclarativestate.cpp b/src/declarative/util/qdeclarativestate.cpp
index e5e245f..2c039f9 100644 (file)
--- a/src/declarative/util/qdeclarativestate.cpp
+++ b/src/declarative/util/qdeclarativestate.cpp
@@ -42,13 +42,9 @@
 #include "qdeclarativestate_p_p.h"
 #include "qdeclarativestate_p.h"
 
-#include "qdeclarativetransition_p.h"
 #include "qdeclarativestategroup_p.h"
 #include "qdeclarativestateoperations_p.h"
-#include "qdeclarativeanimation_p.h"
-#include "qdeclarativeanimation_p_p.h"
 
-#include <private/qdeclarativebinding_p.h>
 #include <private/qdeclarativeglobal_p.h>
 
 #include <QtCore/qdebug.h>

diff --git a/src/declarative/util/qdeclarativestate_p_p.h b/src/declarative/util/qdeclarativestate_p_p.h
index 5ddd0d5..a9c50f4 100644 (file)
--- a/src/declarative/util/qdeclarativestate_p_p.h
+++ b/src/declarative/util/qdeclarativestate_p_p.h
@@ -55,7 +55,6 @@
 
 #include "qdeclarativestate_p.h"
 
-#include "qdeclarativeanimation_p_p.h"
 #include "qdeclarativetransitionmanager_p_p.h"
 
 #include <private/qdeclarativeproperty_p.h>

diff --git a/src/declarative/util/qdeclarativestategroup.cpp b/src/declarative/util/qdeclarativestategroup.cpp
index c29aaa7..51e27e4 100644 (file)
--- a/src/declarative/util/qdeclarativestategroup.cpp
+++ b/src/declarative/util/qdeclarativestategroup.cpp
@@ -42,12 +42,12 @@
 #include "qdeclarativestategroup_p.h"
 
 #include "qdeclarativetransition_p.h"
-#include "qdeclarativestate_p_p.h"
 
 #include <private/qdeclarativebinding_p.h>
 #include <private/qdeclarativeglobal_p.h>
 
 #include <QtCore/qstringbuilder.h>
+#include <QtCore/qstringlist.h>
 #include <QtCore/qdebug.h>
 
 #include <private/qobject_p.h>

diff --git a/src/declarative/util/qdeclarativestateoperations.cpp b/src/declarative/util/qdeclarativestateoperations.cpp
index ec79120..d8a5369 100644 (file)
--- a/src/declarative/util/qdeclarativestateoperations.cpp
+++ b/src/declarative/util/qdeclarativestateoperations.cpp
@@ -46,7 +46,6 @@
 #include <qdeclarativeexpression.h>
 #include <qdeclarativeinfo.h>
 #include <private/qdeclarativeguard_p.h>
-#include <private/qdeclarativenullablevalue_p_p.h>
 #include <private/qdeclarativecontext_p.h>
 #include <private/qdeclarativeproperty_p.h>
 #include <private/qdeclarativebinding_p.h>

diff --git a/src/declarative/util/qdeclarativetransition.cpp b/src/declarative/util/qdeclarativetransition.cpp
index b0f8cbd..916e599 100644 (file)
--- a/src/declarative/util/qdeclarativetransition.cpp
+++ b/src/declarative/util/qdeclarativetransition.cpp
@@ -39,8 +39,9 @@
 **
 ****************************************************************************/
 
+#include "qdeclarativetransition_p.h"
+
 #include "qdeclarativestate_p.h"
-#include "qdeclarativestategroup_p.h"
 #include "qdeclarativestate_p_p.h"
 #include "qdeclarativestateoperations_p.h"
 #include "qdeclarativeanimation_p.h"

diff --git a/src/declarative/util/qdeclarativetransitionmanager.cpp b/src/declarative/util/qdeclarativetransitionmanager.cpp
index 57336f5..2dd1da7 100644 (file)
--- a/src/declarative/util/qdeclarativetransitionmanager.cpp
+++ b/src/declarative/util/qdeclarativetransitionmanager.cpp
@@ -41,6 +41,7 @@
 
 #include "qdeclarativetransitionmanager_p_p.h"
 
+#include "qdeclarativetransition_p.h"
 #include "qdeclarativestate_p_p.h"
 #include "qdeclarativestate_p.h"
 
@@ -48,6 +49,8 @@
 #include <private/qdeclarativeglobal_p.h>
 #include <private/qdeclarativeproperty_p.h>
 
+#include <QtCore/qdebug.h>
+
 QT_BEGIN_NAMESPACE
 
 DEFINE_BOOL_CONFIG_OPTION(stateChangeDebug, STATECHANGE_DEBUG);

diff --git a/tests/auto/declarative/qdeclarativeanimations/tst_qdeclarativeanimations.cpp b/tests/auto/declarative/qdeclarativeanimations/tst_qdeclarativeanimations.cpp
index 76d8326..81aac51 100644 (file)
--- a/tests/auto/declarative/qdeclarativeanimations/tst_qdeclarativeanimations.cpp
+++ b/tests/auto/declarative/qdeclarativeanimations/tst_qdeclarativeanimations.cpp
@@ -44,6 +44,7 @@
 #include <QtDeclarative/qsgview.h>
 #include <QtDeclarative/private/qsgrectangle_p.h>
 #include <QtDeclarative/private/qdeclarativeanimation_p.h>
+#include <QtDeclarative/private/qdeclarativetransition_p.h>
 #include <QtDeclarative/private/qsganimation_p.h>
 #include <QtDeclarative/private/qdeclarativepathinterpolator_p.h>
 #include <QtDeclarative/private/qsgitem_p.h>