Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7

56 files changed, 133 insertions, 133 deletions

diff --git a/src/declarative/graphicsitems/qdeclarativeanchors.cpp b/src/declarative/graphicsitems/qdeclarativeanchors.cpp
index ffcedda..7a7e5be 100644
--- a/src/declarative/graphicsitems/qdeclarativeanchors.cpp
+++ b/src/declarative/graphicsitems/qdeclarativeanchors.cpp
@@ -39,10 +39,10 @@
 **
 ****************************************************************************/
 
-#include "qdeclarativeanchors_p_p.h"
+#include "private/qdeclarativeanchors_p_p.h"
 
 #include "qdeclarativeitem.h"
-#include "qdeclarativeitem_p.h"
+#include "private/qdeclarativeitem_p.h"
 
 #include <qdeclarativeinfo.h>
 
diff --git a/src/declarative/graphicsitems/qdeclarativeanchors_p_p.h b/src/declarative/graphicsitems/qdeclarativeanchors_p_p.h
index 5840868..ba6359a 100644
--- a/src/declarative/graphicsitems/qdeclarativeanchors_p_p.h
+++ b/src/declarative/graphicsitems/qdeclarativeanchors_p_p.h
@@ -53,8 +53,8 @@
 // We mean it.
 //
 
-#include "qdeclarativeanchors_p.h"
-#include "qdeclarativeitemchangelistener_p.h"
+#include "private/qdeclarativeanchors_p.h"
+#include "private/qdeclarativeitemchangelistener_p.h"
 #include <private/qobject_p.h>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/declarative/graphicsitems/qdeclarativeanimatedimage.cpp b/src/declarative/graphicsitems/qdeclarativeanimatedimage.cpp
index 2c2e034..f14f773 100644
--- a/src/declarative/graphicsitems/qdeclarativeanimatedimage.cpp
+++ b/src/declarative/graphicsitems/qdeclarativeanimatedimage.cpp
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 
-#include "qdeclarativeanimatedimage_p.h"
-#include "qdeclarativeanimatedimage_p_p.h"
+#include "private/qdeclarativeanimatedimage_p.h"
+#include "private/qdeclarativeanimatedimage_p_p.h"
 
 #include <qdeclarativeengine.h>
 
diff --git a/src/declarative/graphicsitems/qdeclarativeanimatedimage_p.h b/src/declarative/graphicsitems/qdeclarativeanimatedimage_p.h
index b2979fe..6ab66b3 100644
--- a/src/declarative/graphicsitems/qdeclarativeanimatedimage_p.h
+++ b/src/declarative/graphicsitems/qdeclarativeanimatedimage_p.h
@@ -42,7 +42,7 @@
 #ifndef QDECLARATIVEANIMATEDIMAGE_H
 #define QDECLARATIVEANIMATEDIMAGE_H
 
-#include "qdeclarativeimage_p.h"
+#include "private/qdeclarativeimage_p.h"
 
 QT_BEGIN_HEADER
 
diff --git a/src/declarative/graphicsitems/qdeclarativeanimatedimage_p_p.h b/src/declarative/graphicsitems/qdeclarativeanimatedimage_p_p.h
index 273c1d6..8ca9755 100644
--- a/src/declarative/graphicsitems/qdeclarativeanimatedimage_p_p.h
+++ b/src/declarative/graphicsitems/qdeclarativeanimatedimage_p_p.h
@@ -53,7 +53,7 @@
 // We mean it.
 //
 
-#include "qdeclarativeimage_p_p.h"
+#include "private/qdeclarativeimage_p_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/declarative/graphicsitems/qdeclarativeborderimage.cpp b/src/declarative/graphicsitems/qdeclarativeborderimage.cpp
index 96f95f2..420ed90 100644
--- a/src/declarative/graphicsitems/qdeclarativeborderimage.cpp
+++ b/src/declarative/graphicsitems/qdeclarativeborderimage.cpp
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 
-#include "qdeclarativeborderimage_p.h"
-#include "qdeclarativeborderimage_p_p.h"
+#include "private/qdeclarativeborderimage_p.h"
+#include "private/qdeclarativeborderimage_p_p.h"
 
 #include <qdeclarativeengine.h>
 
diff --git a/src/declarative/graphicsitems/qdeclarativeborderimage_p.h b/src/declarative/graphicsitems/qdeclarativeborderimage_p.h
index a759e67..5e725ca 100644
--- a/src/declarative/graphicsitems/qdeclarativeborderimage_p.h
+++ b/src/declarative/graphicsitems/qdeclarativeborderimage_p.h
@@ -42,7 +42,7 @@
 #ifndef QDECLARATIVEBORDERIMAGE_H
 #define QDECLARATIVEBORDERIMAGE_H
 
-#include "qdeclarativeimagebase_p.h"
+#include "private/qdeclarativeimagebase_p.h"
 
 #include <QtNetwork/qnetworkreply.h>
 
diff --git a/src/declarative/graphicsitems/qdeclarativeborderimage_p_p.h b/src/declarative/graphicsitems/qdeclarativeborderimage_p_p.h
index 82b9ebf..3535109 100644
--- a/src/declarative/graphicsitems/qdeclarativeborderimage_p_p.h
+++ b/src/declarative/graphicsitems/qdeclarativeborderimage_p_p.h
@@ -53,8 +53,8 @@
 // We mean it.
 //
 
