diff options
author | Thiago Macieira <thiago.macieira@nokia.com> | 2010-04-02 18:27:25 +0200 |
---|---|---|
committer | Thiago Macieira <thiago.macieira@nokia.com> | 2010-04-02 18:31:52 +0200 |
commit | 4a247ed5e37d3b4a17c965c725b81f6ef835c191 (patch) | |
tree | d25e1e58e862cd539440916d3d2fe4eb7901de78 | |
parent | 23eb677daea8e084fcaa1256f1a9433e324b1474 (diff) |
Update #include of private headers in QtDeclarative
Always use private/. The WinSCW compiler doesn't search the current
directory, for whatever reason.
195 files changed, 580 insertions, 580 deletions
diff --git a/src/declarative/3rdparty/qlistmodelinterface.cpp b/src/declarative/3rdparty/qlistmodelinterface.cpp index 50714cea85..98d6a5b4fa 100644 --- a/src/declarative/3rdparty/qlistmodelinterface.cpp +++ b/src/declarative/3rdparty/qlistmodelinterface.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include "qlistmodelinterface_p.h" +#include "private/qlistmodelinterface_p.h" QT_BEGIN_NAMESPACE diff --git a/src/declarative/debugger/qdeclarativedebug.cpp b/src/declarative/debugger/qdeclarativedebug.cpp index 677d05f563..cd5340b407 100644 --- a/src/declarative/debugger/qdeclarativedebug.cpp +++ b/src/declarative/debugger/qdeclarativedebug.cpp @@ -39,9 +39,9 @@ ** ****************************************************************************/ -#include "qdeclarativedebug_p.h" +#include "private/qdeclarativedebug_p.h" -#include "qdeclarativedebugclient_p.h" +#include "private/qdeclarativedebugclient_p.h" #include <qdeclarativeenginedebug_p.h> diff --git a/src/declarative/debugger/qdeclarativedebugclient.cpp b/src/declarative/debugger/qdeclarativedebugclient.cpp index c23e32fcc2..2e52b40623 100644 --- a/src/declarative/debugger/qdeclarativedebugclient.cpp +++ b/src/declarative/debugger/qdeclarativedebugclient.cpp @@ -39,9 +39,9 @@ ** ****************************************************************************/ -#include "qdeclarativedebugclient_p.h" +#include "private/qdeclarativedebugclient_p.h" -#include "qpacketprotocol_p.h" +#include "private/qpacketprotocol_p.h" #include <QtCore/qdebug.h> #include <QtCore/qstringlist.h> diff --git a/src/declarative/debugger/qdeclarativedebuggerstatus.cpp b/src/declarative/debugger/qdeclarativedebuggerstatus.cpp index 5908628b9a..476cca26e8 100644 --- a/src/declarative/debugger/qdeclarativedebuggerstatus.cpp +++ b/src/declarative/debugger/qdeclarativedebuggerstatus.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include "qdeclarativedebuggerstatus_p.h" +#include "private/qdeclarativedebuggerstatus_p.h" QT_BEGIN_NAMESPACE diff --git a/src/declarative/debugger/qdeclarativedebugservice.cpp b/src/declarative/debugger/qdeclarativedebugservice.cpp index d9bbdb565f..9d9d1d05dd 100644 --- a/src/declarative/debugger/qdeclarativedebugservice.cpp +++ b/src/declarative/debugger/qdeclarativedebugservice.cpp @@ -39,9 +39,9 @@ ** ****************************************************************************/ -#include "qdeclarativedebugservice_p.h" +#include "private/qdeclarativedebugservice_p.h" -#include "qpacketprotocol_p.h" +#include "private/qpacketprotocol_p.h" #include <QtCore/qdebug.h> #include <QtNetwork/qtcpserver.h> diff --git a/src/declarative/debugger/qpacketprotocol.cpp b/src/declarative/debugger/qpacketprotocol.cpp index 7440b87176..6241922aaf 100644 --- a/src/declarative/debugger/qpacketprotocol.cpp +++ b/src/declarative/debugger/qpacketprotocol.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include "qpacketprotocol_p.h" +#include "private/qpacketprotocol_p.h" #include <QBuffer> diff --git a/src/declarative/graphicsitems/qdeclarativeanchors.cpp b/src/declarative/graphicsitems/qdeclarativeanchors.cpp index ffcedda7f6..7a7e5bec9a 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 5840868bd9..ba6359a897 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 2c2e0345f5..f14f7734b6 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 b2979fe21a..6ab66b3441 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 273c1d69bb..8ca9755c11 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 96f95f2bdd..420ed903df 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 a759e67c8c..5e725cac9d 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 82b9ebf624..3535109d01 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 8be2f409f8..6118ea80a3 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 8459245631..fc7a87be76 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 c963c2bd9e..1a040914c8 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 ccefc70968..98e34a9f6e 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 20524b62f7..bd60e25e6f 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 484df13aea..4bd2a86d4f 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 ff85bbddee..c846431e80 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 30f04f6d56..8247f17463 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 90f13d2a99..f73f63286f 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 3145c43e7a..e4f34645c5 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 da6cbd5a9d..5ea700d70b 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 8102237e49..dd12a00625 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 5a234b77a0..3acafe8534 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 de8c93ab94..392c1db95e 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 83c79a0bd3..55a81f4dd6 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 97a22cf537..7989a2709c 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 a23ea659cf..1bbdd973c1 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 308612f936..e85d60f838 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 3635b39b50..5810979d55 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 2f1511eab0..2aab36f99d 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 fc5e66532d..49069f96ba 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 6126a6f705..816aa7892c 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 88206cda0d..9068c7cc19 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 ab6007a955..f52636fbe9 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 a15febb75b..6b23086d10 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 8cd990fcdc..e2042fc73b 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 fb63867286..e82bcf5854 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 71f85aea10..813b525107 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 a00f4c0bd1..69770cd693 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 6470893cd1..11712fd6c7 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 781e58490e..d33a8be6e6 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 7880e3e6d7..576f35b19a 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 8fbaa22223..3f7548fb87 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 6bae219072..84418bc929 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 bbee4e55ec..e836788254 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 11773ff59b..5b75e50b55 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 dbc7568179..e68f64544a 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 fbf90403b6..42813dd6d5 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 b0b5f6d54c..a4f3068784 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 0d9a0a6d25..85a65cebcc 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 03b24259eb..7374bc8435 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 b1682c4c77..0e91e73605 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 dd2a29ddc5..310db480b8 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 88801a4b19..29e43f9e55 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 6a61c2d517..64aff7de77 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 5d17a55e02..9e44b15acf 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 1c96fa44b7..17daac7c40 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 b31bbd0f36..2938f51814 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" diff --git a/src/declarative/qml/parser/qdeclarativejs.g b/src/declarative/qml/parser/qdeclarativejs.g index 536989f13a..ba9338e33c 100644 --- a/src/declarative/qml/parser/qdeclarativejs.g +++ b/src/declarative/qml/parser/qdeclarativejs.g @@ -127,10 +127,10 @@ #include <string.h> -#include "qdeclarativejsengine_p.h" -#include "qdeclarativejslexer_p.h" -#include "qdeclarativejsast_p.h" -#include "qdeclarativejsnodepool_p.h" +#include "private/qdeclarativejsengine_p.h" +#include "private/qdeclarativejslexer_p.h" +#include "private/qdeclarativejsast_p.h" +#include "private/qdeclarativejsnodepool_p.h" ./ @@ -195,10 +195,10 @@ #ifndef QDECLARATIVEJSPARSER_P_H #define QDECLARATIVEJSPARSER_P_H -#include "qdeclarativejsglobal_p.h" -#include "qdeclarativejsgrammar_p.h" -#include "qdeclarativejsast_p.h" -#include "qdeclarativejsengine_p.h" +#include "private/qdeclarativejsglobal_p.h" +#include "private/qdeclarativejsgrammar_p.h" +#include "private/qdeclarativejsast_p.h" +#include "private/qdeclarativejsengine_p.h" #include <QtCore/QList> #include <QtCore/QString> @@ -375,7 +375,7 @@ protected: /. -#include "qdeclarativejsparser_p.h" +#include "private/qdeclarativejsparser_p.h" #include <QVarLengthArray> // diff --git a/src/declarative/qml/parser/qdeclarativejsast.cpp b/src/declarative/qml/parser/qdeclarativejsast.cpp index e3d3a66535..000ef863fa 100644 --- a/src/declarative/qml/parser/qdeclarativejsast.cpp +++ b/src/declarative/qml/parser/qdeclarativejsast.cpp @@ -39,9 +39,9 @@ ** ****************************************************************************/ -#include "qdeclarativejsast_p.h" +#include "private/qdeclarativejsast_p.h" -#include "qdeclarativejsastvisitor_p.h" +#include "private/qdeclarativejsastvisitor_p.h" QT_QML_BEGIN_NAMESPACE diff --git a/src/declarative/qml/parser/qdeclarativejsast_p.h b/src/declarative/qml/parser/qdeclarativejsast_p.h index b839413777..0623a2a642 100644 --- a/src/declarative/qml/parser/qdeclarativejsast_p.h +++ b/src/declarative/qml/parser/qdeclarativejsast_p.h @@ -53,8 +53,8 @@ // We mean it. // -#include "qdeclarativejsastvisitor_p.h" -#include "qdeclarativejsglobal_p.h" +#include "private/qdeclarativejsastvisitor_p.h" +#include "private/qdeclarativejsglobal_p.h" #include <QtCore/QString> diff --git a/src/declarative/qml/parser/qdeclarativejsastfwd_p.h b/src/declarative/qml/parser/qdeclarativejsastfwd_p.h index 5a444b7e5f..d04aba5ab9 100644 --- a/src/declarative/qml/parser/qdeclarativejsastfwd_p.h +++ b/src/declarative/qml/parser/qdeclarativejsastfwd_p.h @@ -42,7 +42,7 @@ #ifndef QDECLARATIVEJSAST_FWD_P_H #define QDECLARATIVEJSAST_FWD_P_H -#include "qdeclarativejsglobal_p.h" +#include "private/qdeclarativejsglobal_p.h" #include <QtCore/qglobal.h> diff --git a/src/declarative/qml/parser/qdeclarativejsastvisitor.cpp b/src/declarative/qml/parser/qdeclarativejsastvisitor.cpp index d8002cfba7..d9a7be3a4a 100644 --- a/src/declarative/qml/parser/qdeclarativejsastvisitor.cpp +++ b/src/declarative/qml/parser/qdeclarativejsastvisitor.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include "qdeclarativejsastvisitor_p.h" +#include "private/qdeclarativejsastvisitor_p.h" QT_QML_BEGIN_NAMESPACE diff --git a/src/declarative/qml/parser/qdeclarativejsastvisitor_p.h b/src/declarative/qml/parser/qdeclarativejsastvisitor_p.h index 82abbcf42a..e1f45b4865 100644 --- a/src/declarative/qml/parser/qdeclarativejsastvisitor_p.h +++ b/src/declarative/qml/parser/qdeclarativejsastvisitor_p.h @@ -53,8 +53,8 @@ // We mean it. // -#include "qdeclarativejsastfwd_p.h" -#include "qdeclarativejsglobal_p.h" +#include "private/qdeclarativejsastfwd_p.h" +#include "private/qdeclarativejsglobal_p.h" QT_QML_BEGIN_NAMESPACE diff --git a/src/declarative/qml/parser/qdeclarativejsengine_p.cpp b/src/declarative/qml/parser/qdeclarativejsengine_p.cpp index 7d39134f05..0527b3ca8b 100644 --- a/src/declarative/qml/parser/qdeclarativejsengine_p.cpp +++ b/src/declarative/qml/parser/qdeclarativejsengine_p.cpp @@ -39,10 +39,10 @@ ** ****************************************************************************/ -#include "qdeclarativejsengine_p.h" +#include "private/qdeclarativejsengine_p.h" -#include "qdeclarativejsglobal_p.h" -#include "qdeclarativejsnodepool_p.h" +#include "private/qdeclarativejsglobal_p.h" +#include "private/qdeclarativejsnodepool_p.h" #include <qnumeric.h> #include <QHash> diff --git a/src/declarative/qml/parser/qdeclarativejsengine_p.h b/src/declarative/qml/parser/qdeclarativejsengine_p.h index 61188f7d03..1389244d95 100644 --- a/src/declarative/qml/parser/qdeclarativejsengine_p.h +++ b/src/declarative/qml/parser/qdeclarativejsengine_p.h @@ -53,8 +53,8 @@ // We mean it. // -#include "qdeclarativejsglobal_p.h" -#include "qdeclarativejsastfwd_p.h" +#include "private/qdeclarativejsglobal_p.h" +#include "private/qdeclarativejsastfwd_p.h" #include <QString> #include <QSet> diff --git a/src/declarative/qml/parser/qdeclarativejsgrammar.cpp b/src/declarative/qml/parser/qdeclarativejsgrammar.cpp index 39a2d3f061..52e979a394 100644 --- a/src/declarative/qml/parser/qdeclarativejsgrammar.cpp +++ b/src/declarative/qml/parser/qdeclarativejsgrammar.cpp @@ -40,7 +40,7 @@ ****************************************************************************/ // This file was generated by qlalr - DO NOT EDIT! -#include "qdeclarativejsgrammar_p.h" +#include "private/qdeclarativejsgrammar_p.h" QT_BEGIN_NAMESPACE diff --git a/src/declarative/qml/parser/qdeclarativejslexer.cpp b/src/declarative/qml/parser/qdeclarativejslexer.cpp index 6404be3176..a6161460ee 100644 --- a/src/declarative/qml/parser/qdeclarativejslexer.cpp +++ b/src/declarative/qml/parser/qdeclarativejslexer.cpp @@ -43,11 +43,11 @@ #include <config.h> #endif -#include "qdeclarativejslexer_p.h" +#include "private/qdeclarativejslexer_p.h" -#include "qdeclarativejsglobal_p.h" -#include "qdeclarativejsengine_p.h" -#include "qdeclarativejsgrammar_p.h" +#include "private/qdeclarativejsglobal_p.h" +#include "private/qdeclarativejsengine_p.h" +#include "private/qdeclarativejsgrammar_p.h" #include <QtCore/qcoreapplication.h> diff --git a/src/declarative/qml/parser/qdeclarativejslexer_p.h b/src/declarative/qml/parser/qdeclarativejslexer_p.h index 71bd08c5c0..f2a2fa5564 100644 --- a/src/declarative/qml/parser/qdeclarativejslexer_p.h +++ b/src/declarative/qml/parser/qdeclarativejslexer_p.h @@ -53,7 +53,7 @@ // We mean it. // -#include "qdeclarativejsglobal_p.h" +#include "private/qdeclarativejsglobal_p.h" #include <QtCore/QString> diff --git a/src/declarative/qml/parser/qdeclarativejsmemorypool_p.h b/src/declarative/qml/parser/qdeclarativejsmemorypool_p.h index c8d52d065d..51e6e54346 100644 --- a/src/declarative/qml/parser/qdeclarativejsmemorypool_p.h +++ b/src/declarative/qml/parser/qdeclarativejsmemorypool_p.h @@ -53,7 +53,7 @@ // We mean it. // -#include "qdeclarativejsglobal_p.h" +#include "private/qdeclarativejsglobal_p.h" #include <QtCore/qglobal.h> #include <QtCore/qshareddata.h> diff --git a/src/declarative/qml/parser/qdeclarativejsnodepool_p.h b/src/declarative/qml/parser/qdeclarativejsnodepool_p.h index 94637fdfcd..ffa9ee5655 100644 --- a/src/declarative/qml/parser/qdeclarativejsnodepool_p.h +++ b/src/declarative/qml/parser/qdeclarativejsnodepool_p.h @@ -53,8 +53,8 @@ // We mean it. // -#include "qdeclarativejsglobal_p.h" -#include "qdeclarativejsmemorypool_p.h" +#include "private/qdeclarativejsglobal_p.h" +#include "private/qdeclarativejsmemorypool_p.h" #include <QtCore/QHash> #include <QtCore/QString> diff --git a/src/declarative/qml/parser/qdeclarativejsparser.cpp b/src/declarative/qml/parser/qdeclarativejsparser.cpp index 170c7fa132..8afb93d5ba 100644 --- a/src/declarative/qml/parser/qdeclarativejsparser.cpp +++ b/src/declarative/qml/parser/qdeclarativejsparser.cpp @@ -44,14 +44,14 @@ #include <string.h> -#include "qdeclarativejsengine_p.h" -#include "qdeclarativejslexer_p.h" -#include "qdeclarativejsast_p.h" -#include "qdeclarativejsnodepool_p.h" +#include "private/qdeclarativejsengine_p.h" +#include "private/qdeclarativejslexer_p.h" +#include "private/qdeclarativejsast_p.h" +#include "private/qdeclarativejsnodepool_p.h" -#include "qdeclarativejsparser_p.h" +#include "private/qdeclarativejsparser_p.h" #include <QVarLengthArray> // diff --git a/src/declarative/qml/parser/qdeclarativejsparser_p.h b/src/declarative/qml/parser/qdeclarativejsparser_p.h index 8838fbe07b..005bd3feff 100644 --- a/src/declarative/qml/parser/qdeclarativejsparser_p.h +++ b/src/declarative/qml/parser/qdeclarativejsparser_p.h @@ -59,10 +59,10 @@ #ifndef QDECLARATIVEJSPARSER_P_H #define QDECLARATIVEJSPARSER_P_H -#include "qdeclarativejsglobal_p.h" -#include "qdeclarativejsgrammar_p.h" -#include "qdeclarativejsast_p.h" -#include "qdeclarativejsengine_p.h" +#include "private/qdeclarativejsglobal_p.h" +#include "private/qdeclarativejsgrammar_p.h" +#include "private/qdeclarativejsast_p.h" +#include "private/qdeclarativejsengine_p.h" #include <QtCore/QList> #include <QtCore/QString> diff --git a/src/declarative/qml/qdeclarativebinding.cpp b/src/declarative/qml/qdeclarativebinding.cpp index a7047ab65f..71cf3cb027 100644 --- a/src/declarative/qml/qdeclarativebinding.cpp +++ b/src/declarative/qml/qdeclarativebinding.cpp @@ -39,15 +39,15 @@ ** ****************************************************************************/ -#include "qdeclarativebinding_p.h" -#include "qdeclarativebinding_p_p.h" +#include "private/qdeclarativebinding_p.h" +#include "private/qdeclarativebinding_p_p.h" #include "qdeclarative.h" #include "qdeclarativecontext.h" #include "qdeclarativeinfo.h" -#include "qdeclarativecontext_p.h" -#include "qdeclarativedeclarativedata_p.h" -#include "qdeclarativestringconverters_p.h" +#include "private/qdeclarativecontext_p.h" +#include "private/qdeclarativedeclarativedata_p.h" +#include "private/qdeclarativestringconverters_p.h" #include <QVariant> #include <QtCore/qdebug.h> diff --git a/src/declarative/qml/qdeclarativebinding_p.h b/src/declarative/qml/qdeclarativebinding_p.h index 56f1715ae9..2789738e0b 100644 --- a/src/declarative/qml/qdeclarativebinding_p.h +++ b/src/declarative/qml/qdeclarativebinding_p.h @@ -57,7 +57,7 @@ #include "qdeclarativepropertyvaluesource.h" #include "qdeclarativeexpression.h" #include "qdeclarativeproperty.h" -#include "qdeclarativeproperty_p.h" +#include "private/qdeclarativeproperty_p.h" #include <QtCore/QObject> #include <QtCore/QMetaProperty> diff --git a/src/declarative/qml/qdeclarativebinding_p_p.h b/src/declarative/qml/qdeclarativebinding_p_p.h index 041103ccb7..617ec4bd73 100644 --- a/src/declarative/qml/qdeclarativebinding_p_p.h +++ b/src/declarative/qml/qdeclarativebinding_p_p.h @@ -53,10 +53,10 @@ // We mean it. // -#include "qdeclarativebinding_p.h" +#include "private/qdeclarativebinding_p.h" #include "qdeclarativeproperty.h" -#include "qdeclarativeexpression_p.h" +#include "private/qdeclarativeexpression_p.h" QT_BEGIN_NAMESPACE diff --git a/src/declarative/qml/qdeclarativeboundsignal.cpp b/src/declarative/qml/qdeclarativeboundsignal.cpp index 6a5a102f75..762c642820 100644 --- a/src/declarative/qml/qdeclarativeboundsignal.cpp +++ b/src/declarative/qml/qdeclarativeboundsignal.cpp @@ -39,16 +39,16 @@ ** ****************************************************************************/ -#include "qdeclarativeboundsignal_p.h" +#include "private/qdeclarativeboundsignal_p.h" -#include "qmetaobjectbuilder_p.h" -#include "qdeclarativeengine_p.h" -#include "qdeclarativeexpression_p.h" -#include "qdeclarativecontext_p.h" -#include "qdeclarativemetatype_p.h" +#include "private/qmetaobjectbuilder_p.h" +#include "private/qdeclarativeengine_p.h" +#include "private/qdeclarativeexpression_p.h" +#include "private/qdeclarativecontext_p.h" +#include "private/qdeclarativemetatype_p.h" #include "qdeclarative.h" #include "qdeclarativecontext.h" -#include "qdeclarativeglobal_p.h" +#include "private/qdeclarativeglobal_p.h" #include <QtCore/qdebug.h> diff --git a/src/declarative/qml/qdeclarativeclassfactory.cpp b/src/declarative/qml/qdeclarativeclassfactory.cpp index ae4975c486..798eacdc96 100644 --- a/src/declarative/qml/qdeclarativeclassfactory.cpp +++ b/src/declarative/qml/qdeclarativeclassfactory.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include "qdeclarativeclassfactory_p.h" +#include "private/qdeclarativeclassfactory_p.h" QT_BEGIN_NAMESPACE diff --git a/src/declarative/qml/qdeclarativecleanup.cpp b/src/declarative/qml/qdeclarativecleanup.cpp index 0fa49d1dfc..4f48ba11f7 100644 --- a/src/declarative/qml/qdeclarativecleanup.cpp +++ b/src/declarative/qml/qdeclarativecleanup.cpp @@ -39,9 +39,9 @@ ** ****************************************************************************/ -#include "qdeclarativecleanup_p.h" +#include "private/qdeclarativecleanup_p.h" -#include "qdeclarativeengine_p.h" +#include "private/qdeclarativeengine_p.h" QT_BEGIN_NAMESPACE diff --git a/src/declarative/qml/qdeclarativecompiledbindings.cpp b/src/declarative/qml/qdeclarativecompiledbindings.cpp index 67750a4314..53143d5195 100644 --- a/src/declarative/qml/qdeclarativecompiledbindings.cpp +++ b/src/declarative/qml/qdeclarativecompiledbindings.cpp @@ -41,7 +41,7 @@ // #define COMPILEDBINDINGS_DEBUG -#include "qdeclarativecompiledbindings_p.h" +#include "private/qdeclarativecompiledbindings_p.h" #include <QtDeclarative/qdeclarativeinfo.h> #include <private/qdeclarativecontext_p.h> diff --git a/src/declarative/qml/qdeclarativecompiledbindings_p.h b/src/declarative/qml/qdeclarativecompiledbindings_p.h index 8776c085bf..a17bc842a3 100644 --- a/src/declarative/qml/qdeclarativecompiledbindings_p.h +++ b/src/declarative/qml/qdeclarativecompiledbindings_p.h @@ -53,8 +53,8 @@ // We mean it. // -#include "qdeclarativeexpression_p.h" -#include "qdeclarativebinding_p.h" +#include "private/qdeclarativeexpression_p.h" +#include "private/qdeclarativebinding_p.h" QT_BEGIN_HEADER diff --git a/src/declarative/qml/qdeclarativecompileddata.cpp b/src/declarative/qml/qdeclarativecompileddata.cpp index dfbf453ee3..5d73d899cf 100644 --- a/src/declarative/qml/qdeclarativecompileddata.cpp +++ b/src/declarative/qml/qdeclarativecompileddata.cpp @@ -39,12 +39,12 @@ ** ****************************************************************************/ -#include "qdeclarativecompiler_p.h" +#include "private/qdeclarativecompiler_p.h" #include "qdeclarativeengine.h" #include "qdeclarativecomponent.h" -#include "qdeclarativecomponent_p.h" +#include "private/qdeclarativecomponent_p.h" #include "qdeclarativecontext.h" -#include "qdeclarativecontext_p.h" +#include "private/qdeclarativecontext_p.h" #include <QtCore/qdebug.h> diff --git a/src/declarative/qml/qdeclarativecompiler.cpp b/src/declarative/qml/qdeclarativecompiler.cpp index 56af5f518d..f4ccce1edc 100644 --- a/src/declarative/qml/qdeclarativecompiler.cpp +++ b/src/declarative/qml/qdeclarativecompiler.cpp @@ -39,33 +39,33 @@ ** ****************************************************************************/ -#include "qdeclarativecompiler_p.h" +#include "private/qdeclarativecompiler_p.h" -#include "qdeclarativecompositetypedata_p.h" -#include "qdeclarativeparser_p.h" -#include "qdeclarativescriptparser_p.h" +#include "private/qdeclarativecompositetypedata_p.h" +#include "private/qdeclarativeparser_p.h" +#include "private/qdeclarativescriptparser_p.h" #include "qdeclarativepropertyvaluesource.h" #include "qdeclarativecomponent.h" -#include "qmetaobjectbuilder_p.h" -#include "qdeclarativestringconverters_p.h" -#include "qdeclarativeengine_p.h" +#include "private/qmetaobjectbuilder_p.h" +#include "private/qdeclarativestringconverters_p.h" +#include "private/qdeclarativeengine_p.h" #include "qdeclarativeengine.h" #include "qdeclarativecontext.h" -#include "qdeclarativemetatype_p.h" -#include "qdeclarativecustomparser_p_p.h" -#include "qdeclarativecontext_p.h" -#include "qdeclarativecomponent_p.h" +#include "private/qdeclarativemetatype_p.h" +#include "private/qdeclarativecustomparser_p_p.h" +#include "private/qdeclarativecontext_p.h" +#include "private/qdeclarativecomponent_p.h" #include "parser/qdeclarativejsast_p.h" -#include "qdeclarativevmemetaobject_p.h" -#include "qdeclarativeexpression_p.h" -#include "qdeclarativeproperty_p.h" -#include "qdeclarativerewrite_p.h" +#include "private/qdeclarativevmemetaobject_p.h" +#include "private/qdeclarativeexpression_p.h" +#include "private/qdeclarativeproperty_p.h" +#include "private/qdeclarativerewrite_p.h" #include "qdeclarativescriptstring.h" -#include "qdeclarativeglobal_p.h" -#include "qdeclarativescriptparser_p.h" -#include "qdeclarativebinding_p.h" -#include "qdeclarativecompiledbindings_p.h" -#include "qdeclarativeglobalscriptclass_p.h" +#include "private/qdeclarativeglobal_p.h" +#include "private/qdeclarativescriptparser_p.h" +#include "private/qdeclarativebinding_p.h" +#include "private/qdeclarativecompiledbindings_p.h" +#include "private/qdeclarativeglobalscriptclass_p.h" #include <QCoreApplication> #include <QColor> diff --git a/src/declarative/qml/qdeclarativecompiler_p.h b/src/declarative/qml/qdeclarativecompiler_p.h index e5836d1641..11364bb347 100644 --- a/src/declarative/qml/qdeclarativecompiler_p.h +++ b/src/declarative/qml/qdeclarativecompiler_p.h @@ -55,14 +55,14 @@ #include "qdeclarative.h" #include "qdeclarativeerror.h" -#include "qdeclarativeinstruction_p.h" -#include "qdeclarativecompositetypemanager_p.h" -#include "qdeclarativeparser_p.h" -#include "qdeclarativeengine_p.h" -#include "qbitfield_p.h" -#include "qdeclarativepropertycache_p.h" -#include "qdeclarativeintegercache_p.h" -#include "qdeclarativetypenamecache_p.h" +#include "private/qdeclarativeinstruction_p.h" +#include "private/qdeclarativecompositetypemanager_p.h" +#include "private/qdeclarativeparser_p.h" +#include "private/qdeclarativeengine_p.h" +#include "private/qbitfield_p.h" +#include "private/qdeclarativepropertycache_p.h" +#include "private/qdeclarativeintegercache_p.h" +#include "private/qdeclarativetypenamecache_p.h" #include <QtCore/qbytearray.h> #include <QtCore/qset.h> diff --git a/src/declarative/qml/qdeclarativecomponent.cpp b/src/declarative/qml/qdeclarativecomponent.cpp index ec2345880b..e1803747b4 100644 --- a/src/declarative/qml/qdeclarativecomponent.cpp +++ b/src/declarative/qml/qdeclarativecomponent.cpp @@ -40,19 +40,19 @@ ****************************************************************************/ #include "qdeclarativecomponent.h" -#include "qdeclarativecomponent_p.h" +#include "private/qdeclarativecomponent_p.h" -#include "qdeclarativecompiler_p.h" -#include "qdeclarativecontext_p.h" -#include "qdeclarativecompositetypedata_p.h" -#include "qdeclarativeengine_p.h" -#include "qdeclarativevme_p.h" +#include "private/qdeclarativecompiler_p.h" +#include "private/qdeclarativecontext_p.h" +#include "private/qdeclarativecompositetypedata_p.h" +#include "private/qdeclarativeengine_p.h" +#include "private/qdeclarativevme_p.h" #include "qdeclarative.h" #include "qdeclarativeengine.h" -#include "qdeclarativebinding_p.h" -#include "qdeclarativebinding_p_p.h" -#include "qdeclarativeglobal_p.h" -#include "qdeclarativescriptparser_p.h" +#include "private/qdeclarativebinding_p.h" +#include "private/qdeclarativebinding_p_p.h" +#include "private/qdeclarativeglobal_p.h" +#include "private/qdeclarativescriptparser_p.h" #include <QStack> #include <QStringList> diff --git a/src/declarative/qml/qdeclarativecomponent_p.h b/src/declarative/qml/qdeclarativecomponent_p.h index b44aeefc41..dfe327b31a 100644 --- a/src/declarative/qml/qdeclarativecomponent_p.h +++ b/src/declarative/qml/qdeclarativecomponent_p.h @@ -55,9 +55,9 @@ #include "qdeclarativecomponent.h" -#include "qdeclarativeengine_p.h" -#include "qdeclarativecompositetypemanager_p.h" -#include "qbitfield_p.h" +#include "private/qdeclarativeengine_p.h" +#include "private/qdeclarativecompositetypemanager_p.h" +#include "private/qbitfield_p.h" #include "qdeclarativeerror.h" #include "qdeclarative.h" diff --git a/src/declarative/qml/qdeclarativecompositetypedata_p.h b/src/declarative/qml/qdeclarativecompositetypedata_p.h index 04d0c632af..47cb3b3e8a 100644 --- a/src/declarative/qml/qdeclarativecompositetypedata_p.h +++ b/src/declarative/qml/qdeclarativecompositetypedata_p.h @@ -53,7 +53,7 @@ // We mean it. // -#include "qdeclarativeengine_p.h" +#include "private/qdeclarativeengine_p.h" #include <QtCore/qglobal.h> diff --git a/src/declarative/qml/qdeclarativecompositetypemanager.cpp b/src/declarative/qml/qdeclarativecompositetypemanager.cpp index eb8c9ebad1..55723ea803 100644 --- a/src/declarative/qml/qdeclarativecompositetypemanager.cpp +++ b/src/declarative/qml/qdeclarativecompositetypemanager.cpp @@ -39,15 +39,15 @@ ** ****************************************************************************/ -#include "qdeclarativecompositetypemanager_p.h" +#include "private/qdeclarativecompositetypemanager_p.h" -#include "qdeclarativecompositetypedata_p.h" -#include "qdeclarativescriptparser_p.h" +#include "private/qdeclarativecompositetypedata_p.h" +#include "private/qdeclarativescriptparser_p.h" #include "qdeclarativeengine.h" -#include "qdeclarativeengine_p.h" +#include "private/qdeclarativeengine_p.h" #include "qdeclarativecomponent.h" -#include "qdeclarativecomponent_p.h" -#include "qdeclarativecompiler_p.h" +#include "private/qdeclarativecomponent_p.h" +#include "private/qdeclarativecompiler_p.h" #include <QtNetwork/qnetworkreply.h> #include <QtCore/qdebug.h> diff --git a/src/declarative/qml/qdeclarativecompositetypemanager_p.h b/src/declarative/qml/qdeclarativecompositetypemanager_p.h index a572e0cf14..5c82c4c311 100644 --- a/src/declarative/qml/qdeclarativecompositetypemanager_p.h +++ b/src/declarative/qml/qdeclarativecompositetypemanager_p.h @@ -53,8 +53,8 @@ // We mean it. // -#include "qdeclarativescriptparser_p.h" -#include "qdeclarativerefcount_p.h" +#include "private/qdeclarativescriptparser_p.h" +#include "private/qdeclarativerefcount_p.h" #include "qdeclarativeerror.h" #include "qdeclarativeengine.h" diff --git a/src/declarative/qml/qdeclarativecontext.cpp b/src/declarative/qml/qdeclarativecontext.cpp index a9224ada91..55c2f7c3f8 100644 --- a/src/declarative/qml/qdeclarativecontext.cpp +++ b/src/declarative/qml/qdeclarativecontext.cpp @@ -40,14 +40,14 @@ ****************************************************************************/ #include "qdeclarativecontext.h" -#include "qdeclarativecontext_p.h" +#include "private/qdeclarativecontext_p.h" -#include "qdeclarativeexpression_p.h" -#include "qdeclarativeengine_p.h" +#include "private/qdeclarativeexpression_p.h" +#include "private/qdeclarativeengine_p.h" #include "qdeclarativeengine.h" -#include "qdeclarativecompiledbindings_p.h" +#include "private/qdeclarativecompiledbindings_p.h" #include "qdeclarativeinfo.h" -#include "qdeclarativeglobalscriptclass_p.h" +#include "private/qdeclarativeglobalscriptclass_p.h" #include <qscriptengine.h> #include <QtCore/qvarlengtharray.h> diff --git a/src/declarative/qml/qdeclarativecontext_p.h b/src/declarative/qml/qdeclarativecontext_p.h index 397f37a1c6..6c5a1f767c 100644 --- a/src/declarative/qml/qdeclarativecontext_p.h +++ b/src/declarative/qml/qdeclarativecontext_p.h @@ -55,19 +55,19 @@ #include "qdeclarativecontext.h" -#include "qdeclarativedeclarativedata_p.h" -#include "qdeclarativeintegercache_p.h" -#include "qdeclarativetypenamecache_p.h" -#include "qdeclarativenotifier_p.h" +#include "private/qdeclarativedeclarativedata_p.h" +#include "private/qdeclarativeintegercache_p.h" +#include "private/qdeclarativetypenamecache_p.h" +#include "private/qdeclarativenotifier_p.h" #include "qdeclarativelist.h" -#include "qdeclarativeparser_p.h" +#include "private/qdeclarativeparser_p.h" #include <QtCore/qhash.h> #include <QtScript/qscriptvalue.h> #include <QtCore/qset.h> #include <private/qobject_p.h> -#include "qdeclarativeguard_p.h" +#include "private/qdeclarativeguard_p.h" QT_BEGIN_NAMESPACE diff --git a/src/declarative/qml/qdeclarativecontextscriptclass.cpp b/src/declarative/qml/qdeclarativecontextscriptclass.cpp index 2559224725..85667448d4 100644 --- a/src/declarative/qml/qdeclarativecontextscriptclass.cpp +++ b/src/declarative/qml/qdeclarativecontextscriptclass.cpp @@ -39,13 +39,13 @@ ** ****************************************************************************/ -#include "qdeclarativecontextscriptclass_p.h" +#include "private/qdeclarativecontextscriptclass_p.h" -#include "qdeclarativeengine_p.h" -#include "qdeclarativecontext_p.h" -#include "qdeclarativetypenamescriptclass_p.h" -#include "qdeclarativelistscriptclass_p.h" -#include "qdeclarativeguard_p.h" +#include "private/qdeclarativeengine_p.h" +#include "private/qdeclarativecontext_p.h" +#include "private/qdeclarativetypenamescriptclass_p.h" +#include "private/qdeclarativelistscriptclass_p.h" +#include "private/qdeclarativeguard_p.h" QT_BEGIN_NAMESPACE diff --git a/src/declarative/qml/qdeclarativecontextscriptclass_p.h b/src/declarative/qml/qdeclarativecontextscriptclass_p.h index 93e4b20c30..b89f0cdf16 100644 --- a/src/declarative/qml/qdeclarativecontextscriptclass_p.h +++ b/src/declarative/qml/qdeclarativecontextscriptclass_p.h @@ -53,8 +53,8 @@ // We mean it. // -#include "qdeclarativetypenamecache_p.h" -#include "qdeclarativescriptclass_p.h" +#include "private/qdeclarativetypenamecache_p.h" +#include "private/qdeclarativescriptclass_p.h" QT_BEGIN_NAMESPACE diff --git a/src/declarative/qml/qdeclarativecustomparser.cpp b/src/declarative/qml/qdeclarativecustomparser.cpp index a3a511c44e..8b6ee7c632 100644 --- a/src/declarative/qml/qdeclarativecustomparser.cpp +++ b/src/declarative/qml/qdeclarativecustomparser.cpp @@ -39,11 +39,11 @@ ** ****************************************************************************/ -#include "qdeclarativecustomparser_p.h" -#include "qdeclarativecustomparser_p_p.h" +#include "private/qdeclarativecustomparser_p.h" +#include "private/qdeclarativecustomparser_p_p.h" -#include "qdeclarativeparser_p.h" -#include "qdeclarativecompiler_p.h" +#include "private/qdeclarativeparser_p.h" +#include "private/qdeclarativecompiler_p.h" #include <QtCore/qdebug.h> diff --git a/src/declarative/qml/qdeclarativecustomparser_p.h b/src/declarative/qml/qdeclarativecustomparser_p.h index f9bf513326..da0358acba 100644 --- a/src/declarative/qml/qdeclarativecustomparser_p.h +++ b/src/declarative/qml/qdeclarativecustomparser_p.h @@ -53,9 +53,9 @@ // We mean it. // -#include "qdeclarativemetatype_p.h" +#include "private/qdeclarativemetatype_p.h" #include "qdeclarativeerror.h" -#include "qdeclarativeparser_p.h" +#include "private/qdeclarativeparser_p.h" #include <QtCore/qbytearray.h> #include <QtCore/qxmlstream.h> diff --git a/src/declarative/qml/qdeclarativecustomparser_p_p.h b/src/declarative/qml/qdeclarativecustomparser_p_p.h index b580db6af0..a7e213c46c 100644 --- a/src/declarative/qml/qdeclarativecustomparser_p_p.h +++ b/src/declarative/qml/qdeclarativecustomparser_p_p.h @@ -53,9 +53,9 @@ // We mean it. // -#include "qdeclarativecustomparser_p.h" +#include "private/qdeclarativecustomparser_p.h" -#include "qdeclarativeparser_p.h" +#include "private/qdeclarativeparser_p.h" #include <QtCore/qglobal.h> diff --git a/src/declarative/qml/qdeclarativedeclarativedata_p.h b/src/declarative/qml/qdeclarativedeclarativedata_p.h index d1d063a581..adfff19d68 100644 --- a/src/declarative/qml/qdeclarativedeclarativedata_p.h +++ b/src/declarative/qml/qdeclarativedeclarativedata_p.h @@ -55,7 +55,7 @@ #include <QtScript/qscriptvalue.h> #include <private/qobject_p.h> -#include "qdeclarativeguard_p.h" +#include "private/qdeclarativeguard_p.h" QT_BEGIN_NAMESPACE diff --git a/src/declarative/qml/qdeclarativedirparser.cpp b/src/declarative/qml/qdeclarativedirparser.cpp index 0e82098036..1e3b37bd9c 100644 --- a/src/declarative/qml/qdeclarativedirparser.cpp +++ b/src/declarative/qml/qdeclarativedirparser.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include "qdeclarativedirparser_p.h" +#include "private/qdeclarativedirparser_p.h" #include "qdeclarativeerror.h" #include <QtCore/QTextStream> diff --git a/src/declarative/qml/qdeclarativedom.cpp b/src/declarative/qml/qdeclarativedom.cpp index dec30a1b24..a3cddb5da0 100644 --- a/src/declarative/qml/qdeclarativedom.cpp +++ b/src/declarative/qml/qdeclarativedom.cpp @@ -39,14 +39,14 @@ ** ****************************************************************************/ -#include "qdeclarativedom_p.h" -#include "qdeclarativedom_p_p.h" - -#include "qdeclarativecompositetypedata_p.h" -#include "qdeclarativecompiler_p.h" -#include "qdeclarativeengine_p.h" -#include "qdeclarativescriptparser_p.h" -#include "qdeclarativeglobal_p.h" +#include "private/qdeclarativedom_p.h" +#include "private/qdeclarativedom_p_p.h" + +#include "private/qdeclarativecompositetypedata_p.h" +#include "private/qdeclarativecompiler_p.h" +#include "private/qdeclarativeengine_p.h" +#include "private/qdeclarativescriptparser_p.h" +#include "private/qdeclarativeglobal_p.h" #include <QtCore/QByteArray> #include <QtCore/QDebug> diff --git a/src/declarative/qml/qdeclarativedom_p_p.h b/src/declarative/qml/qdeclarativedom_p_p.h index a065282e36..7ce99ec74d 100644 --- a/src/declarative/qml/qdeclarativedom_p_p.h +++ b/src/declarative/qml/qdeclarativedom_p_p.h @@ -53,7 +53,7 @@ // We mean it. // -#include "qdeclarativeparser_p.h" +#include "private/qdeclarativeparser_p.h" #include <QtCore/QtGlobal> diff --git a/src/declarative/qml/qdeclarativeengine.cpp b/src/declarative/qml/qdeclarativeengine.cpp index 9442705fde..52a1f45710 100644 --- a/src/declarative/qml/qdeclarativeengine.cpp +++ b/src/declarative/qml/qdeclarativeengine.cpp @@ -39,35 +39,35 @@ ** ****************************************************************************/ -#include "qdeclarativeengine_p.h" +#include "private/qdeclarativeengine_p.h" #include "qdeclarativeengine.h" -#include "qdeclarativecontext_p.h" -#include "qdeclarativecompiler_p.h" -#include "qdeclarativeglobalscriptclass_p.h" +#include "private/qdeclarativecontext_p.h" +#include "private/qdeclarativecompiler_p.h" +#include "private/qdeclarativeglobalscriptclass_p.h" #include "qdeclarative.h" #include "qdeclarativecontext.h" #include "qdeclarativeexpression.h" #include "qdeclarativecomponent.h" -#include "qdeclarativebinding_p_p.h" -#include "qdeclarativevme_p.h" -#include "qdeclarativeenginedebug_p.h" -#include "qdeclarativestringconverters_p.h" -#include "qdeclarativexmlhttprequest_p.h" -#include "qdeclarativesqldatabase_p.h" -#include "qdeclarativetypenamescriptclass_p.h" -#include "qdeclarativelistscriptclass_p.h" +#include "private/qdeclarativebinding_p_p.h" +#include "private/qdeclarativevme_p.h" +#include "private/qdeclarativeenginedebug_p.h" +#include "private/qdeclarativestringconverters_p.h" +#include "private/qdeclarativexmlhttprequest_p.h" +#include "private/qdeclarativesqldatabase_p.h" +#include "private/qdeclarativetypenamescriptclass_p.h" +#include "private/qdeclarativelistscriptclass_p.h" #include "qdeclarativescriptstring.h" -#include "qdeclarativeglobal_p.h" -#include "qdeclarativeworkerscript_p.h" -#include "qdeclarativecomponent_p.h" -#include "qdeclarativescriptclass_p.h" +#include "private/qdeclarativeglobal_p.h" +#include "private/qdeclarativeworkerscript_p.h" +#include "private/qdeclarativecomponent_p.h" +#include "private/qdeclarativescriptclass_p.h" #include "qdeclarativenetworkaccessmanagerfactory.h" #include "qdeclarativeimageprovider.h" -#include "qdeclarativedirparser_p.h" +#include "private/qdeclarativedirparser_p.h" #include "qdeclarativeextensioninterface.h" -#include "qdeclarativelist_p.h" -#include "qdeclarativetypenamecache_p.h" +#include "private/qdeclarativelist_p.h" +#include "private/qdeclarativetypenamecache_p.h" #include <QtCore/qmetaobject.h> #include <QScriptClass> diff --git a/src/declarative/qml/qdeclarativeengine_p.h b/src/declarative/qml/qdeclarativeengine_p.h index 5aff30d878..45089d0f8f 100644 --- a/src/declarative/qml/qdeclarativeengine_p.h +++ b/src/declarative/qml/qdeclarativeengine_p.h @@ -55,21 +55,21 @@ #include "qdeclarativeengine.h" -#include "qdeclarativeclassfactory_p.h" -#include "qdeclarativecompositetypemanager_p.h" -#include "qpodvector_p.h" +#include "private/qdeclarativeclassfactory_p.h" +#include "private/qdeclarativecompositetypemanager_p.h" +#include "private/qpodvector_p.h" #include "qdeclarative.h" -#include "qdeclarativevaluetype_p.h" +#include "private/qdeclarativevaluetype_p.h" #include "qdeclarativecontext.h" -#include "qdeclarativecontext_p.h" +#include "private/qdeclarativecontext_p.h" #include "qdeclarativeexpression.h" -#include "qdeclarativeproperty_p.h" -#include "qdeclarativepropertycache_p.h" -#include "qdeclarativeobjectscriptclass_p.h" -#include "qdeclarativecontextscriptclass_p.h" -#include "qdeclarativevaluetypescriptclass_p.h" -#include "qdeclarativemetatype_p.h" -#include "qdeclarativedirparser_p.h" +#include "private/qdeclarativeproperty_p.h" +#include "private/qdeclarativepropertycache_p.h" +#include "private/qdeclarativeobjectscriptclass_p.h" +#include "private/qdeclarativecontextscriptclass_p.h" +#include "private/qdeclarativevaluetypescriptclass_p.h" +#include "private/qdeclarativemetatype_p.h" +#include "private/qdeclarativedirparser_p.h" #include <QtScript/QScriptClass> #include <QtScript/QScriptValue> diff --git a/src/declarative/qml/qdeclarativeenginedebug.cpp b/src/declarative/qml/qdeclarativeenginedebug.cpp index d30aa8e983..345588312e 100644 --- a/src/declarative/qml/qdeclarativeenginedebug.cpp +++ b/src/declarative/qml/qdeclarativeenginedebug.cpp @@ -39,17 +39,17 @@ ** ****************************************************************************/ -#include "qdeclarativeenginedebug_p.h" +#include "private/qdeclarativeenginedebug_p.h" -#include "qdeclarativeboundsignal_p.h" +#include "private/qdeclarativeboundsignal_p.h" #include "qdeclarativeengine.h" -#include "qdeclarativemetatype_p.h" +#include "private/qdeclarativemetatype_p.h" #include "qdeclarativeproperty.h" -#include "qdeclarativeproperty_p.h" -#include "qdeclarativebinding_p.h" -#include "qdeclarativecontext_p.h" -#include "qdeclarativewatcher_p.h" -#include "qdeclarativevaluetype_p.h" +#include "private/qdeclarativeproperty_p.h" +#include "private/qdeclarativebinding_p.h" +#include "private/qdeclarativecontext_p.h" +#include "private/qdeclarativewatcher_p.h" +#include "private/qdeclarativevaluetype_p.h" #include <QtCore/qdebug.h> #include <QtCore/qmetaobject.h> diff --git a/src/declarative/qml/qdeclarativeexpression.cpp b/src/declarative/qml/qdeclarativeexpression.cpp index b7ee3a4b9c..a250f21bf2 100644 --- a/src/declarative/qml/qdeclarativeexpression.cpp +++ b/src/declarative/qml/qdeclarativeexpression.cpp @@ -40,13 +40,13 @@ ****************************************************************************/ #include "qdeclarativeexpression.h" -#include "qdeclarativeexpression_p.h" +#include "private/qdeclarativeexpression_p.h" -#include "qdeclarativeengine_p.h" -#include "qdeclarativecontext_p.h" -#include "qdeclarativerewrite_p.h" -#include "qdeclarativecompiler_p.h" -#include "qdeclarativeglobalscriptclass_p.h" +#include "private/qdeclarativeengine_p.h" +#include "private/qdeclarativecontext_p.h" +#include "private/qdeclarativerewrite_p.h" +#include "private/qdeclarativecompiler_p.h" +#include "private/qdeclarativeglobalscriptclass_p.h" #include <QtCore/qdebug.h> #include <QtScript/qscriptprogram.h> diff --git a/src/declarative/qml/qdeclarativeexpression_p.h b/src/declarative/qml/qdeclarativeexpression_p.h index 5adaa899e6..9a90fb662e 100644 --- a/src/declarative/qml/qdeclarativeexpression_p.h +++ b/src/declarative/qml/qdeclarativeexpression_p.h @@ -55,8 +55,8 @@ #include "qdeclarativeexpression.h" -#include "qdeclarativeengine_p.h" -#include "qdeclarativeguard_p.h" +#include "private/qdeclarativeengine_p.h" +#include "private/qdeclarativeguard_p.h" #include <QtScript/qscriptvalue.h> diff --git a/src/declarative/qml/qdeclarativefastproperties.cpp b/src/declarative/qml/qdeclarativefastproperties.cpp index 088d3293e4..eb69b6aede 100644 --- a/src/declarative/qml/qdeclarativefastproperties.cpp +++ b/src/declarative/qml/qdeclarativefastproperties.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include "qdeclarativefastproperties_p.h" +#include "private/qdeclarativefastproperties_p.h" #include <private/qdeclarativeitem_p.h> diff --git a/src/declarative/qml/qdeclarativeglobalscriptclass.cpp b/src/declarative/qml/qdeclarativeglobalscriptclass.cpp index 9ee2fe5bb6..fc802b48b5 100644 --- a/src/declarative/qml/qdeclarativeglobalscriptclass.cpp +++ b/src/declarative/qml/qdeclarativeglobalscriptclass.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include "qdeclarativeglobalscriptclass_p.h" +#include "private/qdeclarativeglobalscriptclass_p.h" #include <QtScript/qscriptstring.h> #include <QtScript/qscriptengine.h> diff --git a/src/declarative/qml/qdeclarativeguard_p.h b/src/declarative/qml/qdeclarativeguard_p.h index 0861e9a5f1..747d58f149 100644 --- a/src/declarative/qml/qdeclarativeguard_p.h +++ b/src/declarative/qml/qdeclarativeguard_p.h @@ -99,7 +99,7 @@ QT_END_NAMESPACE Q_DECLARE_METATYPE(QDeclarativeGuard<QObject>); -#include "qdeclarativedeclarativedata_p.h" +#include "private/qdeclarativedeclarativedata_p.h" QT_BEGIN_NAMESPACE diff --git a/src/declarative/qml/qdeclarativeinfo.cpp b/src/declarative/qml/qdeclarativeinfo.cpp index 5146bb67a5..6199aa9f82 100644 --- a/src/declarative/qml/qdeclarativeinfo.cpp +++ b/src/declarative/qml/qdeclarativeinfo.cpp @@ -41,10 +41,10 @@ #include "qdeclarativeinfo.h" -#include "qdeclarativedeclarativedata_p.h" +#include "private/qdeclarativedeclarativedata_p.h" #include "qdeclarativecontext.h" -#include "qdeclarativecontext_p.h" -#include "qdeclarativemetatype_p.h" +#include "private/qdeclarativecontext_p.h" +#include "private/qdeclarativemetatype_p.h" #include <QCoreApplication> diff --git a/src/declarative/qml/qdeclarativeinstruction.cpp b/src/declarative/qml/qdeclarativeinstruction.cpp index 9083ab3661..3cf4d2bbc6 100644 --- a/src/declarative/qml/qdeclarativeinstruction.cpp +++ b/src/declarative/qml/qdeclarativeinstruction.cpp @@ -39,9 +39,9 @@ ** ****************************************************************************/ -#include "qdeclarativeinstruction_p.h" +#include "private/qdeclarativeinstruction_p.h" -#include "qdeclarativecompiler_p.h" +#include "private/qdeclarativecompiler_p.h" #include <QtCore/qdebug.h> diff --git a/src/declarative/qml/qdeclarativeintegercache.cpp b/src/declarative/qml/qdeclarativeintegercache.cpp index be3647180d..d1e17a0b25 100644 --- a/src/declarative/qml/qdeclarativeintegercache.cpp +++ b/src/declarative/qml/qdeclarativeintegercache.cpp @@ -39,10 +39,10 @@ ** ****************************************************************************/ -#include "qdeclarativeintegercache_p.h" +#include "private/qdeclarativeintegercache_p.h" -#include "qdeclarativeengine_p.h" -#include "qdeclarativemetatype_p.h" +#include "private/qdeclarativeengine_p.h" +#include "private/qdeclarativemetatype_p.h" QT_BEGIN_NAMESPACE diff --git a/src/declarative/qml/qdeclarativeintegercache_p.h b/src/declarative/qml/qdeclarativeintegercache_p.h index 5fb5a760ad..b3a3796295 100644 --- a/src/declarative/qml/qdeclarativeintegercache_p.h +++ b/src/declarative/qml/qdeclarativeintegercache_p.h @@ -53,8 +53,8 @@ // We mean it. // -#include "qdeclarativerefcount_p.h" -#include "qdeclarativecleanup_p.h" +#include "private/qdeclarativerefcount_p.h" +#include "private/qdeclarativecleanup_p.h" #include <QtCore/qhash.h> diff --git a/src/declarative/qml/qdeclarativelist.cpp b/src/declarative/qml/qdeclarativelist.cpp index 9691f322a6..45b8cd7c5f 100644 --- a/src/declarative/qml/qdeclarativelist.cpp +++ b/src/declarative/qml/qdeclarativelist.cpp @@ -40,9 +40,9 @@ ****************************************************************************/ #include "qdeclarativelist.h" -#include "qdeclarativelist_p.h" -#include "qdeclarativeengine_p.h" -#include "qdeclarativeproperty_p.h" +#include "private/qdeclarativelist_p.h" +#include "private/qdeclarativeengine_p.h" +#include "private/qdeclarativeproperty_p.h" QT_BEGIN_NAMESPACE diff --git a/src/declarative/qml/qdeclarativelist.h b/src/declarative/qml/qdeclarativelist.h index 219aa4b1b8..399b2a1874 100644 --- a/src/declarative/qml/qdeclarativelist.h +++ b/src/declarative/qml/qdeclarativelist.h @@ -145,7 +145,7 @@ private: QT_END_NAMESPACE -Q_DECLARE_METATYPE(QDeclarativeListReference); +Q_DECLARE_METATYPE(QDeclarativeListReference) QT_END_HEADER diff --git a/src/declarative/qml/qdeclarativelist_p.h b/src/declarative/qml/qdeclarativelist_p.h index 45a805a838..b17f84ab15 100644 --- a/src/declarative/qml/qdeclarativelist_p.h +++ b/src/declarative/qml/qdeclarativelist_p.h @@ -54,7 +54,7 @@ // #include "qdeclarativelist.h" -#include "qdeclarativeguard_p.h" +#include "private/qdeclarativeguard_p.h" QT_BEGIN_NAMESPACE diff --git a/src/declarative/qml/qdeclarativelistscriptclass.cpp b/src/declarative/qml/qdeclarativelistscriptclass.cpp index ea04ad96ce..3958dd5181 100644 --- a/src/declarative/qml/qdeclarativelistscriptclass.cpp +++ b/src/declarative/qml/qdeclarativelistscriptclass.cpp @@ -39,11 +39,11 @@ ** ****************************************************************************/ -#include "qdeclarativelistscriptclass_p.h" +#include "private/qdeclarativelistscriptclass_p.h" -#include "qdeclarativeengine_p.h" -#include "qdeclarativeguard_p.h" -#include "qdeclarativelist_p.h" +#include "private/qdeclarativeengine_p.h" +#include "private/qdeclarativeguard_p.h" +#include "private/qdeclarativelist_p.h" QT_BEGIN_NAMESPACE diff --git a/src/declarative/qml/qdeclarativemetatype.cpp b/src/declarative/qml/qdeclarativemetatype.cpp index c512d979db..af21765453 100644 --- a/src/declarative/qml/qdeclarativemetatype.cpp +++ b/src/declarative/qml/qdeclarativemetatype.cpp @@ -39,11 +39,11 @@ ** ****************************************************************************/ -#include "qdeclarativemetatype_p.h" +#include "private/qdeclarativemetatype_p.h" -#include "qdeclarativeproxymetaobject_p.h" -#include "qdeclarativecustomparser_p.h" -#include "qdeclarativeguard_p.h" +#include "private/qdeclarativeproxymetaobject_p.h" +#include "private/qdeclarativecustomparser_p.h" +#include "private/qdeclarativeguard_p.h" #include <QtCore/qdebug.h> #include <QtCore/qstringlist.h> diff --git a/src/declarative/qml/qdeclarativenotifier.cpp b/src/declarative/qml/qdeclarativenotifier.cpp index b12bf77201..8c946f8c17 100644 --- a/src/declarative/qml/qdeclarativenotifier.cpp +++ b/src/declarative/qml/qdeclarativenotifier.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include "qdeclarativenotifier_p.h" +#include "private/qdeclarativenotifier_p.h" QT_BEGIN_NAMESPACE diff --git a/src/declarative/qml/qdeclarativenotifier_p.h b/src/declarative/qml/qdeclarativenotifier_p.h index 2a9660dceb..0781caf721 100644 --- a/src/declarative/qml/qdeclarativenotifier_p.h +++ b/src/declarative/qml/qdeclarativenotifier_p.h @@ -42,7 +42,7 @@ #ifndef QDECLARATIVENOTIFIER_P_H #define QDECLARATIVENOTIFIER_P_H -#include "qdeclarativeguard_p.h" +#include "private/qdeclarativeguard_p.h" QT_BEGIN_NAMESPACE diff --git a/src/declarative/qml/qdeclarativeobjectscriptclass.cpp b/src/declarative/qml/qdeclarativeobjectscriptclass.cpp index 84c9bef732..d3ee67b022 100644 --- a/src/declarative/qml/qdeclarativeobjectscriptclass.cpp +++ b/src/declarative/qml/qdeclarativeobjectscriptclass.cpp @@ -39,16 +39,16 @@ ** ****************************************************************************/ -#include "qdeclarativeobjectscriptclass_p.h" - -#include "qdeclarativeengine_p.h" -#include "qdeclarativecontext_p.h" -#include "qdeclarativedeclarativedata_p.h" -#include "qdeclarativetypenamescriptclass_p.h" -#include "qdeclarativelistscriptclass_p.h" -#include "qdeclarativebinding_p.h" -#include "qdeclarativeguard_p.h" -#include "qdeclarativevmemetaobject_p.h" +#include "private/qdeclarativeobjectscriptclass_p.h" + +#include "private/qdeclarativeengine_p.h" +#include "private/qdeclarativecontext_p.h" +#include "private/qdeclarativedeclarativedata_p.h" +#include "private/qdeclarativetypenamescriptclass_p.h" +#include "private/qdeclarativelistscriptclass_p.h" +#include "private/qdeclarativebinding_p.h" +#include "private/qdeclarativeguard_p.h" +#include "private/qdeclarativevmemetaobject_p.h" #include <QtCore/qtimer.h> #include <QtCore/qvarlengtharray.h> diff --git a/src/declarative/qml/qdeclarativeobjectscriptclass_p.h b/src/declarative/qml/qdeclarativeobjectscriptclass_p.h index 396b782b73..8941ae0cf7 100644 --- a/src/declarative/qml/qdeclarativeobjectscriptclass_p.h +++ b/src/declarative/qml/qdeclarativeobjectscriptclass_p.h @@ -53,8 +53,8 @@ // We mean it. // -#include "qdeclarativepropertycache_p.h" -#include "qdeclarativetypenamecache_p.h" +#include "private/qdeclarativepropertycache_p.h" +#include "private/qdeclarativetypenamecache_p.h" #include <private/qdeclarativescriptclass_p.h> #include <QtScript/qscriptengine.h> diff --git a/src/declarative/qml/qdeclarativeparser.cpp b/src/declarative/qml/qdeclarativeparser.cpp index 6e6080e401..69186b650c 100644 --- a/src/declarative/qml/qdeclarativeparser.cpp +++ b/src/declarative/qml/qdeclarativeparser.cpp @@ -39,16 +39,16 @@ ** ****************************************************************************/ -#include "qdeclarativeparser_p.h" +#include "private/qdeclarativeparser_p.h" #include "qdeclarativepropertyvaluesource.h" -#include "qdeclarativevme_p.h" +#include "private/qdeclarativevme_p.h" #include "qdeclarative.h" -#include "qdeclarativecomponent_p.h" +#include "private/qdeclarativecomponent_p.h" #include "qdeclarativecomponent.h" -#include "qmetaobjectbuilder_p.h" -#include "qdeclarativevmemetaobject_p.h" -#include "qdeclarativecompiler_p.h" +#include "private/qmetaobjectbuilder_p.h" +#include "private/qdeclarativevmemetaobject_p.h" +#include "private/qdeclarativecompiler_p.h" #include "parser/qdeclarativejsast_p.h" #include "parser/qdeclarativejsengine_p.h" diff --git a/src/declarative/qml/qdeclarativeparser_p.h b/src/declarative/qml/qdeclarativeparser_p.h index f432024af3..fd3e22fd73 100644 --- a/src/declarative/qml/qdeclarativeparser_p.h +++ b/src/declarative/qml/qdeclarativeparser_p.h @@ -54,7 +54,7 @@ // #include "qdeclarative.h" -#include "qdeclarativerefcount_p.h" +#include "private/qdeclarativerefcount_p.h" #include <QtCore/qbytearray.h> #include <QtCore/qlist.h> diff --git a/src/declarative/qml/qdeclarativeproperty.cpp b/src/declarative/qml/qdeclarativeproperty.cpp index caa1acf019..affb6b9131 100644 --- a/src/declarative/qml/qdeclarativeproperty.cpp +++ b/src/declarative/qml/qdeclarativeproperty.cpp @@ -40,20 +40,20 @@ ****************************************************************************/ #include "qdeclarativeproperty.h" -#include "qdeclarativeproperty_p.h" +#include "private/qdeclarativeproperty_p.h" -#include "qdeclarativecompositetypedata_p.h" +#include "private/qdeclarativecompositetypedata_p.h" #include "qdeclarative.h" -#include "qdeclarativebinding_p.h" +#include "private/qdeclarativebinding_p.h" #include "qdeclarativecontext.h" -#include "qdeclarativecontext_p.h" -#include "qdeclarativeboundsignal_p.h" +#include "private/qdeclarativecontext_p.h" +#include "private/qdeclarativeboundsignal_p.h" #include "qdeclarativeengine.h" -#include "qdeclarativeengine_p.h" -#include "qdeclarativedeclarativedata_p.h" -#include "qdeclarativestringconverters_p.h" -#include "qdeclarativelist_p.h" -#include "qdeclarativecompiler_p.h" +#include "private/qdeclarativeengine_p.h" +#include "private/qdeclarativedeclarativedata_p.h" +#include "private/qdeclarativestringconverters_p.h" +#include "private/qdeclarativelist_p.h" +#include "private/qdeclarativecompiler_p.h" #include <QStringList> #include <QtCore/qdebug.h> diff --git a/src/declarative/qml/qdeclarativeproperty_p.h b/src/declarative/qml/qdeclarativeproperty_p.h index 1bbee64909..420a1baf92 100644 --- a/src/declarative/qml/qdeclarativeproperty_p.h +++ b/src/declarative/qml/qdeclarativeproperty_p.h @@ -55,8 +55,8 @@ #include "qdeclarativeproperty.h" -#include "qdeclarativepropertycache_p.h" -#include "qdeclarativeguard_p.h" +#include "private/qdeclarativepropertycache_p.h" +#include "private/qdeclarativeguard_p.h" #include <private/qobject_p.h> diff --git a/src/declarative/qml/qdeclarativepropertycache.cpp b/src/declarative/qml/qdeclarativepropertycache.cpp index fea59e55c8..111259d3c6 100644 --- a/src/declarative/qml/qdeclarativepropertycache.cpp +++ b/src/declarative/qml/qdeclarativepropertycache.cpp @@ -39,10 +39,10 @@ ** ****************************************************************************/ -#include "qdeclarativepropertycache_p.h" +#include "private/qdeclarativepropertycache_p.h" -#include "qdeclarativeengine_p.h" -#include "qdeclarativebinding_p.h" +#include "private/qdeclarativeengine_p.h" +#include "private/qdeclarativebinding_p.h" #include <QtCore/qdebug.h> Q_DECLARE_METATYPE(QScriptValue); diff --git a/src/declarative/qml/qdeclarativepropertycache_p.h b/src/declarative/qml/qdeclarativepropertycache_p.h index bfbeff4794..6b64a96da7 100644 --- a/src/declarative/qml/qdeclarativepropertycache_p.h +++ b/src/declarative/qml/qdeclarativepropertycache_p.h @@ -53,9 +53,9 @@ // We mean it. // -#include "qdeclarativerefcount_p.h" -#include "qdeclarativecleanup_p.h" -#include "qdeclarativenotifier_p.h" +#include "private/qdeclarativerefcount_p.h" +#include "private/qdeclarativecleanup_p.h" +#include "private/qdeclarativenotifier_p.h" #include <QtCore/qvector.h> diff --git a/src/declarative/qml/qdeclarativeproxymetaobject.cpp b/src/declarative/qml/qdeclarativeproxymetaobject.cpp index 1decea1328..fe0dce7325 100644 --- a/src/declarative/qml/qdeclarativeproxymetaobject.cpp +++ b/src/declarative/qml/qdeclarativeproxymetaobject.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include "qdeclarativeproxymetaobject_p.h" +#include "private/qdeclarativeproxymetaobject_p.h" #include <QDebug> diff --git a/src/declarative/qml/qdeclarativeproxymetaobject_p.h b/src/declarative/qml/qdeclarativeproxymetaobject_p.h index 3f103b6ca7..3daa22fc4d 100644 --- a/src/declarative/qml/qdeclarativeproxymetaobject_p.h +++ b/src/declarative/qml/qdeclarativeproxymetaobject_p.h @@ -53,7 +53,7 @@ // We mean it. // -#include "qmetaobjectbuilder_p.h" +#include "private/qmetaobjectbuilder_p.h" #include "qdeclarative.h" #include <QtCore/QMetaObject> diff --git a/src/declarative/qml/qdeclarativerefcount.cpp b/src/declarative/qml/qdeclarativerefcount.cpp index 943e35c6ff..351fcf3eb8 100644 --- a/src/declarative/qml/qdeclarativerefcount.cpp +++ b/src/declarative/qml/qdeclarativerefcount.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include "qdeclarativerefcount_p.h" +#include "private/qdeclarativerefcount_p.h" QT_BEGIN_NAMESPACE diff --git a/src/declarative/qml/qdeclarativerewrite.cpp b/src/declarative/qml/qdeclarativerewrite.cpp index afc6e63250..3d40e77653 100644 --- a/src/declarative/qml/qdeclarativerewrite.cpp +++ b/src/declarative/qml/qdeclarativerewrite.cpp @@ -39,9 +39,9 @@ ** ****************************************************************************/ -#include "qdeclarativerewrite_p.h" +#include "private/qdeclarativerewrite_p.h" -#include "qdeclarativeglobal_p.h" +#include "private/qdeclarativeglobal_p.h" #include <QtCore/qdebug.h> diff --git a/src/declarative/qml/qdeclarativescriptparser.cpp b/src/declarative/qml/qdeclarativescriptparser.cpp index 2b9cd4bad4..cba5bb9051 100644 --- a/src/declarative/qml/qdeclarativescriptparser.cpp +++ b/src/declarative/qml/qdeclarativescriptparser.cpp @@ -39,16 +39,16 @@ ** ****************************************************************************/ -#include "qdeclarativescriptparser_p.h" +#include "private/qdeclarativescriptparser_p.h" -#include "qdeclarativeparser_p.h" +#include "private/qdeclarativeparser_p.h" #include "parser/qdeclarativejsengine_p.h" #include "parser/qdeclarativejsparser_p.h" #include "parser/qdeclarativejslexer_p.h" #include "parser/qdeclarativejsnodepool_p.h" #include "parser/qdeclarativejsastvisitor_p.h" #include "parser/qdeclarativejsast_p.h" -#include "qdeclarativerewrite_p.h" +#include "private/qdeclarativerewrite_p.h" #include <QStack> #include <QCoreApplication> diff --git a/src/declarative/qml/qdeclarativescriptparser_p.h b/src/declarative/qml/qdeclarativescriptparser_p.h index 68f1840c05..28e960bad0 100644 --- a/src/declarative/qml/qdeclarativescriptparser_p.h +++ b/src/declarative/qml/qdeclarativescriptparser_p.h @@ -53,7 +53,7 @@ // #include "qdeclarativeerror.h" -#include "qdeclarativeparser_p.h" +#include "private/qdeclarativeparser_p.h" #include <QtCore/QList> #include <QtCore/QUrl> diff --git a/src/declarative/qml/qdeclarativesqldatabase.cpp b/src/declarative/qml/qdeclarativesqldatabase.cpp index 37d2d5b494..45f277e9be 100644 --- a/src/declarative/qml/qdeclarativesqldatabase.cpp +++ b/src/declarative/qml/qdeclarativesqldatabase.cpp @@ -39,12 +39,12 @@ ** ****************************************************************************/ -#include "qdeclarativesqldatabase_p.h" +#include "private/qdeclarativesqldatabase_p.h" #include "qdeclarativeengine.h" -#include "qdeclarativeengine_p.h" -#include "qdeclarativerefcount_p.h" -#include "qdeclarativeengine_p.h" +#include "private/qdeclarativeengine_p.h" +#include "private/qdeclarativerefcount_p.h" +#include "private/qdeclarativeengine_p.h" #include <QtCore/qobject.h> #include <QtScript/qscriptvalue.h> diff --git a/src/declarative/qml/qdeclarativestringconverters.cpp b/src/declarative/qml/qdeclarativestringconverters.cpp index f3497e52ee..5c88b9abd6 100644 --- a/src/declarative/qml/qdeclarativestringconverters.cpp +++ b/src/declarative/qml/qdeclarativestringconverters.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include "qdeclarativestringconverters_p.h" +#include "private/qdeclarativestringconverters_p.h" #include <QtGui/qcolor.h> #include <QtGui/qvector3d.h> diff --git a/src/declarative/qml/qdeclarativetypenamecache.cpp b/src/declarative/qml/qdeclarativetypenamecache.cpp index c4a870738b..ea32aa0bcd 100644 --- a/src/declarative/qml/qdeclarativetypenamecache.cpp +++ b/src/declarative/qml/qdeclarativetypenamecache.cpp @@ -39,9 +39,9 @@ ** ****************************************************************************/ -#include "qdeclarativetypenamecache_p.h" +#include "private/qdeclarativetypenamecache_p.h" -#include "qdeclarativeengine_p.h" +#include "private/qdeclarativeengine_p.h" QT_BEGIN_NAMESPACE diff --git a/src/declarative/qml/qdeclarativetypenamecache_p.h b/src/declarative/qml/qdeclarativetypenamecache_p.h index 3e24f5c331..afd2fd92ed 100644 --- a/src/declarative/qml/qdeclarativetypenamecache_p.h +++ b/src/declarative/qml/qdeclarativetypenamecache_p.h @@ -53,8 +53,8 @@ // We mean it. // -#include "qdeclarativerefcount_p.h" -#include "qdeclarativecleanup_p.h" +#include "private/qdeclarativerefcount_p.h" +#include "private/qdeclarativecleanup_p.h" #include <private/qscriptdeclarativeclass_p.h> diff --git a/src/declarative/qml/qdeclarativetypenamescriptclass.cpp b/src/declarative/qml/qdeclarativetypenamescriptclass.cpp index 02370e0716..9cac3e13e2 100644 --- a/src/declarative/qml/qdeclarativetypenamescriptclass.cpp +++ b/src/declarative/qml/qdeclarativetypenamescriptclass.cpp @@ -39,10 +39,10 @@ ** ****************************************************************************/ -#include "qdeclarativetypenamescriptclass_p.h" +#include "private/qdeclarativetypenamescriptclass_p.h" -#include "qdeclarativeengine_p.h" -#include "qdeclarativetypenamecache_p.h" +#include "private/qdeclarativeengine_p.h" +#include "private/qdeclarativetypenamecache_p.h" QT_BEGIN_NAMESPACE diff --git a/src/declarative/qml/qdeclarativetypenamescriptclass_p.h b/src/declarative/qml/qdeclarativetypenamescriptclass_p.h index b6e3f514d2..8e07f024ce 100644 --- a/src/declarative/qml/qdeclarativetypenamescriptclass_p.h +++ b/src/declarative/qml/qdeclarativetypenamescriptclass_p.h @@ -52,7 +52,7 @@ // // We mean it. // -#include "qdeclarativeengine_p.h" +#include "private/qdeclarativeengine_p.h" #include <QtScript/qscriptclass.h> diff --git a/src/declarative/qml/qdeclarativevaluetype.cpp b/src/declarative/qml/qdeclarativevaluetype.cpp index 00e670427b..839e0dd8ab 100644 --- a/src/declarative/qml/qdeclarativevaluetype.cpp +++ b/src/declarative/qml/qdeclarativevaluetype.cpp @@ -39,9 +39,9 @@ ** ****************************************************************************/ -#include "qdeclarativevaluetype_p.h" +#include "private/qdeclarativevaluetype_p.h" -#include "qdeclarativemetatype_p.h" +#include "private/qdeclarativemetatype_p.h" #include <QtCore/qdebug.h> diff --git a/src/declarative/qml/qdeclarativevaluetype_p.h b/src/declarative/qml/qdeclarativevaluetype_p.h index ad2f6c4200..1fe8bd2eb5 100644 --- a/src/declarative/qml/qdeclarativevaluetype_p.h +++ b/src/declarative/qml/qdeclarativevaluetype_p.h @@ -54,7 +54,7 @@ // #include "qdeclarativeproperty.h" -#include "qdeclarativeproperty_p.h" +#include "private/qdeclarativeproperty_p.h" #include <QtCore/qobject.h> #include <QtCore/qrect.h> diff --git a/src/declarative/qml/qdeclarativevaluetypescriptclass.cpp b/src/declarative/qml/qdeclarativevaluetypescriptclass.cpp index a567c38f7a..f7902b98f2 100644 --- a/src/declarative/qml/qdeclarativevaluetypescriptclass.cpp +++ b/src/declarative/qml/qdeclarativevaluetypescriptclass.cpp @@ -39,12 +39,12 @@ ** ****************************************************************************/ -#include "qdeclarativevaluetypescriptclass_p.h" +#include "private/qdeclarativevaluetypescriptclass_p.h" -#include "qdeclarativebinding_p.h" -#include "qdeclarativeproperty_p.h" -#include "qdeclarativeengine_p.h" -#include "qdeclarativeguard_p.h" +#include "private/qdeclarativebinding_p.h" +#include "private/qdeclarativeproperty_p.h" +#include "private/qdeclarativeengine_p.h" +#include "private/qdeclarativeguard_p.h" QT_BEGIN_NAMESPACE diff --git a/src/declarative/qml/qdeclarativevme.cpp b/src/declarative/qml/qdeclarativevme.cpp index 2338bc35a5..5ba7f9b121 100644 --- a/src/declarative/qml/qdeclarativevme.cpp +++ b/src/declarative/qml/qdeclarativevme.cpp @@ -39,26 +39,26 @@ ** ****************************************************************************/ -#include "qdeclarativevme_p.h" +#include "private/qdeclarativevme_p.h" -#include "qdeclarativecompiler_p.h" -#include "qdeclarativeboundsignal_p.h" -#include "qdeclarativestringconverters_p.h" -#include "qmetaobjectbuilder_p.h" -#include "qdeclarativedeclarativedata_p.h" +#include "private/qdeclarativecompiler_p.h" +#include "private/qdeclarativeboundsignal_p.h" +#include "private/qdeclarativestringconverters_p.h" +#include "private/qmetaobjectbuilder_p.h" +#include "private/qdeclarativedeclarativedata_p.h" #include "qdeclarative.h" -#include "qdeclarativecustomparser_p.h" +#include "private/qdeclarativecustomparser_p.h" #include "qdeclarativeengine.h" #include "qdeclarativecontext.h" #include "qdeclarativecomponent.h" -#include "qdeclarativebinding_p.h" -#include "qdeclarativeengine_p.h" -#include "qdeclarativecomponent_p.h" -#include "qdeclarativevmemetaobject_p.h" -#include "qdeclarativebinding_p_p.h" -#include "qdeclarativecontext_p.h" -#include "qdeclarativecompiledbindings_p.h" -#include "qdeclarativeglobal_p.h" +#include "private/qdeclarativebinding_p.h" +#include "private/qdeclarativeengine_p.h" +#include "private/qdeclarativecomponent_p.h" +#include "private/qdeclarativevmemetaobject_p.h" +#include "private/qdeclarativebinding_p_p.h" +#include "private/qdeclarativecontext_p.h" +#include "private/qdeclarativecompiledbindings_p.h" +#include "private/qdeclarativeglobal_p.h" #include "qdeclarativescriptstring.h" #include <QStack> diff --git a/src/declarative/qml/qdeclarativevme_p.h b/src/declarative/qml/qdeclarativevme_p.h index 1c6fd3c50a..87a1aabec5 100644 --- a/src/declarative/qml/qdeclarativevme_p.h +++ b/src/declarative/qml/qdeclarativevme_p.h @@ -54,7 +54,7 @@ // #include "qdeclarativeerror.h" -#include "qbitfield_p.h" +#include "private/qbitfield_p.h" #include <QtCore/QString> #include <QtCore/QStack> diff --git a/src/declarative/qml/qdeclarativevmemetaobject.cpp b/src/declarative/qml/qdeclarativevmemetaobject.cpp index 9a7bdd6058..2644ecfe27 100644 --- a/src/declarative/qml/qdeclarativevmemetaobject.cpp +++ b/src/declarative/qml/qdeclarativevmemetaobject.cpp @@ -39,13 +39,13 @@ ** ****************************************************************************/ -#include "qdeclarativevmemetaobject_p.h" +#include "private/qdeclarativevmemetaobject_p.h" #include "qdeclarative.h" -#include "qdeclarativerefcount_p.h" +#include "private/qdeclarativerefcount_p.h" #include "qdeclarativeexpression.h" -#include "qdeclarativeexpression_p.h" -#include "qdeclarativecontext_p.h" +#include "private/qdeclarativeexpression_p.h" +#include "private/qdeclarativecontext_p.h" Q_DECLARE_METATYPE(QScriptValue); diff --git a/src/declarative/qml/qdeclarativevmemetaobject_p.h b/src/declarative/qml/qdeclarativevmemetaobject_p.h index 839f0cdba4..f13dd3466e 100644 --- a/src/declarative/qml/qdeclarativevmemetaobject_p.h +++ b/src/declarative/qml/qdeclarativevmemetaobject_p.h @@ -65,9 +65,9 @@ #include <private/qobject_p.h> -#include "qdeclarativeguard_p.h" -#include "qdeclarativecompiler_p.h" -#include "qdeclarativecontext_p.h" +#include "private/qdeclarativeguard_p.h" +#include "private/qdeclarativecompiler_p.h" +#include "private/qdeclarativecontext_p.h" QT_BEGIN_NAMESPACE diff --git a/src/declarative/qml/qdeclarativewatcher.cpp b/src/declarative/qml/qdeclarativewatcher.cpp index 2f611956f7..9ea84b8549 100644 --- a/src/declarative/qml/qdeclarativewatcher.cpp +++ b/src/declarative/qml/qdeclarativewatcher.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include "qdeclarativewatcher_p.h" +#include "private/qdeclarativewatcher_p.h" #include "qdeclarativeexpression.h" #include "qdeclarativecontext.h" diff --git a/src/declarative/qml/qdeclarativeworkerscript.cpp b/src/declarative/qml/qdeclarativeworkerscript.cpp index 628681f5ab..ddb0ece98d 100644 --- a/src/declarative/qml/qdeclarativeworkerscript.cpp +++ b/src/declarative/qml/qdeclarativeworkerscript.cpp @@ -39,10 +39,10 @@ ** ****************************************************************************/ -#include "qdeclarativeworkerscript_p.h" -#include "qdeclarativelistmodel_p.h" -#include "qdeclarativelistmodelworkeragent_p.h" -#include "qdeclarativeengine_p.h" +#include "private/qdeclarativeworkerscript_p.h" +#include "private/qdeclarativelistmodel_p.h" +#include "private/qdeclarativelistmodelworkeragent_p.h" +#include "private/qdeclarativeengine_p.h" #include <QtCore/qcoreevent.h> #include <QtCore/qcoreapplication.h> diff --git a/src/declarative/qml/qdeclarativexmlhttprequest.cpp b/src/declarative/qml/qdeclarativexmlhttprequest.cpp index 58e67fa5f8..be2a1a70f8 100644 --- a/src/declarative/qml/qdeclarativexmlhttprequest.cpp +++ b/src/declarative/qml/qdeclarativexmlhttprequest.cpp @@ -39,13 +39,13 @@ ** ****************************************************************************/ -#include "qdeclarativexmlhttprequest_p.h" +#include "private/qdeclarativexmlhttprequest_p.h" #include "qdeclarativeengine.h" -#include "qdeclarativeengine_p.h" -#include "qdeclarativerefcount_p.h" -#include "qdeclarativeengine_p.h" -#include "qdeclarativeexpression_p.h" +#include "private/qdeclarativeengine_p.h" +#include "private/qdeclarativerefcount_p.h" +#include "private/qdeclarativeengine_p.h" +#include "private/qdeclarativeexpression_p.h" #include <QtCore/qobject.h> #include <QtScript/qscriptvalue.h> diff --git a/src/declarative/qml/qmetaobjectbuilder.cpp b/src/declarative/qml/qmetaobjectbuilder.cpp index a518b0335c..6e4d7b8218 100644 --- a/src/declarative/qml/qmetaobjectbuilder.cpp +++ b/src/declarative/qml/qmetaobjectbuilder.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include "qmetaobjectbuilder_p.h" +#include "private/qmetaobjectbuilder_p.h" #ifndef Q_OS_WIN #include <stdint.h> diff --git a/src/declarative/qml/rewriter/rewriter.cpp b/src/declarative/qml/rewriter/rewriter.cpp index b458a8d361..6d2ccfb08d 100644 --- a/src/declarative/qml/rewriter/rewriter.cpp +++ b/src/declarative/qml/rewriter/rewriter.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include "rewriter_p.h" +#include "private/rewriter_p.h" #include <qdeclarativejsast_p.h> diff --git a/src/declarative/qml/rewriter/rewriter_p.h b/src/declarative/qml/rewriter/rewriter_p.h index d1445d80ac..4799469931 100644 --- a/src/declarative/qml/rewriter/rewriter_p.h +++ b/src/declarative/qml/rewriter/rewriter_p.h @@ -42,7 +42,7 @@ #ifndef REWRITER_H #define REWRITER_H -#include "textwriter_p.h" +#include "private/textwriter_p.h" #include <qdeclarativejsastvisitor_p.h> diff --git a/src/declarative/qml/rewriter/textwriter.cpp b/src/declarative/qml/rewriter/textwriter.cpp index e63d24c619..619f5c9bd7 100644 --- a/src/declarative/qml/rewriter/textwriter.cpp +++ b/src/declarative/qml/rewriter/textwriter.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include "textwriter_p.h" +#include "private/textwriter_p.h" QT_QML_BEGIN_NAMESPACE diff --git a/src/declarative/util/qdeclarativeanimation.cpp b/src/declarative/util/qdeclarativeanimation.cpp index ba1444e6ae..33ddb4623d 100644 --- a/src/declarative/util/qdeclarativeanimation.cpp +++ b/src/declarative/util/qdeclarativeanimation.cpp @@ -39,11 +39,11 @@ ** ****************************************************************************/ -#include "qdeclarativeanimation_p.h" -#include "qdeclarativeanimation_p_p.h" +#include "private/qdeclarativeanimation_p.h" +#include "private/qdeclarativeanimation_p_p.h" -#include "qdeclarativebehavior_p.h" -#include "qdeclarativestateoperations_p.h" +#include "private/qdeclarativebehavior_p.h" +#include "private/qdeclarativestateoperations_p.h" #include <qdeclarativepropertyvaluesource.h> #include <qdeclarative.h> diff --git a/src/declarative/util/qdeclarativeanimation_p.h b/src/declarative/util/qdeclarativeanimation_p.h index f62078678f..c839c2c3de 100644 --- a/src/declarative/util/qdeclarativeanimation_p.h +++ b/src/declarative/util/qdeclarativeanimation_p.h @@ -42,8 +42,8 @@ #ifndef QDECLARATIVEANIMATION_H #define QDECLARATIVEANIMATION_H -#include "qdeclarativetransition_p.h" -#include "qdeclarativestate_p.h" +#include "private/qdeclarativetransition_p.h" +#include "private/qdeclarativestate_p.h" #include <QtGui/qvector3d.h> #include <qdeclarativepropertyvaluesource.h> diff --git a/src/declarative/util/qdeclarativeanimation_p_p.h b/src/declarative/util/qdeclarativeanimation_p_p.h index 8bcbeff827..3b0f52e3fa 100644 --- a/src/declarative/util/qdeclarativeanimation_p_p.h +++ b/src/declarative/util/qdeclarativeanimation_p_p.h @@ -53,10 +53,10 @@ // We mean it. // -#include "qdeclarativeanimation_p.h" +#include "private/qdeclarativeanimation_p.h" -#include "qdeclarativenullablevalue_p_p.h" -#include "qdeclarativetimeline_p_p.h" +#include "private/qdeclarativenullablevalue_p_p.h" +#include "private/qdeclarativetimeline_p_p.h" #include <qdeclarative.h> #include <qdeclarativeitem.h> diff --git a/src/declarative/util/qdeclarativebehavior.cpp b/src/declarative/util/qdeclarativebehavior.cpp index 87d68369cc..a6c578e9dd 100644 --- a/src/declarative/util/qdeclarativebehavior.cpp +++ b/src/declarative/util/qdeclarativebehavior.cpp @@ -39,10 +39,10 @@ ** ****************************************************************************/ -#include "qdeclarativebehavior_p.h" +#include "private/qdeclarativebehavior_p.h" -#include "qdeclarativeanimation_p.h" -#include "qdeclarativetransition_p.h" +#include "private/qdeclarativeanimation_p.h" +#include "private/qdeclarativetransition_p.h" #include <qdeclarativecontext.h> #include <qdeclarativeinfo.h> diff --git a/src/declarative/util/qdeclarativebehavior_p.h b/src/declarative/util/qdeclarativebehavior_p.h index ff5821028e..e8a809faae 100644 --- a/src/declarative/util/qdeclarativebehavior_p.h +++ b/src/declarative/util/qdeclarativebehavior_p.h @@ -42,7 +42,7 @@ #ifndef QDECLARATIVEBEHAVIOR_H #define QDECLARATIVEBEHAVIOR_H -#include "qdeclarativestate_p.h" +#include "private/qdeclarativestate_p.h" #include <qdeclarativepropertyvaluesource.h> #include <qdeclarativepropertyvalueinterceptor.h> diff --git a/src/declarative/util/qdeclarativebind.cpp b/src/declarative/util/qdeclarativebind.cpp index 26baa3858a..b7bd4e8aab 100644 --- a/src/declarative/util/qdeclarativebind.cpp +++ b/src/declarative/util/qdeclarativebind.cpp @@ -39,9 +39,9 @@ ** ****************************************************************************/ -#include "qdeclarativebind_p.h" +#include "private/qdeclarativebind_p.h" -#include "qdeclarativenullablevalue_p_p.h" +#include "private/qdeclarativenullablevalue_p_p.h" #include <qdeclarativeengine.h> #include <qdeclarativecontext.h> diff --git a/src/declarative/util/qdeclarativeconnections.cpp b/src/declarative/util/qdeclarativeconnections.cpp index 0b9e3aba7f..596b30691d 100644 --- a/src/declarative/util/qdeclarativeconnections.cpp +++ b/src/declarative/util/qdeclarativeconnections.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include "qdeclarativeconnections_p.h" +#include "private/qdeclarativeconnections_p.h" #include <qdeclarativeexpression.h> #include <qdeclarativeproperty_p.h> diff --git a/src/declarative/util/qdeclarativefontloader.cpp b/src/declarative/util/qdeclarativefontloader.cpp index bf98d40b3a..b577b8196f 100644 --- a/src/declarative/util/qdeclarativefontloader.cpp +++ b/src/declarative/util/qdeclarativefontloader.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include "qdeclarativefontloader_p.h" +#include "private/qdeclarativefontloader_p.h" #include <qdeclarativecontext.h> #include <qdeclarativeengine.h> diff --git a/src/declarative/util/qdeclarativelistaccessor.cpp b/src/declarative/util/qdeclarativelistaccessor.cpp index 4e569093bd..4ac587f0c3 100644 --- a/src/declarative/util/qdeclarativelistaccessor.cpp +++ b/src/declarative/util/qdeclarativelistaccessor.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include "qdeclarativelistaccessor_p.h" +#include "private/qdeclarativelistaccessor_p.h" #include <qdeclarativemetatype_p.h> diff --git a/src/declarative/util/qdeclarativelistmodel.cpp b/src/declarative/util/qdeclarativelistmodel.cpp index 13662c5276..ec23bb2fc7 100644 --- a/src/declarative/util/qdeclarativelistmodel.cpp +++ b/src/declarative/util/qdeclarativelistmodel.cpp @@ -39,9 +39,9 @@ ** ****************************************************************************/ -#include "qdeclarativelistmodel_p_p.h" -#include "qdeclarativelistmodelworkeragent_p.h" -#include "qdeclarativeopenmetaobject_p.h" +#include "private/qdeclarativelistmodel_p_p.h" +#include "private/qdeclarativelistmodelworkeragent_p.h" +#include "private/qdeclarativeopenmetaobject_p.h" #include <qdeclarativecustomparser_p.h> #include <qdeclarativeparser_p.h> diff --git a/src/declarative/util/qdeclarativelistmodel_p_p.h b/src/declarative/util/qdeclarativelistmodel_p_p.h index 8041561aee..532eefa40e 100644 --- a/src/declarative/util/qdeclarativelistmodel_p_p.h +++ b/src/declarative/util/qdeclarativelistmodel_p_p.h @@ -53,10 +53,10 @@ // We mean it. // -#include "qdeclarativelistmodel_p.h" +#include "private/qdeclarativelistmodel_p.h" #include "qdeclarative.h" -#include "qdeclarativeengine_p.h" +#include "private/qdeclarativeengine_p.h" QT_BEGIN_HEADER diff --git a/src/declarative/util/qdeclarativelistmodelworkeragent.cpp b/src/declarative/util/qdeclarativelistmodelworkeragent.cpp index 0e38632bf4..3c0a0864d5 100644 --- a/src/declarative/util/qdeclarativelistmodelworkeragent.cpp +++ b/src/declarative/util/qdeclarativelistmodelworkeragent.cpp @@ -39,10 +39,10 @@ ** ****************************************************************************/ -#include "qdeclarativelistmodelworkeragent_p.h" -#include "qdeclarativelistmodel_p_p.h" -#include "qdeclarativedeclarativedata_p.h" -#include "qdeclarativeengine_p.h" +#include "private/qdeclarativelistmodelworkeragent_p.h" +#include "private/qdeclarativelistmodel_p_p.h" +#include "private/qdeclarativedeclarativedata_p.h" +#include "private/qdeclarativeengine_p.h" #include "qdeclarativeinfo.h" #include <QtCore/qcoreevent.h> diff --git a/src/declarative/util/qdeclarativeopenmetaobject.cpp b/src/declarative/util/qdeclarativeopenmetaobject.cpp index 6611885ce6..3d951257f1 100644 --- a/src/declarative/util/qdeclarativeopenmetaobject.cpp +++ b/src/declarative/util/qdeclarativeopenmetaobject.cpp @@ -39,9 +39,9 @@ ** ****************************************************************************/ -#include "qdeclarativeopenmetaobject_p.h" -#include "qdeclarativepropertycache_p.h" -#include "qdeclarativedeclarativedata_p.h" +#include "private/qdeclarativeopenmetaobject_p.h" +#include "private/qdeclarativepropertycache_p.h" +#include "private/qdeclarativedeclarativedata_p.h" #include <qmetaobjectbuilder_p.h> #include <qdebug.h> diff --git a/src/declarative/util/qdeclarativepackage.cpp b/src/declarative/util/qdeclarativepackage.cpp index d144777a97..ac0788f71f 100644 --- a/src/declarative/util/qdeclarativepackage.cpp +++ b/src/declarative/util/qdeclarativepackage.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include "qdeclarativepackage_p.h" +#include "private/qdeclarativepackage_p.h" #include <private/qobject_p.h> #include <private/qdeclarativeguard_p.h> diff --git a/src/declarative/util/qdeclarativepixmapcache.cpp b/src/declarative/util/qdeclarativepixmapcache.cpp index 1da929e29b..e57d3c2882 100644 --- a/src/declarative/util/qdeclarativepixmapcache.cpp +++ b/src/declarative/util/qdeclarativepixmapcache.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include "qdeclarativepixmapcache_p.h" +#include "private/qdeclarativepixmapcache_p.h" #include "qdeclarativenetworkaccessmanagerfactory.h" #include "qdeclarativeimageprovider.h" diff --git a/src/declarative/util/qdeclarativepropertychanges.cpp b/src/declarative/util/qdeclarativepropertychanges.cpp index 6ceec5db95..e7228cca93 100644 --- a/src/declarative/util/qdeclarativepropertychanges.cpp +++ b/src/declarative/util/qdeclarativepropertychanges.cpp @@ -39,9 +39,9 @@ ** ****************************************************************************/ -#include "qdeclarativepropertychanges_p.h" +#include "private/qdeclarativepropertychanges_p.h" -#include "qdeclarativeopenmetaobject_p.h" +#include "private/qdeclarativeopenmetaobject_p.h" #include <qdeclarativeinfo.h> #include <qdeclarativecustomparser_p.h> diff --git a/src/declarative/util/qdeclarativepropertychanges_p.h b/src/declarative/util/qdeclarativepropertychanges_p.h index 1274b0ca68..c2ed46695d 100644 --- a/src/declarative/util/qdeclarativepropertychanges_p.h +++ b/src/declarative/util/qdeclarativepropertychanges_p.h @@ -42,7 +42,7 @@ #ifndef QDECLARATIVEPROPERTYCHANGES_H #define QDECLARATIVEPROPERTYCHANGES_H -#include "qdeclarativestateoperations_p.h" +#include "private/qdeclarativestateoperations_p.h" #include <private/qdeclarativecustomparser_p.h> QT_BEGIN_HEADER diff --git a/src/declarative/util/qdeclarativepropertymap.cpp b/src/declarative/util/qdeclarativepropertymap.cpp index 0bdd91b403..0e477b1cc1 100644 --- a/src/declarative/util/qdeclarativepropertymap.cpp +++ b/src/declarative/util/qdeclarativepropertymap.cpp @@ -42,7 +42,7 @@ #include "qdeclarativepropertymap.h" #include <private/qmetaobjectbuilder_p.h> -#include "qdeclarativeopenmetaobject_p.h" +#include "private/qdeclarativeopenmetaobject_p.h" #include <QDebug> diff --git a/src/declarative/util/qdeclarativesmoothedanimation.cpp b/src/declarative/util/qdeclarativesmoothedanimation.cpp index b3a9b9ae27..34116426ae 100644 --- a/src/declarative/util/qdeclarativesmoothedanimation.cpp +++ b/src/declarative/util/qdeclarativesmoothedanimation.cpp @@ -39,15 +39,15 @@ ** ****************************************************************************/ -#include "qdeclarativesmoothedanimation_p.h" -#include "qdeclarativesmoothedanimation_p_p.h" +#include "private/qdeclarativesmoothedanimation_p.h" +#include "private/qdeclarativesmoothedanimation_p_p.h" -#include "qdeclarativeanimation_p_p.h" +#include "private/qdeclarativeanimation_p_p.h" #include <qdeclarativeproperty.h> -#include "qdeclarativeproperty_p.h" +#include "private/qdeclarativeproperty_p.h" -#include "qdeclarativeglobal_p.h" +#include "private/qdeclarativeglobal_p.h" #include <QtCore/qdebug.h> diff --git a/src/declarative/util/qdeclarativesmoothedanimation_p.h b/src/declarative/util/qdeclarativesmoothedanimation_p.h index 50ed00c50e..df53104f8f 100644 --- a/src/declarative/util/qdeclarativesmoothedanimation_p.h +++ b/src/declarative/util/qdeclarativesmoothedanimation_p.h @@ -43,7 +43,7 @@ #define QDECLARATIVESMOOTHEDANIMATION_H #include <qdeclarative.h> -#include "qdeclarativeanimation_p.h" +#include "private/qdeclarativeanimation_p.h" #include <QtCore/qobject.h> diff --git a/src/declarative/util/qdeclarativesmoothedanimation_p_p.h b/src/declarative/util/qdeclarativesmoothedanimation_p_p.h index bdceeb3837..81cd22938c 100644 --- a/src/declarative/util/qdeclarativesmoothedanimation_p_p.h +++ b/src/declarative/util/qdeclarativesmoothedanimation_p_p.h @@ -53,10 +53,10 @@ // We mean it. // -#include "qdeclarativesmoothedanimation_p.h" -#include "qdeclarativeanimation_p.h" +#include "private/qdeclarativesmoothedanimation_p.h" +#include "private/qdeclarativeanimation_p.h" -#include "qdeclarativeanimation_p_p.h" +#include "private/qdeclarativeanimation_p_p.h" #include <qparallelanimationgroup.h> diff --git a/src/declarative/util/qdeclarativespringfollow.cpp b/src/declarative/util/qdeclarativespringfollow.cpp index 063c3df4f8..c42261da1c 100644 --- a/src/declarative/util/qdeclarativespringfollow.cpp +++ b/src/declarative/util/qdeclarativespringfollow.cpp @@ -39,9 +39,9 @@ ** ****************************************************************************/ -#include "qdeclarativespringfollow_p.h" +#include "private/qdeclarativespringfollow_p.h" -#include "qdeclarativeanimation_p_p.h" +#include "private/qdeclarativeanimation_p_p.h" #include <QtCore/qdebug.h> diff --git a/src/declarative/util/qdeclarativestate.cpp b/src/declarative/util/qdeclarativestate.cpp index 802ff1ca31..5e6c35e781 100644 --- a/src/declarative/util/qdeclarativestate.cpp +++ b/src/declarative/util/qdeclarativestate.cpp @@ -39,14 +39,14 @@ ** ****************************************************************************/ -#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/qdeclarativestate_p_p.h" +#include "private/qdeclarativestate_p.h" + +#include "private/qdeclarativetransition_p.h" +#include "private/qdeclarativestategroup_p.h" +#include "private/qdeclarativestateoperations_p.h" +#include "private/qdeclarativeanimation_p.h" +#include "private/qdeclarativeanimation_p_p.h" #include <qdeclarativebinding_p.h> #include <qdeclarativeglobal_p.h> diff --git a/src/declarative/util/qdeclarativestate_p_p.h b/src/declarative/util/qdeclarativestate_p_p.h index 558c99b492..4a2af0f803 100644 --- a/src/declarative/util/qdeclarativestate_p_p.h +++ b/src/declarative/util/qdeclarativestate_p_p.h @@ -53,10 +53,10 @@ // We mean it. // -#include "qdeclarativestate_p.h" +#include "private/qdeclarativestate_p.h" -#include "qdeclarativeanimation_p_p.h" -#include "qdeclarativetransitionmanager_p_p.h" +#include "private/qdeclarativeanimation_p_p.h" +#include "private/qdeclarativetransitionmanager_p_p.h" #include <private/qdeclarativeproperty_p.h> #include <private/qdeclarativeguard_p.h> diff --git a/src/declarative/util/qdeclarativestategroup.cpp b/src/declarative/util/qdeclarativestategroup.cpp index 258a9e91a3..ff78c60a0a 100644 --- a/src/declarative/util/qdeclarativestategroup.cpp +++ b/src/declarative/util/qdeclarativestategroup.cpp @@ -39,10 +39,10 @@ ** ****************************************************************************/ -#include "qdeclarativestategroup_p.h" +#include "private/qdeclarativestategroup_p.h" -#include "qdeclarativetransition_p.h" -#include "qdeclarativestate_p_p.h" +#include "private/qdeclarativetransition_p.h" +#include "private/qdeclarativestate_p_p.h" #include <qdeclarativebinding_p.h> #include <qdeclarativeglobal_p.h> diff --git a/src/declarative/util/qdeclarativestategroup_p.h b/src/declarative/util/qdeclarativestategroup_p.h index 9650199f8c..cac23f49a4 100644 --- a/src/declarative/util/qdeclarativestategroup_p.h +++ b/src/declarative/util/qdeclarativestategroup_p.h @@ -42,7 +42,7 @@ #ifndef QDECLARATIVESTATEGROUP_H #define QDECLARATIVESTATEGROUP_H -#include "qdeclarativestate_p.h" +#include "private/qdeclarativestate_p.h" QT_BEGIN_HEADER diff --git a/src/declarative/util/qdeclarativestateoperations.cpp b/src/declarative/util/qdeclarativestateoperations.cpp index 346913645b..2cc1fccc02 100644 --- a/src/declarative/util/qdeclarativestateoperations.cpp +++ b/src/declarative/util/qdeclarativestateoperations.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include "qdeclarativestateoperations_p.h" +#include "private/qdeclarativestateoperations_p.h" #include <qdeclarative.h> #include <qdeclarativecontext.h> diff --git a/src/declarative/util/qdeclarativestateoperations_p.h b/src/declarative/util/qdeclarativestateoperations_p.h index c97b2da607..d49ec63a19 100644 --- a/src/declarative/util/qdeclarativestateoperations_p.h +++ b/src/declarative/util/qdeclarativestateoperations_p.h @@ -42,7 +42,7 @@ #ifndef QDECLARATIVESTATEOPERATIONS_H #define QDECLARATIVESTATEOPERATIONS_H -#include "qdeclarativestate_p.h" +#include "private/qdeclarativestate_p.h" #include <qdeclarativeitem.h> #include <private/qdeclarativeanchors_p.h> diff --git a/src/declarative/util/qdeclarativestyledtext.cpp b/src/declarative/util/qdeclarativestyledtext.cpp index 461de1248e..babd71b799 100644 --- a/src/declarative/util/qdeclarativestyledtext.cpp +++ b/src/declarative/util/qdeclarativestyledtext.cpp @@ -45,7 +45,7 @@ #include <QTextLayout> #include <QDebug> #include <qmath.h> -#include "qdeclarativestyledtext_p.h" +#include "private/qdeclarativestyledtext_p.h" /* QDeclarativeStyledText supports few tags: diff --git a/src/declarative/util/qdeclarativesystempalette.cpp b/src/declarative/util/qdeclarativesystempalette.cpp index d819c27d6b..9bb3f69c7d 100644 --- a/src/declarative/util/qdeclarativesystempalette.cpp +++ b/src/declarative/util/qdeclarativesystempalette.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include "qdeclarativesystempalette_p.h" +#include "private/qdeclarativesystempalette_p.h" #include <QApplication> diff --git a/src/declarative/util/qdeclarativetimeline.cpp b/src/declarative/util/qdeclarativetimeline.cpp index 8e133b6f86..656c62b895 100644 --- a/src/declarative/util/qdeclarativetimeline.cpp +++ b/src/declarative/util/qdeclarativetimeline.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include "qdeclarativetimeline_p_p.h" +#include "private/qdeclarativetimeline_p_p.h" #include <QDebug> #include <QMutex> diff --git a/src/declarative/util/qdeclarativetimer.cpp b/src/declarative/util/qdeclarativetimer.cpp index 104e3aeebb..76e6d5e388 100644 --- a/src/declarative/util/qdeclarativetimer.cpp +++ b/src/declarative/util/qdeclarativetimer.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include "qdeclarativetimer_p.h" +#include "private/qdeclarativetimer_p.h" #include <QtCore/qcoreapplication.h> #include <QtCore/qpauseanimation.h> diff --git a/src/declarative/util/qdeclarativetransition.cpp b/src/declarative/util/qdeclarativetransition.cpp index 1e8be7fcd0..815dc4c7b7 100644 --- a/src/declarative/util/qdeclarativetransition.cpp +++ b/src/declarative/util/qdeclarativetransition.cpp @@ -39,13 +39,13 @@ ** ****************************************************************************/ -#include "qdeclarativestate_p.h" -#include "qdeclarativestategroup_p.h" -#include "qdeclarativestate_p_p.h" -#include "qdeclarativestateoperations_p.h" -#include "qdeclarativeanimation_p.h" -#include "qdeclarativeanimation_p_p.h" -#include "qdeclarativetransitionmanager_p_p.h" +#include "private/qdeclarativestate_p.h" +#include "private/qdeclarativestategroup_p.h" +#include "private/qdeclarativestate_p_p.h" +#include "private/qdeclarativestateoperations_p.h" +#include "private/qdeclarativeanimation_p.h" +#include "private/qdeclarativeanimation_p_p.h" +#include "private/qdeclarativetransitionmanager_p_p.h" #include <QParallelAnimationGroup> diff --git a/src/declarative/util/qdeclarativetransition_p.h b/src/declarative/util/qdeclarativetransition_p.h index 2f9e7b5f4f..fc7a5772b1 100644 --- a/src/declarative/util/qdeclarativetransition_p.h +++ b/src/declarative/util/qdeclarativetransition_p.h @@ -42,7 +42,7 @@ #ifndef QDECLARATIVETRANSITION_H #define QDECLARATIVETRANSITION_H -#include "qdeclarativestate_p.h" +#include "private/qdeclarativestate_p.h" #include <qdeclarative.h> diff --git a/src/declarative/util/qdeclarativetransitionmanager.cpp b/src/declarative/util/qdeclarativetransitionmanager.cpp index f07fb23b0e..bc40377a7e 100644 --- a/src/declarative/util/qdeclarativetransitionmanager.cpp +++ b/src/declarative/util/qdeclarativetransitionmanager.cpp @@ -39,9 +39,9 @@ ** ****************************************************************************/ -#include "qdeclarativetransitionmanager_p_p.h" +#include "private/qdeclarativetransitionmanager_p_p.h" -#include "qdeclarativestate_p_p.h" +#include "private/qdeclarativestate_p_p.h" #include <qdeclarativebinding_p.h> #include <qdeclarativeglobal_p.h> diff --git a/src/declarative/util/qdeclarativetransitionmanager_p_p.h b/src/declarative/util/qdeclarativetransitionmanager_p_p.h index d6e626e6f6..41313919fe 100644 --- a/src/declarative/util/qdeclarativetransitionmanager_p_p.h +++ b/src/declarative/util/qdeclarativetransitionmanager_p_p.h @@ -53,7 +53,7 @@ // We mean it. // -#include "qdeclarativestateoperations_p.h" +#include "private/qdeclarativestateoperations_p.h" QT_BEGIN_NAMESPACE diff --git a/src/declarative/util/qdeclarativeutilmodule.cpp b/src/declarative/util/qdeclarativeutilmodule.cpp index 7f2f64a774..d4c72bd266 100644 --- a/src/declarative/util/qdeclarativeutilmodule.cpp +++ b/src/declarative/util/qdeclarativeutilmodule.cpp @@ -39,36 +39,36 @@ ** ****************************************************************************/ -#include "qdeclarativeutilmodule_p.h" -#include "qdeclarativeanimation_p.h" -#include "qdeclarativeanimation_p_p.h" -#include "qdeclarativebehavior_p.h" -#include "qdeclarativebind_p.h" -#include "qdeclarativeconnections_p.h" -#include "qdeclarativesmoothedanimation_p.h" -#include "qdeclarativefontloader_p.h" -#include "qdeclarativelistaccessor_p.h" -#include "qdeclarativelistmodel_p.h" -#include "qdeclarativenullablevalue_p_p.h" -#include "qdeclarativeopenmetaobject_p.h" -#include "qdeclarativepackage_p.h" -#include "qdeclarativepixmapcache_p.h" -#include "qdeclarativepropertychanges_p.h" +#include "private/qdeclarativeutilmodule_p.h" +#include "private/qdeclarativeanimation_p.h" +#include "private/qdeclarativeanimation_p_p.h" +#include "private/qdeclarativebehavior_p.h" +#include "private/qdeclarativebind_p.h" +#include "private/qdeclarativeconnections_p.h" +#include "private/qdeclarativesmoothedanimation_p.h" +#include "private/qdeclarativefontloader_p.h" +#include "private/qdeclarativelistaccessor_p.h" +#include "private/qdeclarativelistmodel_p.h" +#include "private/qdeclarativenullablevalue_p_p.h" +#include "private/qdeclarativeopenmetaobject_p.h" +#include "private/qdeclarativepackage_p.h" +#include "private/qdeclarativepixmapcache_p.h" +#include "private/qdeclarativepropertychanges_p.h" #include "qdeclarativepropertymap.h" -#include "qdeclarativespringfollow_p.h" -#include "qdeclarativestategroup_p.h" -#include "qdeclarativestateoperations_p.h" -#include "qdeclarativestate_p.h" -#include "qdeclarativestate_p_p.h" -#include "qdeclarativestyledtext_p.h" -#include "qdeclarativesystempalette_p.h" -#include "qdeclarativetimeline_p_p.h" -#include "qdeclarativetimer_p.h" -#include "qdeclarativetransitionmanager_p_p.h" -#include "qdeclarativetransition_p.h" +#include "private/qdeclarativespringfollow_p.h" +#include "private/qdeclarativestategroup_p.h" +#include "private/qdeclarativestateoperations_p.h" +#include "private/qdeclarativestate_p.h" +#include "private/qdeclarativestate_p_p.h" +#include "private/qdeclarativestyledtext_p.h" +#include "private/qdeclarativesystempalette_p.h" +#include "private/qdeclarativetimeline_p_p.h" +#include "private/qdeclarativetimer_p.h" +#include "private/qdeclarativetransitionmanager_p_p.h" +#include "private/qdeclarativetransition_p.h" #include "qdeclarativeview.h" #ifndef QT_NO_XMLPATTERNS -#include "qdeclarativexmllistmodel_p.h" +#include "private/qdeclarativexmllistmodel_p.h" #endif template<typename T> diff --git a/src/declarative/util/qdeclarativexmllistmodel.cpp b/src/declarative/util/qdeclarativexmllistmodel.cpp index efc614b617..b33af0694a 100644 --- a/src/declarative/util/qdeclarativexmllistmodel.cpp +++ b/src/declarative/util/qdeclarativexmllistmodel.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include "qdeclarativexmllistmodel_p.h" +#include "private/qdeclarativexmllistmodel_p.h" #include <qdeclarativecontext.h> #include <qdeclarativeengine.h> |