-#include "qdeclarativeimagebase_p_p.h"
-#include "qdeclarativescalegrid_p_p.h"
+#include "private/qdeclarativeimagebase_p_p.h"
+#include "private/qdeclarativescalegrid_p_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/declarative/graphicsitems/qdeclarativeevents.cpp b/src/declarative/graphicsitems/qdeclarativeevents.cpp
index 8be2f40..6118ea8 100644
--- a/src/declarative/graphicsitems/qdeclarativeevents.cpp
+++ b/src/declarative/graphicsitems/qdeclarativeevents.cpp
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include "qdeclarativeevents_p_p.h"
+#include "private/qdeclarativeevents_p_p.h"
 
 QT_BEGIN_NAMESPACE
 /*!
diff --git a/src/declarative/graphicsitems/qdeclarativeflickable.cpp b/src/declarative/graphicsitems/qdeclarativeflickable.cpp
index 8459245..fc7a87b 100644
--- a/src/declarative/graphicsitems/qdeclarativeflickable.cpp
+++ b/src/declarative/graphicsitems/qdeclarativeflickable.cpp
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 
-#include "qdeclarativeflickable_p.h"
-#include "qdeclarativeflickable_p_p.h"
+#include "private/qdeclarativeflickable_p.h"
+#include "private/qdeclarativeflickable_p_p.h"
 
 #include <QGraphicsSceneMouseEvent>
 #include <QPointer>
diff --git a/src/declarative/graphicsitems/qdeclarativeflickable_p_p.h b/src/declarative/graphicsitems/qdeclarativeflickable_p_p.h
index c963c2b..1a04091 100644
--- a/src/declarative/graphicsitems/qdeclarativeflickable_p_p.h
+++ b/src/declarative/graphicsitems/qdeclarativeflickable_p_p.h
@@ -53,10 +53,10 @@
 // We mean it.
 //
 
-#include "qdeclarativeflickable_p.h"
+#include "private/qdeclarativeflickable_p.h"
 
-#include "qdeclarativeitem_p.h"
-#include "qdeclarativeitemchangelistener_p.h"
+#include "private/qdeclarativeitem_p.h"
+#include "private/qdeclarativeitemchangelistener_p.h"
 
 #include <qdeclarative.h>
 #include <qdeclarativetimeline_p_p.h>
diff --git a/src/declarative/graphicsitems/qdeclarativeflipable.cpp b/src/declarative/graphicsitems/qdeclarativeflipable.cpp
index ccefc70..98e34a9 100644
--- a/src/declarative/graphicsitems/qdeclarativeflipable.cpp
+++ b/src/declarative/graphicsitems/qdeclarativeflipable.cpp
@@ -39,10 +39,10 @@
 **
 ****************************************************************************/
 
-#include "qdeclarativeflipable_p.h"
+#include "private/qdeclarativeflipable_p.h"
 
-#include "qdeclarativeitem_p.h"
-#include "qdeclarativeguard_p.h"
+#include "private/qdeclarativeitem_p.h"
+#include "private/qdeclarativeguard_p.h"
 
 #include <qdeclarativeinfo.h>
 
diff --git a/src/declarative/graphicsitems/qdeclarativefocuspanel.cpp b/src/declarative/graphicsitems/qdeclarativefocuspanel.cpp
index 20524b6..bd60e25 100644
--- a/src/declarative/graphicsitems/qdeclarativefocuspanel.cpp
+++ b/src/declarative/graphicsitems/qdeclarativefocuspanel.cpp
@@ -39,9 +39,9 @@
 **
 ****************************************************************************/
 
-#include "qdeclarativefocuspanel_p.h"
+#include "private/qdeclarativefocuspanel_p.h"
 
-#include "qdeclarativeitem_p.h"
+#include "private/qdeclarativeitem_p.h"
 
 #include <QtGui/qgraphicsscene.h>
 #include <QEvent>
diff --git a/src/declarative/graphicsitems/qdeclarativefocusscope.cpp b/src/declarative/graphicsitems/qdeclarativefocusscope.cpp
index 484df13..4bd2a86 100644
--- a/src/declarative/graphicsitems/qdeclarativefocusscope.cpp
+++ b/src/declarative/graphicsitems/qdeclarativefocusscope.cpp
@@ -39,9 +39,9 @@
 **
 ****************************************************************************/
 
-#include "qdeclarativefocusscope_p.h"
+#include "private/qdeclarativefocusscope_p.h"
 
-#include "qdeclarativeitem_p.h"
+#include "private/qdeclarativeitem_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/declarative/graphicsitems/qdeclarativegraphicsobjectcontainer.cpp b/src/declarative/graphicsitems/qdeclarativegraphicsobjectcontainer.cpp
index ff85bbd..c846431 100644
--- a/src/declarative/graphicsitems/qdeclarativegraphicsobjectcontainer.cpp
+++ b/src/declarative/graphicsitems/qdeclarativegraphicsobjectcontainer.cpp
@@ -39,9 +39,9 @@
 **
 ****************************************************************************/
 
-#include "qdeclarativegraphicsobjectcontainer_p.h"
+#include "private/qdeclarativegraphicsobjectcontainer_p.h"
 
-#include "qdeclarativeitem_p.h"
+#include "private/qdeclarativeitem_p.h"
 
 #include <QGraphicsObject>
 #include <QGraphicsWidget>
diff --git a/src/declarative/graphicsitems/qdeclarativegridview.cpp b/src/declarative/graphicsitems/qdeclarativegridview.cpp
index 30f04f6..8247f17 100644
--- a/src/declarative/graphicsitems/qdeclarativegridview.cpp
+++ b/src/declarative/graphicsitems/qdeclarativegridview.cpp
@@ -39,12 +39,12 @@
 **
 ****************************************************************************/
 
-#include "qdeclarativegridview_p.h"
+#include "private/qdeclarativegridview_p.h"
 
-#include "qdeclarativevisualitemmodel_p.h"
-#include "qdeclarativeflickable_p_p.h"
+#include "private/qdeclarativevisualitemmodel_p.h"
+#include "private/qdeclarativeflickable_p_p.h"
 
-#include "qdeclarativesmoothedanimation_p_p.h"
+#include "private/qdeclarativesmoothedanimation_p_p.h"
 #include <qdeclarativeguard_p.h>
 
 #include <qlistmodelinterface_p.h>
diff --git a/src/declarative/graphicsitems/qdeclarativegridview_p.h b/src/declarative/graphicsitems/qdeclarativegridview_p.h
index 90f13d2..f73f632 100644
--- a/src/declarative/graphicsitems/qdeclarativegridview_p.h
+++ b/src/declarative/graphicsitems/qdeclarativegridview_p.h
@@ -42,7 +42,7 @@
 #ifndef QDECLARATIVEGRIDVIEW_H
 #define QDECLARATIVEGRIDVIEW_H
 
-#include "qdeclarativeflickable_p.h"
+#include "private/qdeclarativeflickable_p.h"
 
 QT_BEGIN_HEADER
 
diff --git a/src/declarative/graphicsitems/qdeclarativeimage.cpp b/src/declarative/graphicsitems/qdeclarativeimage.cpp
index 3145c43..e4f3464 100644
--- a/src/declarative/graphicsitems/qdeclarativeimage.cpp
+++ b/src/declarative/graphicsitems/qdeclarativeimage.cpp
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 
-#include "qdeclarativeimage_p.h"
-#include "qdeclarativeimage_p_p.h"
+#include "private/qdeclarativeimage_p.h"
+#include "private/qdeclarativeimage_p_p.h"
 
 #include <QKeyEvent>
 #include <QPainter>
diff --git a/src/declarative/graphicsitems/qdeclarativeimage_p.h b/src/declarative/graphicsitems/qdeclarativeimage_p.h
index da6cbd5..5ea700d 100644
--- a/src/declarative/graphicsitems/qdeclarativeimage_p.h
+++ b/src/declarative/graphicsitems/qdeclarativeimage_p.h
@@ -42,7 +42,7 @@
 #ifndef QDECLARATIVEIMAGE_H
 #define QDECLARATIVEIMAGE_H
 
-#include "qdeclarativeimagebase_p.h"
+#include "private/qdeclarativeimagebase_p.h"
 
 #include <QtNetwork/qnetworkreply.h>
 
diff --git a/src/declarative/graphicsitems/qdeclarativeimage_p_p.h b/src/declarative/graphicsitems/qdeclarativeimage_p_p.h
index 8102237..dd12a00 100644
--- a/src/declarative/graphicsitems/qdeclarativeimage_p_p.h
+++ b/src/declarative/graphicsitems/qdeclarativeimage_p_p.h
@@ -53,8 +53,8 @@
 // We mean it.
 //
 
-#include "qdeclarativeitem_p.h"
-#include "qdeclarativeimagebase_p_p.h"
+#include "private/qdeclarativeitem_p.h"
+#include "private/qdeclarativeimagebase_p_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/declarative/graphicsitems/qdeclarativeimagebase.cpp b/src/declarative/graphicsitems/qdeclarativeimagebase.cpp
index 5a234b7..3acafe8 100644
--- a/src/declarative/graphicsitems/qdeclarativeimagebase.cpp
+++ b/src/declarative/graphicsitems/qdeclarativeimagebase.cpp
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 
-#include "qdeclarativeimagebase_p.h"
-#include "qdeclarativeimagebase_p_p.h"
+#include "private/qdeclarativeimagebase_p.h"
+#include "private/qdeclarativeimagebase_p_p.h"
 
 #include <qdeclarativeengine.h>
 #include <qdeclarativepixmapcache_p.h>
diff --git a/src/declarative/graphicsitems/qdeclarativeimagebase_p_p.h b/src/declarative/graphicsitems/qdeclarativeimagebase_p_p.h
index de8c93a..392c1db 100644
--- a/src/declarative/graphicsitems/qdeclarativeimagebase_p_p.h
+++ b/src/declarative/graphicsitems/qdeclarativeimagebase_p_p.h
@@ -53,7 +53,7 @@
 // We mean it.
 //
 
-#include "qdeclarativeitem_p.h"
+#include "private/qdeclarativeitem_p.h"
 
 #include <QtCore/QPointer>
 
diff --git a/src/declarative/graphicsitems/qdeclarativeitem.cpp b/src/declarative/graphicsitems/qdeclarativeitem.cpp
index 83c79a0..55a81f4 100644
--- a/src/declarative/graphicsitems/qdeclarativeitem.cpp
+++ b/src/declarative/graphicsitems/qdeclarativeitem.cpp
@@ -39,10 +39,10 @@
 **
 ****************************************************************************/
 
-#include "qdeclarativeitem_p.h"
+#include "private/qdeclarativeitem_p.h"
 #include "qdeclarativeitem.h"
 
-#include "qdeclarativeevents_p_p.h"
+#include "private/qdeclarativeevents_p_p.h"
 #include <private/qdeclarativeengine_p.h>
 
 #include <qdeclarativeengine.h>
diff --git a/src/declarative/graphicsitems/qdeclarativeitemsmodule.cpp b/src/declarative/graphicsitems/qdeclarativeitemsmodule.cpp
index 97a22cf..7989a27 100644
--- a/src/declarative/graphicsitems/qdeclarativeitemsmodule.cpp
+++ b/src/declarative/graphicsitems/qdeclarativeitemsmodule.cpp
@@ -39,46 +39,46 @@
 **
 ****************************************************************************/
 
-#include "qdeclarativeitemsmodule_p.h"
+#include "private/qdeclarativeitemsmodule_p.h"
 
 #include <QtGui/qaction.h>
 #include <QtGui/qvalidator.h>
 #include <QtGui/qgraphicseffect.h>
 
-#include "qdeclarativeevents_p_p.h"
-#include "qdeclarativeeffects_p.h"
-#include "qdeclarativescalegrid_p_p.h"
-#include "qdeclarativeanimatedimage_p.h"
-#include "qdeclarativeborderimage_p.h"
-#include "qdeclarativepositioners_p.h"
-#include "qdeclarativemousearea_p.h"
-#include "qdeclarativeflickable_p.h"
-#include "qdeclarativeflickable_p_p.h"
-#include "qdeclarativeflipable_p.h"
-#include "qdeclarativefocuspanel_p.h"
-#include "qdeclarativefocusscope_p.h"
-#include "qdeclarativegraphicsobjectcontainer_p.h"
-#include "qdeclarativegridview_p.h"
-#include "qdeclarativeimage_p.h"
-#include "qdeclarativeitem_p.h"
-#include "qdeclarativelayoutitem_p.h"
-#include "qdeclarativelistview_p.h"
-#include "qdeclarativeloader_p.h"
-#include "qdeclarativemousearea_p.h"
-#include "qdeclarativepath_p.h"
-#include "qdeclarativepathview_p.h"
-#include "qdeclarativerectangle_p.h"
-#include "qdeclarativerepeater_p.h"
-#include "qdeclarativetranslate_p.h"
-#include "qdeclarativetext_p.h"
-#include "qdeclarativetextedit_p.h"
-#include "qdeclarativetextinput_p.h"
-#include "qdeclarativevisualitemmodel_p.h"
+#include "private/qdeclarativeevents_p_p.h"
+#include "private/qdeclarativeeffects_p.h"
+#include "private/qdeclarativescalegrid_p_p.h"
+#include "private/qdeclarativeanimatedimage_p.h"
+#include "private/qdeclarativeborderimage_p.h"
+#include "private/qdeclarativepositioners_p.h"
+#include "private/qdeclarativemousearea_p.h"
+#include "private/qdeclarativeflickable_p.h"
+#include "private/qdeclarativeflickable_p_p.h"
+#include "private/qdeclarativeflipable_p.h"
+#include "private/qdeclarativefocuspanel_p.h"
+#include "private/qdeclarativefocusscope_p.h"
+#include "private/qdeclarativegraphicsobjectcontainer_p.h"
+#include "private/qdeclarativegridview_p.h"
+#include "private/qdeclarativeimage_p.h"
+#include "private/qdeclarativeitem_p.h"
+#include "private/qdeclarativelayoutitem_p.h"
+#include "private/qdeclarativelistview_p.h"
+#include "private/qdeclarativeloader_p.h"
+#include "private/qdeclarativemousearea_p.h"
+#include "private/qdeclarativepath_p.h"
+#include "private/qdeclarativepathview_p.h"
+#include "private/qdeclarativerectangle_p.h"
+#include "private/qdeclarativerepeater_p.h"
+#include "private/qdeclarativetranslate_p.h"
+#include "private/qdeclarativetext_p.h"
+#include "private/qdeclarativetextedit_p.h"
+#include "private/qdeclarativetextinput_p.h"
+#include "private/qdeclarativevisualitemmodel_p.h"
 #ifdef QT_WEBKIT_LIB
-#include "qdeclarativewebview_p.h"
-#include "qdeclarativewebview_p_p.h"
+#include "private/qdeclarativewebview_p.h"
+#include "private/qdeclarativewebview_p_p.h"
 #endif
-#include "qdeclarativeanchors_p.h"
+#include "private/qdeclarativeanchors_p.h"
 
 void QDeclarativeItemModule::defineModule()
 {
diff --git a/src/declarative/graphicsitems/qdeclarativelayoutitem.cpp b/src/declarative/graphicsitems/qdeclarativelayoutitem.cpp
index a23ea65..1bbdd97 100644
--- a/src/declarative/graphicsitems/qdeclarativelayoutitem.cpp
+++ b/src/declarative/graphicsitems/qdeclarativelayoutitem.cpp
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include "qdeclarativelayoutitem_p.h"
+#include "private/qdeclarativelayoutitem_p.h"
 
 #include <QDebug>
 
diff --git a/src/declarative/graphicsitems/qdeclarativelistview.cpp b/src/declarative/graphicsitems/qdeclarativelistview.cpp
index 308612f..e85d60f 100644
--- a/src/declarative/graphicsitems/qdeclarativelistview.cpp
+++ b/src/declarative/graphicsitems/qdeclarativelistview.cpp
@@ -39,12 +39,12 @@
 **
 ****************************************************************************/
 
-#include "qdeclarativelistview_p.h"
+#include "private/qdeclarativelistview_p.h"
 
-#include "qdeclarativeflickable_p_p.h"
-#include "qdeclarativevisualitemmodel_p.h"
+#include "private/qdeclarativeflickable_p_p.h"
+#include "private/qdeclarativevisualitemmodel_p.h"
 
-#include "qdeclarativesmoothedanimation_p_p.h"
+#include "private/qdeclarativesmoothedanimation_p_p.h"
 #include <qdeclarativeexpression.h>
 #include <qdeclarativeengine.h>
 #include <qdeclarativeguard_p.h>
diff --git a/src/declarative/graphicsitems/qdeclarativelistview_p.h b/src/declarative/graphicsitems/qdeclarativelistview_p.h
index 3635b39..5810979 100644
--- a/src/declarative/graphicsitems/qdeclarativelistview_p.h
+++ b/src/declarative/graphicsitems/qdeclarativelistview_p.h
@@ -42,7 +42,7 @@
 #ifndef QDECLARATIVELISTVIEW_H
 #define QDECLARATIVELISTVIEW_H
 
-#include "qdeclarativeflickable_p.h"
+#include "private/qdeclarativeflickable_p.h"
 
 QT_BEGIN_HEADER
 
diff --git a/src/declarative/graphicsitems/qdeclarativeloader.cpp b/src/declarative/graphicsitems/qdeclarativeloader.cpp
index 2f1511e..2aab36f 100644
--- a/src/declarative/graphicsitems/qdeclarativeloader.cpp
+++ b/src/declarative/graphicsitems/qdeclarativeloader.cpp
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include "qdeclarativeloader_p_p.h"
+#include "private/qdeclarativeloader_p_p.h"
 
 #include <qdeclarativeinfo.h>
 #include <qdeclarativeengine_p.h>
diff --git a/src/declarative/graphicsitems/qdeclarativeloader_p_p.h b/src/declarative/graphicsitems/qdeclarativeloader_p_p.h
index fc5e665..49069f9 100644
--- a/src/declarative/graphicsitems/qdeclarativeloader_p_p.h
+++ b/src/declarative/graphicsitems/qdeclarativeloader_p_p.h
@@ -53,10 +53,10 @@
 // We mean it.
 //
 
-#include "qdeclarativeloader_p.h"
+#include "private/qdeclarativeloader_p.h"
 
-#include "qdeclarativeitem_p.h"
-#include "qdeclarativeitemchangelistener_p.h"
+#include "private/qdeclarativeitem_p.h"
+#include "private/qdeclarativeitemchangelistener_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/declarative/graphicsitems/qdeclarativemousearea.cpp b/src/declarative/graphicsitems/qdeclarativemousearea.cpp
index f64201b..b89c427 100644
--- a/src/declarative/graphicsitems/qdeclarativemousearea.cpp
+++ b/src/declarative/graphicsitems/qdeclarativemousearea.cpp
@@ -39,10 +39,10 @@
 **
 ****************************************************************************/
 
-#include "qdeclarativemousearea_p.h"
-#include "qdeclarativemousearea_p_p.h"
+#include "private/qdeclarativemousearea_p.h"
+#include "private/qdeclarativemousearea_p_p.h"
 
-#include "qdeclarativeevents_p_p.h"
+#include "private/qdeclarativeevents_p_p.h"
 
 #include <QGraphicsSceneMouseEvent>
 
diff --git a/src/declarative/graphicsitems/qdeclarativemousearea_p_p.h b/src/declarative/graphicsitems/qdeclarativemousearea_p_p.h
index 88206cd..9068c7c 100644
--- a/src/declarative/graphicsitems/qdeclarativemousearea_p_p.h
+++ b/src/declarative/graphicsitems/qdeclarativemousearea_p_p.h
@@ -53,7 +53,7 @@
 // We mean it.
 //
 
-#include "qdeclarativeitem_p.h"
+#include "private/qdeclarativeitem_p.h"
 
 #include <qdatetime.h>
 #include <qbasictimer.h>
diff --git a/src/declarative/graphicsitems/qdeclarativepainteditem.cpp b/src/declarative/graphicsitems/qdeclarativepainteditem.cpp
index ab6007a..f52636f 100644
--- a/src/declarative/graphicsitems/qdeclarativepainteditem.cpp
+++ b/src/declarative/graphicsitems/qdeclarativepainteditem.cpp
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 
-#include "qdeclarativepainteditem_p.h"
-#include "qdeclarativepainteditem_p_p.h"
+#include "private/qdeclarativepainteditem_p.h"
+#include "private/qdeclarativepainteditem_p_p.h"
 
 #include <QDebug>
 #include <QPen>
diff --git a/src/declarative/graphicsitems/qdeclarativepainteditem_p_p.h b/src/declarative/graphicsitems/qdeclarativepainteditem_p_p.h
index a15febb..6b23086 100644
--- a/src/declarative/graphicsitems/qdeclarativepainteditem_p_p.h
+++ b/src/declarative/graphicsitems/qdeclarativepainteditem_p_p.h
@@ -53,7 +53,7 @@
 // We mean it.
 //
 
-#include "qdeclarativeitem_p.h"
+#include "private/qdeclarativeitem_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/declarative/graphicsitems/qdeclarativepath.cpp b/src/declarative/graphicsitems/qdeclarativepath.cpp
index 8cd990fc..e2042fc 100644
--- a/src/declarative/graphicsitems/qdeclarativepath.cpp
+++ b/src/declarative/graphicsitems/qdeclarativepath.cpp
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 
-#include "qdeclarativepath_p.h"
-#include "qdeclarativepath_p_p.h"
+#include "private/qdeclarativepath_p.h"
+#include "private/qdeclarativepath_p_p.h"
 
 #include <QSet>
 #include <QTime>
diff --git a/src/declarative/graphicsitems/qdeclarativepath_p_p.h b/src/declarative/graphicsitems/qdeclarativepath_p_p.h
index fb63867..e82bcf5 100644
--- a/src/declarative/graphicsitems/qdeclarativepath_p_p.h
+++ b/src/declarative/graphicsitems/qdeclarativepath_p_p.h
@@ -53,7 +53,7 @@
 // We mean it.
 //
 
-#include "qdeclarativepath_p.h"
+#include "private/qdeclarativepath_p.h"
 
 #include <qdeclarative.h>
 
diff --git a/src/declarative/graphicsitems/qdeclarativepathview.cpp b/src/declarative/graphicsitems/qdeclarativepathview.cpp
index 71f85ae..813b525 100644
--- a/src/declarative/graphicsitems/qdeclarativepathview.cpp
+++ b/src/declarative/graphicsitems/qdeclarativepathview.cpp
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 
-#include "qdeclarativepathview_p.h"
-#include "qdeclarativepathview_p_p.h"
+#include "private/qdeclarativepathview_p.h"
+#include "private/qdeclarativepathview_p_p.h"
 
 #include <qdeclarativestate_p.h>
 #include <qdeclarativeopenmetaobject_p.h>
diff --git a/src/declarative/graphicsitems/qdeclarativepathview_p.h b/src/declarative/graphicsitems/qdeclarativepathview_p.h
index a00f4c0..69770cd 100644
--- a/src/declarative/graphicsitems/qdeclarativepathview_p.h
+++ b/src/declarative/graphicsitems/qdeclarativepathview_p.h
@@ -43,7 +43,7 @@
 #define QDECLARATIVEPATHVIEW_H
 
 #include "qdeclarativeitem.h"
-#include "qdeclarativepath_p.h"
+#include "private/qdeclarativepath_p.h"
 
 QT_BEGIN_HEADER
 
diff --git a/src/declarative/graphicsitems/qdeclarativepathview_p_p.h b/src/declarative/graphicsitems/qdeclarativepathview_p_p.h
index 6470893..11712fd 100644
--- a/src/declarative/graphicsitems/qdeclarativepathview_p_p.h
+++ b/src/declarative/graphicsitems/qdeclarativepathview_p_p.h
@@ -53,10 +53,10 @@
 // We mean it.
 //
 
-#include "qdeclarativepathview_p.h"
+#include "private/qdeclarativepathview_p.h"
 
-#include "qdeclarativeitem_p.h"
-#include "qdeclarativevisualitemmodel_p.h"
+#include "private/qdeclarativeitem_p.h"
+#include "private/qdeclarativevisualitemmodel_p.h"
 
 #include <qdeclarative.h>
 #include <qdeclarativeanimation_p_p.h>
diff --git a/src/declarative/graphicsitems/qdeclarativepositioners.cpp b/src/declarative/graphicsitems/qdeclarativepositioners.cpp
index 781e584..d33a8be 100644
--- a/src/declarative/graphicsitems/qdeclarativepositioners.cpp
+++ b/src/declarative/graphicsitems/qdeclarativepositioners.cpp
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 
-#include "qdeclarativepositioners_p.h"
-#include "qdeclarativepositioners_p_p.h"
+#include "private/qdeclarativepositioners_p.h"
+#include "private/qdeclarativepositioners_p_p.h"
 
 #include <qdeclarative.h>
 #include <qdeclarativestate_p.h>
diff --git a/src/declarative/graphicsitems/qdeclarativepositioners_p_p.h b/src/declarative/graphicsitems/qdeclarativepositioners_p_p.h
index 7880e3e..576f35b 100644
--- a/src/declarative/graphicsitems/qdeclarativepositioners_p_p.h
+++ b/src/declarative/graphicsitems/qdeclarativepositioners_p_p.h
@@ -53,9 +53,9 @@
 // We mean it.
 //
 
-#include "qdeclarativepositioners_p.h"
+#include "private/qdeclarativepositioners_p.h"
 
-#include "qdeclarativeitem_p.h"
+#include "private/qdeclarativeitem_p.h"
 
 #include <qdeclarativestate_p.h>
 #include <qdeclarativetransitionmanager_p_p.h>
diff --git a/src/declarative/graphicsitems/qdeclarativerectangle.cpp b/src/declarative/graphicsitems/qdeclarativerectangle.cpp
index 8fbaa22..3f7548f 100644
--- a/src/declarative/graphicsitems/qdeclarativerectangle.cpp
+++ b/src/declarative/graphicsitems/qdeclarativerectangle.cpp
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 
-#include "qdeclarativerectangle_p.h"
-#include "qdeclarativerectangle_p_p.h"
+#include "private/qdeclarativerectangle_p.h"
+#include "private/qdeclarativerectangle_p_p.h"
 
 #include <QPainter>
 #include <QtCore/qmath.h>
diff --git a/src/declarative/graphicsitems/qdeclarativerectangle_p_p.h b/src/declarative/graphicsitems/qdeclarativerectangle_p_p.h
index 6bae219..84418bc 100644
--- a/src/declarative/graphicsitems/qdeclarativerectangle_p_p.h
+++ b/src/declarative/graphicsitems/qdeclarativerectangle_p_p.h
@@ -53,7 +53,7 @@
 // We mean it.
 //
 
-#include "qdeclarativeitem_p.h"
+#include "private/qdeclarativeitem_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/declarative/graphicsitems/qdeclarativerepeater.cpp b/src/declarative/graphicsitems/qdeclarativerepeater.cpp
index bbee4e5..e836788 100644
--- a/src/declarative/graphicsitems/qdeclarativerepeater.cpp
+++ b/src/declarative/graphicsitems/qdeclarativerepeater.cpp
@@ -39,10 +39,10 @@
 **
 ****************************************************************************/
 
-#include "qdeclarativerepeater_p.h"
-#include "qdeclarativerepeater_p_p.h"
+#include "private/qdeclarativerepeater_p.h"
+#include "private/qdeclarativerepeater_p_p.h"
 
-#include "qdeclarativevisualitemmodel_p.h"
+#include "private/qdeclarativevisualitemmodel_p.h"
 #include <private/qdeclarativeglobal_p.h>
 #include <qdeclarativelistaccessor_p.h>
 
diff --git a/src/declarative/graphicsitems/qdeclarativerepeater_p_p.h b/src/declarative/graphicsitems/qdeclarativerepeater_p_p.h
index 11773ff..5b75e50 100644
--- a/src/declarative/graphicsitems/qdeclarativerepeater_p_p.h
+++ b/src/declarative/graphicsitems/qdeclarativerepeater_p_p.h
@@ -53,9 +53,9 @@
 // We mean it.
 //
 
-#include "qdeclarativerepeater_p.h"
+#include "private/qdeclarativerepeater_p.h"
 
-#include "qdeclarativeitem_p.h"
+#include "private/qdeclarativeitem_p.h"
 
 #include <QPointer>
 
diff --git a/src/declarative/graphicsitems/qdeclarativescalegrid.cpp b/src/declarative/graphicsitems/qdeclarativescalegrid.cpp
index dbc7568..e68f645 100644
--- a/src/declarative/graphicsitems/qdeclarativescalegrid.cpp
+++ b/src/declarative/graphicsitems/qdeclarativescalegrid.cpp
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include "qdeclarativescalegrid_p_p.h"
+#include "private/qdeclarativescalegrid_p_p.h"
 
 #include <qdeclarative.h>
 
diff --git a/src/declarative/graphicsitems/qdeclarativescalegrid_p_p.h b/src/declarative/graphicsitems/qdeclarativescalegrid_p_p.h
index fbf9040..42813dd 100644
--- a/src/declarative/graphicsitems/qdeclarativescalegrid_p_p.h
+++ b/src/declarative/graphicsitems/qdeclarativescalegrid_p_p.h
@@ -42,7 +42,7 @@
 #ifndef QDECLARATIVESCALEGRID_H
 #define QDECLARATIVESCALEGRID_H
 
-#include "qdeclarativeborderimage_p.h"
+#include "private/qdeclarativeborderimage_p.h"
 
 #include <private/qdeclarativepixmapcache_p.h>
 #include <qdeclarative.h>
diff --git a/src/declarative/graphicsitems/qdeclarativetext.cpp b/src/declarative/graphicsitems/qdeclarativetext.cpp
index b0b5f6d..a4f3068 100644
--- a/src/declarative/graphicsitems/qdeclarativetext.cpp
+++ b/src/declarative/graphicsitems/qdeclarativetext.cpp
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 
-#include "qdeclarativetext_p.h"
-#include "qdeclarativetext_p_p.h"
+#include "private/qdeclarativetext_p.h"
+#include "private/qdeclarativetext_p_p.h"
 #include <qdeclarativestyledtext_p.h>
 
 #include <QTextLayout>
diff --git a/src/declarative/graphicsitems/qdeclarativetext_p_p.h b/src/declarative/graphicsitems/qdeclarativetext_p_p.h
index 0d9a0a6..85a65ce 100644
--- a/src/declarative/graphicsitems/qdeclarativetext_p_p.h
+++ b/src/declarative/graphicsitems/qdeclarativetext_p_p.h
@@ -54,7 +54,7 @@
 //
 
 #include "qdeclarativeitem.h"
-#include "qdeclarativeitem_p.h"
+#include "private/qdeclarativeitem_p.h"
 
 #include <qdeclarative.h>
 
diff --git a/src/declarative/graphicsitems/qdeclarativetextedit.cpp b/src/declarative/graphicsitems/qdeclarativetextedit.cpp
index 03b2425..7374bc8 100644
--- a/src/declarative/graphicsitems/qdeclarativetextedit.cpp
+++ b/src/declarative/graphicsitems/qdeclarativetextedit.cpp
@@ -39,10 +39,10 @@
 **
 ****************************************************************************/
 
-#include "qdeclarativetextedit_p.h"
-#include "qdeclarativetextedit_p_p.h"
+#include "private/qdeclarativetextedit_p.h"
+#include "private/qdeclarativetextedit_p_p.h"
 
-#include "qdeclarativeevents_p_p.h"
+#include "private/qdeclarativeevents_p_p.h"
 #include <private/qdeclarativeglobal_p.h>
 
 #include <QTextLayout>
diff --git a/src/declarative/graphicsitems/qdeclarativetextedit_p.h b/src/declarative/graphicsitems/qdeclarativetextedit_p.h
index b1682c4..0e91e73 100644
--- a/src/declarative/graphicsitems/qdeclarativetextedit_p.h
+++ b/src/declarative/graphicsitems/qdeclarativetextedit_p.h
@@ -42,8 +42,8 @@
 #ifndef QDECLARATIVETEXTEDIT_H
 #define QDECLARATIVETEXTEDIT_H
 
-#include "qdeclarativetext_p.h"
-#include "qdeclarativepainteditem_p.h"
+#include "private/qdeclarativetext_p.h"
+#include "private/qdeclarativepainteditem_p.h"
 
 #include <QtGui/qtextdocument.h>
 #include <QtGui/qtextoption.h>
diff --git a/src/declarative/graphicsitems/qdeclarativetextedit_p_p.h b/src/declarative/graphicsitems/qdeclarativetextedit_p_p.h
index dd2a29d..310db48 100644
--- a/src/declarative/graphicsitems/qdeclarativetextedit_p_p.h
+++ b/src/declarative/graphicsitems/qdeclarativetextedit_p_p.h
@@ -54,7 +54,7 @@
 //
 
 #include "qdeclarativeitem.h"
-#include "qdeclarativepainteditem_p_p.h"
+#include "private/qdeclarativepainteditem_p_p.h"
 
 #include <qdeclarative.h>
 
diff --git a/src/declarative/graphicsitems/qdeclarativetextinput.cpp b/src/declarative/graphicsitems/qdeclarativetextinput.cpp
index 88801a4..29e43f9 100644
--- a/src/declarative/graphicsitems/qdeclarativetextinput.cpp
+++ b/src/declarative/graphicsitems/qdeclarativetextinput.cpp
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 
-#include "qdeclarativetextinput_p.h"
-#include "qdeclarativetextinput_p_p.h"
+#include "private/qdeclarativetextinput_p.h"
+#include "private/qdeclarativetextinput_p_p.h"
 
 #include <private/qdeclarativeglobal_p.h>
 #include <qdeclarativeinfo.h>
diff --git a/src/declarative/graphicsitems/qdeclarativetextinput_p.h b/src/declarative/graphicsitems/qdeclarativetextinput_p.h
index 6a61c2d..64aff7d 100644
--- a/src/declarative/graphicsitems/qdeclarativetextinput_p.h
+++ b/src/declarative/graphicsitems/qdeclarativetextinput_p.h
@@ -42,8 +42,8 @@
 #ifndef QDECLARATIVETEXTINPUT_H
 #define QDECLARATIVETEXTINPUT_H
 
-#include "qdeclarativetext_p.h"
-#include "qdeclarativepainteditem_p.h"
+#include "private/qdeclarativetext_p.h"
+#include "private/qdeclarativepainteditem_p.h"
 
 #include <QGraphicsSceneMouseEvent>
 #include <QIntValidator>
diff --git a/src/declarative/graphicsitems/qdeclarativetextinput_p_p.h b/src/declarative/graphicsitems/qdeclarativetextinput_p_p.h
index 5d17a55..9e44b15 100644
--- a/src/declarative/graphicsitems/qdeclarativetextinput_p_p.h
+++ b/src/declarative/graphicsitems/qdeclarativetextinput_p_p.h
@@ -42,9 +42,9 @@
 #ifndef QDECLARATIVETEXTINPUT_P_H
 #define QDECLARATIVETEXTINPUT_P_H
 
-#include "qdeclarativetextinput_p.h"
+#include "private/qdeclarativetextinput_p.h"
 
-#include "qdeclarativepainteditem_p_p.h"
+#include "private/qdeclarativepainteditem_p_p.h"
 
 #include <qdeclarative.h>
 
diff --git a/src/declarative/graphicsitems/qdeclarativetranslate.cpp b/src/declarative/graphicsitems/qdeclarativetranslate.cpp
index 1c96fa4..17daac7 100644
--- a/src/declarative/graphicsitems/qdeclarativetranslate.cpp
+++ b/src/declarative/graphicsitems/qdeclarativetranslate.cpp
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include "qdeclarativetranslate_p.h"
+#include "private/qdeclarativetranslate_p.h"
 #include <private/qgraphicstransform_p.h>
 #include <QDebug>
 #include <QtCore/qmath.h>
diff --git a/src/declarative/graphicsitems/qdeclarativevisualitemmodel.cpp b/src/declarative/graphicsitems/qdeclarativevisualitemmodel.cpp
index b31bbd0..2938f51 100644
--- a/src/declarative/graphicsitems/qdeclarativevisualitemmodel.cpp
+++ b/src/declarative/graphicsitems/qdeclarativevisualitemmodel.cpp
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include "qdeclarativevisualitemmodel_p.h"
+#include "private/qdeclarativevisualitemmodel_p.h"
 
 #include "qdeclarativeitem.h"