From 4a247ed5e37d3b4a17c965c725b81f6ef835c191 Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Fri, 2 Apr 2010 18:27:25 +0200 Subject: Update #include of private headers in QtDeclarative Always use private/. The WinSCW compiler doesn't search the current directory, for whatever reason. --- src/declarative/3rdparty/qlistmodelinterface.cpp | 2 +- src/declarative/debugger/qdeclarativedebug.cpp | 4 +- .../debugger/qdeclarativedebugclient.cpp | 4 +- .../debugger/qdeclarativedebuggerstatus.cpp | 2 +- .../debugger/qdeclarativedebugservice.cpp | 4 +- src/declarative/debugger/qpacketprotocol.cpp | 2 +- .../graphicsitems/qdeclarativeanchors.cpp | 4 +- .../graphicsitems/qdeclarativeanchors_p_p.h | 4 +- .../graphicsitems/qdeclarativeanimatedimage.cpp | 4 +- .../graphicsitems/qdeclarativeanimatedimage_p.h | 2 +- .../graphicsitems/qdeclarativeanimatedimage_p_p.h | 2 +- .../graphicsitems/qdeclarativeborderimage.cpp | 4 +- .../graphicsitems/qdeclarativeborderimage_p.h | 2 +- .../graphicsitems/qdeclarativeborderimage_p_p.h | 4 +- .../graphicsitems/qdeclarativeevents.cpp | 2 +- .../graphicsitems/qdeclarativeflickable.cpp | 4 +- .../graphicsitems/qdeclarativeflickable_p_p.h | 6 +- .../graphicsitems/qdeclarativeflipable.cpp | 6 +- .../graphicsitems/qdeclarativefocuspanel.cpp | 4 +- .../graphicsitems/qdeclarativefocusscope.cpp | 4 +- .../qdeclarativegraphicsobjectcontainer.cpp | 4 +- .../graphicsitems/qdeclarativegridview.cpp | 8 +-- .../graphicsitems/qdeclarativegridview_p.h | 2 +- .../graphicsitems/qdeclarativeimage.cpp | 4 +- .../graphicsitems/qdeclarativeimage_p.h | 2 +- .../graphicsitems/qdeclarativeimage_p_p.h | 4 +- .../graphicsitems/qdeclarativeimagebase.cpp | 4 +- .../graphicsitems/qdeclarativeimagebase_p_p.h | 2 +- src/declarative/graphicsitems/qdeclarativeitem.cpp | 4 +- .../graphicsitems/qdeclarativeitemsmodule.cpp | 66 +++++++++++----------- .../graphicsitems/qdeclarativelayoutitem.cpp | 2 +- .../graphicsitems/qdeclarativelistview.cpp | 8 +-- .../graphicsitems/qdeclarativelistview_p.h | 2 +- .../graphicsitems/qdeclarativeloader.cpp | 2 +- .../graphicsitems/qdeclarativeloader_p_p.h | 6 +- .../graphicsitems/qdeclarativemousearea.cpp | 6 +- .../graphicsitems/qdeclarativemousearea_p_p.h | 2 +- .../graphicsitems/qdeclarativepainteditem.cpp | 4 +- .../graphicsitems/qdeclarativepainteditem_p_p.h | 2 +- src/declarative/graphicsitems/qdeclarativepath.cpp | 4 +- .../graphicsitems/qdeclarativepath_p_p.h | 2 +- .../graphicsitems/qdeclarativepathview.cpp | 4 +- .../graphicsitems/qdeclarativepathview_p.h | 2 +- .../graphicsitems/qdeclarativepathview_p_p.h | 6 +- .../graphicsitems/qdeclarativepositioners.cpp | 4 +- .../graphicsitems/qdeclarativepositioners_p_p.h | 4 +- .../graphicsitems/qdeclarativerectangle.cpp | 4 +- .../graphicsitems/qdeclarativerectangle_p_p.h | 2 +- .../graphicsitems/qdeclarativerepeater.cpp | 6 +- .../graphicsitems/qdeclarativerepeater_p_p.h | 4 +- .../graphicsitems/qdeclarativescalegrid.cpp | 2 +- .../graphicsitems/qdeclarativescalegrid_p_p.h | 2 +- src/declarative/graphicsitems/qdeclarativetext.cpp | 4 +- .../graphicsitems/qdeclarativetext_p_p.h | 2 +- .../graphicsitems/qdeclarativetextedit.cpp | 6 +- .../graphicsitems/qdeclarativetextedit_p.h | 4 +- .../graphicsitems/qdeclarativetextedit_p_p.h | 2 +- .../graphicsitems/qdeclarativetextinput.cpp | 4 +- .../graphicsitems/qdeclarativetextinput_p.h | 4 +- .../graphicsitems/qdeclarativetextinput_p_p.h | 4 +- .../graphicsitems/qdeclarativetranslate.cpp | 2 +- .../graphicsitems/qdeclarativevisualitemmodel.cpp | 2 +- src/declarative/qml/parser/qdeclarativejs.g | 18 +++--- src/declarative/qml/parser/qdeclarativejsast.cpp | 4 +- src/declarative/qml/parser/qdeclarativejsast_p.h | 4 +- .../qml/parser/qdeclarativejsastfwd_p.h | 2 +- .../qml/parser/qdeclarativejsastvisitor.cpp | 2 +- .../qml/parser/qdeclarativejsastvisitor_p.h | 4 +- .../qml/parser/qdeclarativejsengine_p.cpp | 6 +- .../qml/parser/qdeclarativejsengine_p.h | 4 +- .../qml/parser/qdeclarativejsgrammar.cpp | 2 +- src/declarative/qml/parser/qdeclarativejslexer.cpp | 8 +-- src/declarative/qml/parser/qdeclarativejslexer_p.h | 2 +- .../qml/parser/qdeclarativejsmemorypool_p.h | 2 +- .../qml/parser/qdeclarativejsnodepool_p.h | 4 +- .../qml/parser/qdeclarativejsparser.cpp | 10 ++-- .../qml/parser/qdeclarativejsparser_p.h | 8 +-- src/declarative/qml/qdeclarativebinding.cpp | 10 ++-- src/declarative/qml/qdeclarativebinding_p.h | 2 +- src/declarative/qml/qdeclarativebinding_p_p.h | 4 +- src/declarative/qml/qdeclarativeboundsignal.cpp | 14 ++--- src/declarative/qml/qdeclarativeclassfactory.cpp | 2 +- src/declarative/qml/qdeclarativecleanup.cpp | 4 +- .../qml/qdeclarativecompiledbindings.cpp | 2 +- .../qml/qdeclarativecompiledbindings_p.h | 4 +- src/declarative/qml/qdeclarativecompileddata.cpp | 6 +- src/declarative/qml/qdeclarativecompiler.cpp | 40 ++++++------- src/declarative/qml/qdeclarativecompiler_p.h | 16 +++--- src/declarative/qml/qdeclarativecomponent.cpp | 20 +++---- src/declarative/qml/qdeclarativecomponent_p.h | 6 +- .../qml/qdeclarativecompositetypedata_p.h | 2 +- .../qml/qdeclarativecompositetypemanager.cpp | 12 ++-- .../qml/qdeclarativecompositetypemanager_p.h | 4 +- src/declarative/qml/qdeclarativecontext.cpp | 10 ++-- src/declarative/qml/qdeclarativecontext_p.h | 12 ++-- .../qml/qdeclarativecontextscriptclass.cpp | 12 ++-- .../qml/qdeclarativecontextscriptclass_p.h | 4 +- src/declarative/qml/qdeclarativecustomparser.cpp | 8 +-- src/declarative/qml/qdeclarativecustomparser_p.h | 4 +- src/declarative/qml/qdeclarativecustomparser_p_p.h | 4 +- .../qml/qdeclarativedeclarativedata_p.h | 2 +- src/declarative/qml/qdeclarativedirparser.cpp | 2 +- src/declarative/qml/qdeclarativedom.cpp | 16 +++--- src/declarative/qml/qdeclarativedom_p_p.h | 2 +- src/declarative/qml/qdeclarativeengine.cpp | 38 ++++++------- src/declarative/qml/qdeclarativeengine_p.h | 24 ++++---- src/declarative/qml/qdeclarativeenginedebug.cpp | 16 +++--- src/declarative/qml/qdeclarativeexpression.cpp | 12 ++-- src/declarative/qml/qdeclarativeexpression_p.h | 4 +- src/declarative/qml/qdeclarativefastproperties.cpp | 2 +- .../qml/qdeclarativeglobalscriptclass.cpp | 2 +- src/declarative/qml/qdeclarativeguard_p.h | 2 +- src/declarative/qml/qdeclarativeinfo.cpp | 6 +- src/declarative/qml/qdeclarativeinstruction.cpp | 4 +- src/declarative/qml/qdeclarativeintegercache.cpp | 6 +- src/declarative/qml/qdeclarativeintegercache_p.h | 4 +- src/declarative/qml/qdeclarativelist.cpp | 6 +- src/declarative/qml/qdeclarativelist.h | 2 +- src/declarative/qml/qdeclarativelist_p.h | 2 +- .../qml/qdeclarativelistscriptclass.cpp | 8 +-- src/declarative/qml/qdeclarativemetatype.cpp | 8 +-- src/declarative/qml/qdeclarativenotifier.cpp | 2 +- src/declarative/qml/qdeclarativenotifier_p.h | 2 +- .../qml/qdeclarativeobjectscriptclass.cpp | 20 +++---- .../qml/qdeclarativeobjectscriptclass_p.h | 4 +- src/declarative/qml/qdeclarativeparser.cpp | 12 ++-- src/declarative/qml/qdeclarativeparser_p.h | 2 +- src/declarative/qml/qdeclarativeproperty.cpp | 20 +++---- src/declarative/qml/qdeclarativeproperty_p.h | 4 +- src/declarative/qml/qdeclarativepropertycache.cpp | 6 +- src/declarative/qml/qdeclarativepropertycache_p.h | 6 +- .../qml/qdeclarativeproxymetaobject.cpp | 2 +- .../qml/qdeclarativeproxymetaobject_p.h | 2 +- src/declarative/qml/qdeclarativerefcount.cpp | 2 +- src/declarative/qml/qdeclarativerewrite.cpp | 4 +- src/declarative/qml/qdeclarativescriptparser.cpp | 6 +- src/declarative/qml/qdeclarativescriptparser_p.h | 2 +- src/declarative/qml/qdeclarativesqldatabase.cpp | 8 +-- .../qml/qdeclarativestringconverters.cpp | 2 +- src/declarative/qml/qdeclarativetypenamecache.cpp | 4 +- src/declarative/qml/qdeclarativetypenamecache_p.h | 4 +- .../qml/qdeclarativetypenamescriptclass.cpp | 6 +- .../qml/qdeclarativetypenamescriptclass_p.h | 2 +- src/declarative/qml/qdeclarativevaluetype.cpp | 4 +- src/declarative/qml/qdeclarativevaluetype_p.h | 2 +- .../qml/qdeclarativevaluetypescriptclass.cpp | 10 ++-- src/declarative/qml/qdeclarativevme.cpp | 30 +++++----- src/declarative/qml/qdeclarativevme_p.h | 2 +- src/declarative/qml/qdeclarativevmemetaobject.cpp | 8 +-- src/declarative/qml/qdeclarativevmemetaobject_p.h | 6 +- src/declarative/qml/qdeclarativewatcher.cpp | 2 +- src/declarative/qml/qdeclarativeworkerscript.cpp | 8 +-- src/declarative/qml/qdeclarativexmlhttprequest.cpp | 10 ++-- src/declarative/qml/qmetaobjectbuilder.cpp | 2 +- src/declarative/qml/rewriter/rewriter.cpp | 2 +- src/declarative/qml/rewriter/rewriter_p.h | 2 +- src/declarative/qml/rewriter/textwriter.cpp | 2 +- src/declarative/util/qdeclarativeanimation.cpp | 8 +-- src/declarative/util/qdeclarativeanimation_p.h | 4 +- src/declarative/util/qdeclarativeanimation_p_p.h | 6 +- src/declarative/util/qdeclarativebehavior.cpp | 6 +- src/declarative/util/qdeclarativebehavior_p.h | 2 +- src/declarative/util/qdeclarativebind.cpp | 4 +- src/declarative/util/qdeclarativeconnections.cpp | 2 +- src/declarative/util/qdeclarativefontloader.cpp | 2 +- src/declarative/util/qdeclarativelistaccessor.cpp | 2 +- src/declarative/util/qdeclarativelistmodel.cpp | 6 +- src/declarative/util/qdeclarativelistmodel_p_p.h | 4 +- .../util/qdeclarativelistmodelworkeragent.cpp | 8 +-- .../util/qdeclarativeopenmetaobject.cpp | 6 +- src/declarative/util/qdeclarativepackage.cpp | 2 +- src/declarative/util/qdeclarativepixmapcache.cpp | 2 +- .../util/qdeclarativepropertychanges.cpp | 4 +- .../util/qdeclarativepropertychanges_p.h | 2 +- src/declarative/util/qdeclarativepropertymap.cpp | 2 +- .../util/qdeclarativesmoothedanimation.cpp | 10 ++-- .../util/qdeclarativesmoothedanimation_p.h | 2 +- .../util/qdeclarativesmoothedanimation_p_p.h | 6 +- src/declarative/util/qdeclarativespringfollow.cpp | 4 +- src/declarative/util/qdeclarativestate.cpp | 16 +++--- src/declarative/util/qdeclarativestate_p_p.h | 6 +- src/declarative/util/qdeclarativestategroup.cpp | 6 +- src/declarative/util/qdeclarativestategroup_p.h | 2 +- .../util/qdeclarativestateoperations.cpp | 2 +- .../util/qdeclarativestateoperations_p.h | 2 +- src/declarative/util/qdeclarativestyledtext.cpp | 2 +- src/declarative/util/qdeclarativesystempalette.cpp | 2 +- src/declarative/util/qdeclarativetimeline.cpp | 2 +- src/declarative/util/qdeclarativetimer.cpp | 2 +- src/declarative/util/qdeclarativetransition.cpp | 14 ++--- src/declarative/util/qdeclarativetransition_p.h | 2 +- .../util/qdeclarativetransitionmanager.cpp | 4 +- .../util/qdeclarativetransitionmanager_p_p.h | 2 +- src/declarative/util/qdeclarativeutilmodule.cpp | 54 +++++++++--------- src/declarative/util/qdeclarativexmllistmodel.cpp | 2 +- 195 files changed, 580 insertions(+), 580 deletions(-) diff --git a/src/declarative/3rdparty/qlistmodelinterface.cpp b/src/declarative/3rdparty/qlistmodelinterface.cpp index 50714ce..98d6a5b 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 677d05f..cd5340b 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 diff --git a/src/declarative/debugger/qdeclarativedebugclient.cpp b/src/declarative/debugger/qdeclarativedebugclient.cpp index c23e32f..2e52b40 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 #include diff --git a/src/declarative/debugger/qdeclarativedebuggerstatus.cpp b/src/declarative/debugger/qdeclarativedebuggerstatus.cpp index 5908628..476cca2 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 d9bbdb5..9d9d1d0 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 #include diff --git a/src/declarative/debugger/qpacketprotocol.cpp b/src/declarative/debugger/qpacketprotocol.cpp index 7440b87..6241922 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 diff --git a/src/declarative/graphicsitems/qdeclarativeanchors.cpp b/src/declarative/graphicsitems/qdeclarativeanchors.cpp index ffcedda..7a7e5be 100644 --- a/src/declarative/graphicsitems/qdeclarativeanchors.cpp +++ b/src/declarative/graphicsitems/qdeclarativeanchors.cpp @@ -39,10 +39,10 @@ ** ****************************************************************************/ -#include "qdeclarativeanchors_p_p.h" +#include "private/qdeclarativeanchors_p_p.h" #include "qdeclarativeitem.h" -#include "qdeclarativeitem_p.h" +#include "private/qdeclarativeitem_p.h" #include diff --git a/src/declarative/graphicsitems/qdeclarativeanchors_p_p.h b/src/declarative/graphicsitems/qdeclarativeanchors_p_p.h index 5840868..ba6359a 100644 --- a/src/declarative/graphicsitems/qdeclarativeanchors_p_p.h +++ b/src/declarative/graphicsitems/qdeclarativeanchors_p_p.h @@ -53,8 +53,8 @@ // We mean it. // -#include "qdeclarativeanchors_p.h" -#include "qdeclarativeitemchangelistener_p.h" +#include "private/qdeclarativeanchors_p.h" +#include "private/qdeclarativeitemchangelistener_p.h" #include QT_BEGIN_NAMESPACE diff --git a/src/declarative/graphicsitems/qdeclarativeanimatedimage.cpp b/src/declarative/graphicsitems/qdeclarativeanimatedimage.cpp index 2c2e034..f14f773 100644 --- a/src/declarative/graphicsitems/qdeclarativeanimatedimage.cpp +++ b/src/declarative/graphicsitems/qdeclarativeanimatedimage.cpp @@ -39,8 +39,8 @@ ** ****************************************************************************/ -#include "qdeclarativeanimatedimage_p.h" -#include "qdeclarativeanimatedimage_p_p.h" +#include "private/qdeclarativeanimatedimage_p.h" +#include "private/qdeclarativeanimatedimage_p_p.h" #include diff --git a/src/declarative/graphicsitems/qdeclarativeanimatedimage_p.h b/src/declarative/graphicsitems/qdeclarativeanimatedimage_p.h index b2979fe..6ab66b3 100644 --- a/src/declarative/graphicsitems/qdeclarativeanimatedimage_p.h +++ b/src/declarative/graphicsitems/qdeclarativeanimatedimage_p.h @@ -42,7 +42,7 @@ #ifndef QDECLARATIVEANIMATEDIMAGE_H #define QDECLARATIVEANIMATEDIMAGE_H -#include "qdeclarativeimage_p.h" +#include "private/qdeclarativeimage_p.h" QT_BEGIN_HEADER diff --git a/src/declarative/graphicsitems/qdeclarativeanimatedimage_p_p.h b/src/declarative/graphicsitems/qdeclarativeanimatedimage_p_p.h index 273c1d6..8ca9755 100644 --- a/src/declarative/graphicsitems/qdeclarativeanimatedimage_p_p.h +++ b/src/declarative/graphicsitems/qdeclarativeanimatedimage_p_p.h @@ -53,7 +53,7 @@ // We mean it. // -#include "qdeclarativeimage_p_p.h" +#include "private/qdeclarativeimage_p_p.h" QT_BEGIN_NAMESPACE diff --git a/src/declarative/graphicsitems/qdeclarativeborderimage.cpp b/src/declarative/graphicsitems/qdeclarativeborderimage.cpp index 96f95f2..420ed90 100644 --- a/src/declarative/graphicsitems/qdeclarativeborderimage.cpp +++ b/src/declarative/graphicsitems/qdeclarativeborderimage.cpp @@ -39,8 +39,8 @@ ** ****************************************************************************/ -#include "qdeclarativeborderimage_p.h" -#include "qdeclarativeborderimage_p_p.h" +#include "private/qdeclarativeborderimage_p.h" +#include "private/qdeclarativeborderimage_p_p.h" #include diff --git a/src/declarative/graphicsitems/qdeclarativeborderimage_p.h b/src/declarative/graphicsitems/qdeclarativeborderimage_p.h index a759e67..5e725ca 100644 --- a/src/declarative/graphicsitems/qdeclarativeborderimage_p.h +++ b/src/declarative/graphicsitems/qdeclarativeborderimage_p.h @@ -42,7 +42,7 @@ #ifndef QDECLARATIVEBORDERIMAGE_H #define QDECLARATIVEBORDERIMAGE_H -#include "qdeclarativeimagebase_p.h" +#include "private/qdeclarativeimagebase_p.h" #include diff --git a/src/declarative/graphicsitems/qdeclarativeborderimage_p_p.h b/src/declarative/graphicsitems/qdeclarativeborderimage_p_p.h index 82b9ebf..3535109 100644 --- a/src/declarative/graphicsitems/qdeclarativeborderimage_p_p.h +++ b/src/declarative/graphicsitems/qdeclarativeborderimage_p_p.h @@ -53,8 +53,8 @@ // We mean it. // -#include "qdeclarativeimagebase_p_p.h" -#include "qdeclarativescalegrid_p_p.h" +#include "private/qdeclarativeimagebase_p_p.h" +#include "private/qdeclarativescalegrid_p_p.h" QT_BEGIN_NAMESPACE diff --git a/src/declarative/graphicsitems/qdeclarativeevents.cpp b/src/declarative/graphicsitems/qdeclarativeevents.cpp index 8be2f40..6118ea8 100644 --- a/src/declarative/graphicsitems/qdeclarativeevents.cpp +++ b/src/declarative/graphicsitems/qdeclarativeevents.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include "qdeclarativeevents_p_p.h" +#include "private/qdeclarativeevents_p_p.h" QT_BEGIN_NAMESPACE /*! diff --git a/src/declarative/graphicsitems/qdeclarativeflickable.cpp b/src/declarative/graphicsitems/qdeclarativeflickable.cpp index 8459245..fc7a87b 100644 --- a/src/declarative/graphicsitems/qdeclarativeflickable.cpp +++ b/src/declarative/graphicsitems/qdeclarativeflickable.cpp @@ -39,8 +39,8 @@ ** ****************************************************************************/ -#include "qdeclarativeflickable_p.h" -#include "qdeclarativeflickable_p_p.h" +#include "private/qdeclarativeflickable_p.h" +#include "private/qdeclarativeflickable_p_p.h" #include #include diff --git a/src/declarative/graphicsitems/qdeclarativeflickable_p_p.h b/src/declarative/graphicsitems/qdeclarativeflickable_p_p.h index c963c2b..1a04091 100644 --- a/src/declarative/graphicsitems/qdeclarativeflickable_p_p.h +++ b/src/declarative/graphicsitems/qdeclarativeflickable_p_p.h @@ -53,10 +53,10 @@ // We mean it. // -#include "qdeclarativeflickable_p.h" +#include "private/qdeclarativeflickable_p.h" -#include "qdeclarativeitem_p.h" -#include "qdeclarativeitemchangelistener_p.h" +#include "private/qdeclarativeitem_p.h" +#include "private/qdeclarativeitemchangelistener_p.h" #include #include diff --git a/src/declarative/graphicsitems/qdeclarativeflipable.cpp b/src/declarative/graphicsitems/qdeclarativeflipable.cpp index ccefc70..98e34a9 100644 --- a/src/declarative/graphicsitems/qdeclarativeflipable.cpp +++ b/src/declarative/graphicsitems/qdeclarativeflipable.cpp @@ -39,10 +39,10 @@ ** ****************************************************************************/ -#include "qdeclarativeflipable_p.h" +#include "private/qdeclarativeflipable_p.h" -#include "qdeclarativeitem_p.h" -#include "qdeclarativeguard_p.h" +#include "private/qdeclarativeitem_p.h" +#include "private/qdeclarativeguard_p.h" #include diff --git a/src/declarative/graphicsitems/qdeclarativefocuspanel.cpp b/src/declarative/graphicsitems/qdeclarativefocuspanel.cpp index 20524b6..bd60e25 100644 --- a/src/declarative/graphicsitems/qdeclarativefocuspanel.cpp +++ b/src/declarative/graphicsitems/qdeclarativefocuspanel.cpp @@ -39,9 +39,9 @@ ** ****************************************************************************/ -#include "qdeclarativefocuspanel_p.h" +#include "private/qdeclarativefocuspanel_p.h" -#include "qdeclarativeitem_p.h" +#include "private/qdeclarativeitem_p.h" #include #include diff --git a/src/declarative/graphicsitems/qdeclarativefocusscope.cpp b/src/declarative/graphicsitems/qdeclarativefocusscope.cpp index 484df13..4bd2a86 100644 --- a/src/declarative/graphicsitems/qdeclarativefocusscope.cpp +++ b/src/declarative/graphicsitems/qdeclarativefocusscope.cpp @@ -39,9 +39,9 @@ ** ****************************************************************************/ -#include "qdeclarativefocusscope_p.h" +#include "private/qdeclarativefocusscope_p.h" -#include "qdeclarativeitem_p.h" +#include "private/qdeclarativeitem_p.h" QT_BEGIN_NAMESPACE diff --git a/src/declarative/graphicsitems/qdeclarativegraphicsobjectcontainer.cpp b/src/declarative/graphicsitems/qdeclarativegraphicsobjectcontainer.cpp index ff85bbd..c846431 100644 --- a/src/declarative/graphicsitems/qdeclarativegraphicsobjectcontainer.cpp +++ b/src/declarative/graphicsitems/qdeclarativegraphicsobjectcontainer.cpp @@ -39,9 +39,9 @@ ** ****************************************************************************/ -#include "qdeclarativegraphicsobjectcontainer_p.h" +#include "private/qdeclarativegraphicsobjectcontainer_p.h" -#include "qdeclarativeitem_p.h" +#include "private/qdeclarativeitem_p.h" #include #include diff --git a/src/declarative/graphicsitems/qdeclarativegridview.cpp b/src/declarative/graphicsitems/qdeclarativegridview.cpp index 30f04f6..8247f17 100644 --- a/src/declarative/graphicsitems/qdeclarativegridview.cpp +++ b/src/declarative/graphicsitems/qdeclarativegridview.cpp @@ -39,12 +39,12 @@ ** ****************************************************************************/ -#include "qdeclarativegridview_p.h" +#include "private/qdeclarativegridview_p.h" -#include "qdeclarativevisualitemmodel_p.h" -#include "qdeclarativeflickable_p_p.h" +#include "private/qdeclarativevisualitemmodel_p.h" +#include "private/qdeclarativeflickable_p_p.h" -#include "qdeclarativesmoothedanimation_p_p.h" +#include "private/qdeclarativesmoothedanimation_p_p.h" #include #include diff --git a/src/declarative/graphicsitems/qdeclarativegridview_p.h b/src/declarative/graphicsitems/qdeclarativegridview_p.h index 90f13d2..f73f632 100644 --- a/src/declarative/graphicsitems/qdeclarativegridview_p.h +++ b/src/declarative/graphicsitems/qdeclarativegridview_p.h @@ -42,7 +42,7 @@ #ifndef QDECLARATIVEGRIDVIEW_H #define QDECLARATIVEGRIDVIEW_H -#include "qdeclarativeflickable_p.h" +#include "private/qdeclarativeflickable_p.h" QT_BEGIN_HEADER diff --git a/src/declarative/graphicsitems/qdeclarativeimage.cpp b/src/declarative/graphicsitems/qdeclarativeimage.cpp index 3145c43..e4f3464 100644 --- a/src/declarative/graphicsitems/qdeclarativeimage.cpp +++ b/src/declarative/graphicsitems/qdeclarativeimage.cpp @@ -39,8 +39,8 @@ ** ****************************************************************************/ -#include "qdeclarativeimage_p.h" -#include "qdeclarativeimage_p_p.h" +#include "private/qdeclarativeimage_p.h" +#include "private/qdeclarativeimage_p_p.h" #include #include diff --git a/src/declarative/graphicsitems/qdeclarativeimage_p.h b/src/declarative/graphicsitems/qdeclarativeimage_p.h index da6cbd5..5ea700d 100644 --- a/src/declarative/graphicsitems/qdeclarativeimage_p.h +++ b/src/declarative/graphicsitems/qdeclarativeimage_p.h @@ -42,7 +42,7 @@ #ifndef QDECLARATIVEIMAGE_H #define QDECLARATIVEIMAGE_H -#include "qdeclarativeimagebase_p.h" +#include "private/qdeclarativeimagebase_p.h" #include diff --git a/src/declarative/graphicsitems/qdeclarativeimage_p_p.h b/src/declarative/graphicsitems/qdeclarativeimage_p_p.h index 8102237..dd12a00 100644 --- a/src/declarative/graphicsitems/qdeclarativeimage_p_p.h +++ b/src/declarative/graphicsitems/qdeclarativeimage_p_p.h @@ -53,8 +53,8 @@ // We mean it. // -#include "qdeclarativeitem_p.h" -#include "qdeclarativeimagebase_p_p.h" +#include "private/qdeclarativeitem_p.h" +#include "private/qdeclarativeimagebase_p_p.h" QT_BEGIN_NAMESPACE diff --git a/src/declarative/graphicsitems/qdeclarativeimagebase.cpp b/src/declarative/graphicsitems/qdeclarativeimagebase.cpp index 5a234b7..3acafe8 100644 --- a/src/declarative/graphicsitems/qdeclarativeimagebase.cpp +++ b/src/declarative/graphicsitems/qdeclarativeimagebase.cpp @@ -39,8 +39,8 @@ ** ****************************************************************************/ -#include "qdeclarativeimagebase_p.h" -#include "qdeclarativeimagebase_p_p.h" +#include "private/qdeclarativeimagebase_p.h" +#include "private/qdeclarativeimagebase_p_p.h" #include #include diff --git a/src/declarative/graphicsitems/qdeclarativeimagebase_p_p.h b/src/declarative/graphicsitems/qdeclarativeimagebase_p_p.h index de8c93a..392c1db 100644 --- a/src/declarative/graphicsitems/qdeclarativeimagebase_p_p.h +++ b/src/declarative/graphicsitems/qdeclarativeimagebase_p_p.h @@ -53,7 +53,7 @@ // We mean it. // -#include "qdeclarativeitem_p.h" +#include "private/qdeclarativeitem_p.h" #include diff --git a/src/declarative/graphicsitems/qdeclarativeitem.cpp b/src/declarative/graphicsitems/qdeclarativeitem.cpp index 83c79a0..55a81f4 100644 --- a/src/declarative/graphicsitems/qdeclarativeitem.cpp +++ b/src/declarative/graphicsitems/qdeclarativeitem.cpp @@ -39,10 +39,10 @@ ** ****************************************************************************/ -#include "qdeclarativeitem_p.h" +#include "private/qdeclarativeitem_p.h" #include "qdeclarativeitem.h" -#include "qdeclarativeevents_p_p.h" +#include "private/qdeclarativeevents_p_p.h" #include #include diff --git a/src/declarative/graphicsitems/qdeclarativeitemsmodule.cpp b/src/declarative/graphicsitems/qdeclarativeitemsmodule.cpp index 97a22cf..7989a27 100644 --- a/src/declarative/graphicsitems/qdeclarativeitemsmodule.cpp +++ b/src/declarative/graphicsitems/qdeclarativeitemsmodule.cpp @@ -39,46 +39,46 @@ ** ****************************************************************************/ -#include "qdeclarativeitemsmodule_p.h" +#include "private/qdeclarativeitemsmodule_p.h" #include #include #include -#include "qdeclarativeevents_p_p.h" -#include "qdeclarativeeffects_p.h" -#include "qdeclarativescalegrid_p_p.h" -#include "qdeclarativeanimatedimage_p.h" -#include "qdeclarativeborderimage_p.h" -#include "qdeclarativepositioners_p.h" -#include "qdeclarativemousearea_p.h" -#include "qdeclarativeflickable_p.h" -#include "qdeclarativeflickable_p_p.h" -#include "qdeclarativeflipable_p.h" -#include "qdeclarativefocuspanel_p.h" -#include "qdeclarativefocusscope_p.h" -#include "qdeclarativegraphicsobjectcontainer_p.h" -#include "qdeclarativegridview_p.h" -#include "qdeclarativeimage_p.h" -#include "qdeclarativeitem_p.h" -#include "qdeclarativelayoutitem_p.h" -#include "qdeclarativelistview_p.h" -#include "qdeclarativeloader_p.h" -#include "qdeclarativemousearea_p.h" -#include "qdeclarativepath_p.h" -#include "qdeclarativepathview_p.h" -#include "qdeclarativerectangle_p.h" -#include "qdeclarativerepeater_p.h" -#include "qdeclarativetranslate_p.h" -#include "qdeclarativetext_p.h" -#include "qdeclarativetextedit_p.h" -#include "qdeclarativetextinput_p.h" -#include "qdeclarativevisualitemmodel_p.h" +#include "private/qdeclarativeevents_p_p.h" +#include "private/qdeclarativeeffects_p.h" +#include "private/qdeclarativescalegrid_p_p.h" +#include "private/qdeclarativeanimatedimage_p.h" +#include "private/qdeclarativeborderimage_p.h" +#include "private/qdeclarativepositioners_p.h" +#include "private/qdeclarativemousearea_p.h" +#include "private/qdeclarativeflickable_p.h" +#include "private/qdeclarativeflickable_p_p.h" +#include "private/qdeclarativeflipable_p.h" +#include "private/qdeclarativefocuspanel_p.h" +#include "private/qdeclarativefocusscope_p.h" +#include "private/qdeclarativegraphicsobjectcontainer_p.h" +#include "private/qdeclarativegridview_p.h" +#include "private/qdeclarativeimage_p.h" +#include "private/qdeclarativeitem_p.h" +#include "private/qdeclarativelayoutitem_p.h" +#include "private/qdeclarativelistview_p.h" +#include "private/qdeclarativeloader_p.h" +#include "private/qdeclarativemousearea_p.h" +#include "private/qdeclarativepath_p.h" +#include "private/qdeclarativepathview_p.h" +#include "private/qdeclarativerectangle_p.h" +#include "private/qdeclarativerepeater_p.h" +#include "private/qdeclarativetranslate_p.h" +#include "private/qdeclarativetext_p.h" +#include "private/qdeclarativetextedit_p.h" +#include "private/qdeclarativetextinput_p.h" +#include "private/qdeclarativevisualitemmodel_p.h" #ifdef QT_WEBKIT_LIB -#include "qdeclarativewebview_p.h" -#include "qdeclarativewebview_p_p.h" +#include "private/qdeclarativewebview_p.h" +#include "private/qdeclarativewebview_p_p.h" #endif -#include "qdeclarativeanchors_p.h" +#include "private/qdeclarativeanchors_p.h" void QDeclarativeItemModule::defineModule() { diff --git a/src/declarative/graphicsitems/qdeclarativelayoutitem.cpp b/src/declarative/graphicsitems/qdeclarativelayoutitem.cpp index a23ea65..1bbdd97 100644 --- a/src/declarative/graphicsitems/qdeclarativelayoutitem.cpp +++ b/src/declarative/graphicsitems/qdeclarativelayoutitem.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include "qdeclarativelayoutitem_p.h" +#include "private/qdeclarativelayoutitem_p.h" #include diff --git a/src/declarative/graphicsitems/qdeclarativelistview.cpp b/src/declarative/graphicsitems/qdeclarativelistview.cpp index 308612f..e85d60f 100644 --- a/src/declarative/graphicsitems/qdeclarativelistview.cpp +++ b/src/declarative/graphicsitems/qdeclarativelistview.cpp @@ -39,12 +39,12 @@ ** ****************************************************************************/ -#include "qdeclarativelistview_p.h" +#include "private/qdeclarativelistview_p.h" -#include "qdeclarativeflickable_p_p.h" -#include "qdeclarativevisualitemmodel_p.h" +#include "private/qdeclarativeflickable_p_p.h" +#include "private/qdeclarativevisualitemmodel_p.h" -#include "qdeclarativesmoothedanimation_p_p.h" +#include "private/qdeclarativesmoothedanimation_p_p.h" #include #include #include diff --git a/src/declarative/graphicsitems/qdeclarativelistview_p.h b/src/declarative/graphicsitems/qdeclarativelistview_p.h index 3635b39..5810979 100644 --- a/src/declarative/graphicsitems/qdeclarativelistview_p.h +++ b/src/declarative/graphicsitems/qdeclarativelistview_p.h @@ -42,7 +42,7 @@ #ifndef QDECLARATIVELISTVIEW_H #define QDECLARATIVELISTVIEW_H -#include "qdeclarativeflickable_p.h" +#include "private/qdeclarativeflickable_p.h" QT_BEGIN_HEADER diff --git a/src/declarative/graphicsitems/qdeclarativeloader.cpp b/src/declarative/graphicsitems/qdeclarativeloader.cpp index 2f1511e..2aab36f 100644 --- a/src/declarative/graphicsitems/qdeclarativeloader.cpp +++ b/src/declarative/graphicsitems/qdeclarativeloader.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include "qdeclarativeloader_p_p.h" +#include "private/qdeclarativeloader_p_p.h" #include #include diff --git a/src/declarative/graphicsitems/qdeclarativeloader_p_p.h b/src/declarative/graphicsitems/qdeclarativeloader_p_p.h index fc5e665..49069f9 100644 --- a/src/declarative/graphicsitems/qdeclarativeloader_p_p.h +++ b/src/declarative/graphicsitems/qdeclarativeloader_p_p.h @@ -53,10 +53,10 @@ // We mean it. // -#include "qdeclarativeloader_p.h" +#include "private/qdeclarativeloader_p.h" -#include "qdeclarativeitem_p.h" -#include "qdeclarativeitemchangelistener_p.h" +#include "private/qdeclarativeitem_p.h" +#include "private/qdeclarativeitemchangelistener_p.h" QT_BEGIN_NAMESPACE diff --git a/src/declarative/graphicsitems/qdeclarativemousearea.cpp b/src/declarative/graphicsitems/qdeclarativemousearea.cpp index 6126a6f..816aa78 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 diff --git a/src/declarative/graphicsitems/qdeclarativemousearea_p_p.h b/src/declarative/graphicsitems/qdeclarativemousearea_p_p.h index 88206cd..9068c7c 100644 --- a/src/declarative/graphicsitems/qdeclarativemousearea_p_p.h +++ b/src/declarative/graphicsitems/qdeclarativemousearea_p_p.h @@ -53,7 +53,7 @@ // We mean it. // -#include "qdeclarativeitem_p.h" +#include "private/qdeclarativeitem_p.h" #include #include diff --git a/src/declarative/graphicsitems/qdeclarativepainteditem.cpp b/src/declarative/graphicsitems/qdeclarativepainteditem.cpp index ab6007a..f52636f 100644 --- a/src/declarative/graphicsitems/qdeclarativepainteditem.cpp +++ b/src/declarative/graphicsitems/qdeclarativepainteditem.cpp @@ -39,8 +39,8 @@ ** ****************************************************************************/ -#include "qdeclarativepainteditem_p.h" -#include "qdeclarativepainteditem_p_p.h" +#include "private/qdeclarativepainteditem_p.h" +#include "private/qdeclarativepainteditem_p_p.h" #include #include diff --git a/src/declarative/graphicsitems/qdeclarativepainteditem_p_p.h b/src/declarative/graphicsitems/qdeclarativepainteditem_p_p.h index a15febb..6b23086 100644 --- a/src/declarative/graphicsitems/qdeclarativepainteditem_p_p.h +++ b/src/declarative/graphicsitems/qdeclarativepainteditem_p_p.h @@ -53,7 +53,7 @@ // We mean it. // -#include "qdeclarativeitem_p.h" +#include "private/qdeclarativeitem_p.h" QT_BEGIN_NAMESPACE diff --git a/src/declarative/graphicsitems/qdeclarativepath.cpp b/src/declarative/graphicsitems/qdeclarativepath.cpp index 8cd990fc..e2042fc 100644 --- a/src/declarative/graphicsitems/qdeclarativepath.cpp +++ b/src/declarative/graphicsitems/qdeclarativepath.cpp @@ -39,8 +39,8 @@ ** ****************************************************************************/ -#include "qdeclarativepath_p.h" -#include "qdeclarativepath_p_p.h" +#include "private/qdeclarativepath_p.h" +#include "private/qdeclarativepath_p_p.h" #include #include diff --git a/src/declarative/graphicsitems/qdeclarativepath_p_p.h b/src/declarative/graphicsitems/qdeclarativepath_p_p.h index fb63867..e82bcf5 100644 --- a/src/declarative/graphicsitems/qdeclarativepath_p_p.h +++ b/src/declarative/graphicsitems/qdeclarativepath_p_p.h @@ -53,7 +53,7 @@ // We mean it. // -#include "qdeclarativepath_p.h" +#include "private/qdeclarativepath_p.h" #include diff --git a/src/declarative/graphicsitems/qdeclarativepathview.cpp b/src/declarative/graphicsitems/qdeclarativepathview.cpp index 71f85ae..813b525 100644 --- a/src/declarative/graphicsitems/qdeclarativepathview.cpp +++ b/src/declarative/graphicsitems/qdeclarativepathview.cpp @@ -39,8 +39,8 @@ ** ****************************************************************************/ -#include "qdeclarativepathview_p.h" -#include "qdeclarativepathview_p_p.h" +#include "private/qdeclarativepathview_p.h" +#include "private/qdeclarativepathview_p_p.h" #include #include diff --git a/src/declarative/graphicsitems/qdeclarativepathview_p.h b/src/declarative/graphicsitems/qdeclarativepathview_p.h index a00f4c0..69770cd 100644 --- a/src/declarative/graphicsitems/qdeclarativepathview_p.h +++ b/src/declarative/graphicsitems/qdeclarativepathview_p.h @@ -43,7 +43,7 @@ #define QDECLARATIVEPATHVIEW_H #include "qdeclarativeitem.h" -#include "qdeclarativepath_p.h" +#include "private/qdeclarativepath_p.h" QT_BEGIN_HEADER diff --git a/src/declarative/graphicsitems/qdeclarativepathview_p_p.h b/src/declarative/graphicsitems/qdeclarativepathview_p_p.h index 6470893..11712fd 100644 --- a/src/declarative/graphicsitems/qdeclarativepathview_p_p.h +++ b/src/declarative/graphicsitems/qdeclarativepathview_p_p.h @@ -53,10 +53,10 @@ // We mean it. // -#include "qdeclarativepathview_p.h" +#include "private/qdeclarativepathview_p.h" -#include "qdeclarativeitem_p.h" -#include "qdeclarativevisualitemmodel_p.h" +#include "private/qdeclarativeitem_p.h" +#include "private/qdeclarativevisualitemmodel_p.h" #include #include diff --git a/src/declarative/graphicsitems/qdeclarativepositioners.cpp b/src/declarative/graphicsitems/qdeclarativepositioners.cpp index 781e584..d33a8be 100644 --- a/src/declarative/graphicsitems/qdeclarativepositioners.cpp +++ b/src/declarative/graphicsitems/qdeclarativepositioners.cpp @@ -39,8 +39,8 @@ ** ****************************************************************************/ -#include "qdeclarativepositioners_p.h" -#include "qdeclarativepositioners_p_p.h" +#include "private/qdeclarativepositioners_p.h" +#include "private/qdeclarativepositioners_p_p.h" #include #include diff --git a/src/declarative/graphicsitems/qdeclarativepositioners_p_p.h b/src/declarative/graphicsitems/qdeclarativepositioners_p_p.h index 7880e3e..576f35b 100644 --- a/src/declarative/graphicsitems/qdeclarativepositioners_p_p.h +++ b/src/declarative/graphicsitems/qdeclarativepositioners_p_p.h @@ -53,9 +53,9 @@ // We mean it. // -#include "qdeclarativepositioners_p.h" +#include "private/qdeclarativepositioners_p.h" -#include "qdeclarativeitem_p.h" +#include "private/qdeclarativeitem_p.h" #include #include diff --git a/src/declarative/graphicsitems/qdeclarativerectangle.cpp b/src/declarative/graphicsitems/qdeclarativerectangle.cpp index 8fbaa22..3f7548f 100644 --- a/src/declarative/graphicsitems/qdeclarativerectangle.cpp +++ b/src/declarative/graphicsitems/qdeclarativerectangle.cpp @@ -39,8 +39,8 @@ ** ****************************************************************************/ -#include "qdeclarativerectangle_p.h" -#include "qdeclarativerectangle_p_p.h" +#include "private/qdeclarativerectangle_p.h" +#include "private/qdeclarativerectangle_p_p.h" #include #include diff --git a/src/declarative/graphicsitems/qdeclarativerectangle_p_p.h b/src/declarative/graphicsitems/qdeclarativerectangle_p_p.h index 6bae219..84418bc 100644 --- a/src/declarative/graphicsitems/qdeclarativerectangle_p_p.h +++ b/src/declarative/graphicsitems/qdeclarativerectangle_p_p.h @@ -53,7 +53,7 @@ // We mean it. // -#include "qdeclarativeitem_p.h" +#include "private/qdeclarativeitem_p.h" QT_BEGIN_NAMESPACE diff --git a/src/declarative/graphicsitems/qdeclarativerepeater.cpp b/src/declarative/graphicsitems/qdeclarativerepeater.cpp index bbee4e5..e836788 100644 --- a/src/declarative/graphicsitems/qdeclarativerepeater.cpp +++ b/src/declarative/graphicsitems/qdeclarativerepeater.cpp @@ -39,10 +39,10 @@ ** ****************************************************************************/ -#include "qdeclarativerepeater_p.h" -#include "qdeclarativerepeater_p_p.h" +#include "private/qdeclarativerepeater_p.h" +#include "private/qdeclarativerepeater_p_p.h" -#include "qdeclarativevisualitemmodel_p.h" +#include "private/qdeclarativevisualitemmodel_p.h" #include #include diff --git a/src/declarative/graphicsitems/qdeclarativerepeater_p_p.h b/src/declarative/graphicsitems/qdeclarativerepeater_p_p.h index 11773ff..5b75e50 100644 --- a/src/declarative/graphicsitems/qdeclarativerepeater_p_p.h +++ b/src/declarative/graphicsitems/qdeclarativerepeater_p_p.h @@ -53,9 +53,9 @@ // We mean it. // -#include "qdeclarativerepeater_p.h" +#include "private/qdeclarativerepeater_p.h" -#include "qdeclarativeitem_p.h" +#include "private/qdeclarativeitem_p.h" #include diff --git a/src/declarative/graphicsitems/qdeclarativescalegrid.cpp b/src/declarative/graphicsitems/qdeclarativescalegrid.cpp index dbc7568..e68f645 100644 --- a/src/declarative/graphicsitems/qdeclarativescalegrid.cpp +++ b/src/declarative/graphicsitems/qdeclarativescalegrid.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include "qdeclarativescalegrid_p_p.h" +#include "private/qdeclarativescalegrid_p_p.h" #include diff --git a/src/declarative/graphicsitems/qdeclarativescalegrid_p_p.h b/src/declarative/graphicsitems/qdeclarativescalegrid_p_p.h index fbf9040..42813dd 100644 --- a/src/declarative/graphicsitems/qdeclarativescalegrid_p_p.h +++ b/src/declarative/graphicsitems/qdeclarativescalegrid_p_p.h @@ -42,7 +42,7 @@ #ifndef QDECLARATIVESCALEGRID_H #define QDECLARATIVESCALEGRID_H -#include "qdeclarativeborderimage_p.h" +#include "private/qdeclarativeborderimage_p.h" #include #include diff --git a/src/declarative/graphicsitems/qdeclarativetext.cpp b/src/declarative/graphicsitems/qdeclarativetext.cpp index b0b5f6d..a4f3068 100644 --- a/src/declarative/graphicsitems/qdeclarativetext.cpp +++ b/src/declarative/graphicsitems/qdeclarativetext.cpp @@ -39,8 +39,8 @@ ** ****************************************************************************/ -#include "qdeclarativetext_p.h" -#include "qdeclarativetext_p_p.h" +#include "private/qdeclarativetext_p.h" +#include "private/qdeclarativetext_p_p.h" #include #include diff --git a/src/declarative/graphicsitems/qdeclarativetext_p_p.h b/src/declarative/graphicsitems/qdeclarativetext_p_p.h index 0d9a0a6..85a65ce 100644 --- a/src/declarative/graphicsitems/qdeclarativetext_p_p.h +++ b/src/declarative/graphicsitems/qdeclarativetext_p_p.h @@ -54,7 +54,7 @@ // #include "qdeclarativeitem.h" -#include "qdeclarativeitem_p.h" +#include "private/qdeclarativeitem_p.h" #include diff --git a/src/declarative/graphicsitems/qdeclarativetextedit.cpp b/src/declarative/graphicsitems/qdeclarativetextedit.cpp index 03b2425..7374bc8 100644 --- a/src/declarative/graphicsitems/qdeclarativetextedit.cpp +++ b/src/declarative/graphicsitems/qdeclarativetextedit.cpp @@ -39,10 +39,10 @@ ** ****************************************************************************/ -#include "qdeclarativetextedit_p.h" -#include "qdeclarativetextedit_p_p.h" +#include "private/qdeclarativetextedit_p.h" +#include "private/qdeclarativetextedit_p_p.h" -#include "qdeclarativeevents_p_p.h" +#include "private/qdeclarativeevents_p_p.h" #include #include diff --git a/src/declarative/graphicsitems/qdeclarativetextedit_p.h b/src/declarative/graphicsitems/qdeclarativetextedit_p.h index b1682c4..0e91e73 100644 --- a/src/declarative/graphicsitems/qdeclarativetextedit_p.h +++ b/src/declarative/graphicsitems/qdeclarativetextedit_p.h @@ -42,8 +42,8 @@ #ifndef QDECLARATIVETEXTEDIT_H #define QDECLARATIVETEXTEDIT_H -#include "qdeclarativetext_p.h" -#include "qdeclarativepainteditem_p.h" +#include "private/qdeclarativetext_p.h" +#include "private/qdeclarativepainteditem_p.h" #include #include diff --git a/src/declarative/graphicsitems/qdeclarativetextedit_p_p.h b/src/declarative/graphicsitems/qdeclarativetextedit_p_p.h index dd2a29d..310db48 100644 --- a/src/declarative/graphicsitems/qdeclarativetextedit_p_p.h +++ b/src/declarative/graphicsitems/qdeclarativetextedit_p_p.h @@ -54,7 +54,7 @@ // #include "qdeclarativeitem.h" -#include "qdeclarativepainteditem_p_p.h" +#include "private/qdeclarativepainteditem_p_p.h" #include diff --git a/src/declarative/graphicsitems/qdeclarativetextinput.cpp b/src/declarative/graphicsitems/qdeclarativetextinput.cpp index 88801a4..29e43f9 100644 --- a/src/declarative/graphicsitems/qdeclarativetextinput.cpp +++ b/src/declarative/graphicsitems/qdeclarativetextinput.cpp @@ -39,8 +39,8 @@ ** ****************************************************************************/ -#include "qdeclarativetextinput_p.h" -#include "qdeclarativetextinput_p_p.h" +#include "private/qdeclarativetextinput_p.h" +#include "private/qdeclarativetextinput_p_p.h" #include #include diff --git a/src/declarative/graphicsitems/qdeclarativetextinput_p.h b/src/declarative/graphicsitems/qdeclarativetextinput_p.h index 6a61c2d..64aff7d 100644 --- a/src/declarative/graphicsitems/qdeclarativetextinput_p.h +++ b/src/declarative/graphicsitems/qdeclarativetextinput_p.h @@ -42,8 +42,8 @@ #ifndef QDECLARATIVETEXTINPUT_H #define QDECLARATIVETEXTINPUT_H -#include "qdeclarativetext_p.h" -#include "qdeclarativepainteditem_p.h" +#include "private/qdeclarativetext_p.h" +#include "private/qdeclarativepainteditem_p.h" #include #include diff --git a/src/declarative/graphicsitems/qdeclarativetextinput_p_p.h b/src/declarative/graphicsitems/qdeclarativetextinput_p_p.h index 5d17a55..9e44b15 100644 --- a/src/declarative/graphicsitems/qdeclarativetextinput_p_p.h +++ b/src/declarative/graphicsitems/qdeclarativetextinput_p_p.h @@ -42,9 +42,9 @@ #ifndef QDECLARATIVETEXTINPUT_P_H #define QDECLARATIVETEXTINPUT_P_H -#include "qdeclarativetextinput_p.h" +#include "private/qdeclarativetextinput_p.h" -#include "qdeclarativepainteditem_p_p.h" +#include "private/qdeclarativepainteditem_p_p.h" #include diff --git a/src/declarative/graphicsitems/qdeclarativetranslate.cpp b/src/declarative/graphicsitems/qdeclarativetranslate.cpp index 1c96fa4..17daac7 100644 --- a/src/declarative/graphicsitems/qdeclarativetranslate.cpp +++ b/src/declarative/graphicsitems/qdeclarativetranslate.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include "qdeclarativetranslate_p.h" +#include "private/qdeclarativetranslate_p.h" #include #include #include diff --git a/src/declarative/graphicsitems/qdeclarativevisualitemmodel.cpp b/src/declarative/graphicsitems/qdeclarativevisualitemmodel.cpp index b31bbd0..2938f51 100644 --- a/src/declarative/graphicsitems/qdeclarativevisualitemmodel.cpp +++ b/src/declarative/graphicsitems/qdeclarativevisualitemmodel.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include "qdeclarativevisualitemmodel_p.h" +#include "private/qdeclarativevisualitemmodel_p.h" #include "qdeclarativeitem.h" diff --git a/src/declarative/qml/parser/qdeclarativejs.g b/src/declarative/qml/parser/qdeclarativejs.g index 536989f..ba9338e 100644 --- a/src/declarative/qml/parser/qdeclarativejs.g +++ b/src/declarative/qml/parser/qdeclarativejs.g @@ -127,10 +127,10 @@ #include -#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 #include @@ -375,7 +375,7 @@ protected: /. -#include "qdeclarativejsparser_p.h" +#include "private/qdeclarativejsparser_p.h" #include // diff --git a/src/declarative/qml/parser/qdeclarativejsast.cpp b/src/declarative/qml/parser/qdeclarativejsast.cpp index e3d3a66..000ef86 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 b839413..0623a2a 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 diff --git a/src/declarative/qml/parser/qdeclarativejsastfwd_p.h b/src/declarative/qml/parser/qdeclarativejsastfwd_p.h index 5a444b7..d04aba5 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 diff --git a/src/declarative/qml/parser/qdeclarativejsastvisitor.cpp b/src/declarative/qml/parser/qdeclarativejsastvisitor.cpp index d8002cf..d9a7be3 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 82abbcf..e1f45b4 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 7d39134..0527b3c 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 #include diff --git a/src/declarative/qml/parser/qdeclarativejsengine_p.h b/src/declarative/qml/parser/qdeclarativejsengine_p.h index 61188f7..1389244 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 #include diff --git a/src/declarative/qml/parser/qdeclarativejsgrammar.cpp b/src/declarative/qml/parser/qdeclarativejsgrammar.cpp index 39a2d3f..52e979a 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 6404be3..a616146 100644 --- a/src/declarative/qml/parser/qdeclarativejslexer.cpp +++ b/src/declarative/qml/parser/qdeclarativejslexer.cpp @@ -43,11 +43,11 @@ #include #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 diff --git a/src/declarative/qml/parser/qdeclarativejslexer_p.h b/src/declarative/qml/parser/qdeclarativejslexer_p.h index 71bd08c..f2a2fa5 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 diff --git a/src/declarative/qml/parser/qdeclarativejsmemorypool_p.h b/src/declarative/qml/parser/qdeclarativejsmemorypool_p.h index c8d52d0..51e6e54 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 #include diff --git a/src/declarative/qml/parser/qdeclarativejsnodepool_p.h b/src/declarative/qml/parser/qdeclarativejsnodepool_p.h index 94637fd..ffa9ee5 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 #include diff --git a/src/declarative/qml/parser/qdeclarativejsparser.cpp b/src/declarative/qml/parser/qdeclarativejsparser.cpp index 170c7fa..8afb93d 100644 --- a/src/declarative/qml/parser/qdeclarativejsparser.cpp +++ b/src/declarative/qml/parser/qdeclarativejsparser.cpp @@ -44,14 +44,14 @@ #include -#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 // diff --git a/src/declarative/qml/parser/qdeclarativejsparser_p.h b/src/declarative/qml/parser/qdeclarativejsparser_p.h index 8838fbe..005bd3f 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 #include diff --git a/src/declarative/qml/qdeclarativebinding.cpp b/src/declarative/qml/qdeclarativebinding.cpp index a7047ab..71cf3cb 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 #include diff --git a/src/declarative/qml/qdeclarativebinding_p.h b/src/declarative/qml/qdeclarativebinding_p.h index 56f1715..2789738 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 #include diff --git a/src/declarative/qml/qdeclarativebinding_p_p.h b/src/declarative/qml/qdeclarativebinding_p_p.h index 041103c..617ec4b 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 6a5a102..762c6428 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 diff --git a/src/declarative/qml/qdeclarativeclassfactory.cpp b/src/declarative/qml/qdeclarativeclassfactory.cpp index ae4975c..798eacd 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 0fa49d1..4f48ba1 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 67750a4..53143d5 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 #include diff --git a/src/declarative/qml/qdeclarativecompiledbindings_p.h b/src/declarative/qml/qdeclarativecompiledbindings_p.h index 8776c08..a17bc84 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 dfbf453..5d73d89 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 diff --git a/src/declarative/qml/qdeclarativecompiler.cpp b/src/declarative/qml/qdeclarativecompiler.cpp index 56af5f5..f4ccce1 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 #include diff --git a/src/declarative/qml/qdeclarativecompiler_p.h b/src/declarative/qml/qdeclarativecompiler_p.h index e5836d1..11364bb 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 #include diff --git a/src/declarative/qml/qdeclarativecomponent.cpp b/src/declarative/qml/qdeclarativecomponent.cpp index ec23458..e180374 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 #include diff --git a/src/declarative/qml/qdeclarativecomponent_p.h b/src/declarative/qml/qdeclarativecomponent_p.h index b44aeef..dfe327b 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 04d0c63..47cb3b3 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 diff --git a/src/declarative/qml/qdeclarativecompositetypemanager.cpp b/src/declarative/qml/qdeclarativecompositetypemanager.cpp index eb8c9eb..55723ea 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 #include diff --git a/src/declarative/qml/qdeclarativecompositetypemanager_p.h b/src/declarative/qml/qdeclarativecompositetypemanager_p.h index a572e0c..5c82c4c 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 a9224ad..55c2f7c 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 #include diff --git a/src/declarative/qml/qdeclarativecontext_p.h b/src/declarative/qml/qdeclarativecontext_p.h index 397f37a..6c5a1f7 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 #include #include #include -#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 2559224..8566744 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 93e4b20..b89f0cd 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 a3a511c..8b6ee7c 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 diff --git a/src/declarative/qml/qdeclarativecustomparser_p.h b/src/declarative/qml/qdeclarativecustomparser_p.h index f9bf513..da0358a 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 #include diff --git a/src/declarative/qml/qdeclarativecustomparser_p_p.h b/src/declarative/qml/qdeclarativecustomparser_p_p.h index b580db6..a7e213c 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 diff --git a/src/declarative/qml/qdeclarativedeclarativedata_p.h b/src/declarative/qml/qdeclarativedeclarativedata_p.h index d1d063a..adfff19 100644 --- a/src/declarative/qml/qdeclarativedeclarativedata_p.h +++ b/src/declarative/qml/qdeclarativedeclarativedata_p.h @@ -55,7 +55,7 @@ #include #include -#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 0e82098..1e3b37b 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 diff --git a/src/declarative/qml/qdeclarativedom.cpp b/src/declarative/qml/qdeclarativedom.cpp index dec30a1..a3cddb5 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 #include diff --git a/src/declarative/qml/qdeclarativedom_p_p.h b/src/declarative/qml/qdeclarativedom_p_p.h index a065282..7ce99ec 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 diff --git a/src/declarative/qml/qdeclarativeengine.cpp b/src/declarative/qml/qdeclarativeengine.cpp index 9442705..52a1f45 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 #include diff --git a/src/declarative/qml/qdeclarativeengine_p.h b/src/declarative/qml/qdeclarativeengine_p.h index 5aff30d..45089d0 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 #include diff --git a/src/declarative/qml/qdeclarativeenginedebug.cpp b/src/declarative/qml/qdeclarativeenginedebug.cpp index d30aa8e..3455883 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 #include diff --git a/src/declarative/qml/qdeclarativeexpression.cpp b/src/declarative/qml/qdeclarativeexpression.cpp index b7ee3a4..a250f21 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 #include diff --git a/src/declarative/qml/qdeclarativeexpression_p.h b/src/declarative/qml/qdeclarativeexpression_p.h index 5adaa89..9a90fb6 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 diff --git a/src/declarative/qml/qdeclarativefastproperties.cpp b/src/declarative/qml/qdeclarativefastproperties.cpp index 088d329..eb69b6a 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 diff --git a/src/declarative/qml/qdeclarativeglobalscriptclass.cpp b/src/declarative/qml/qdeclarativeglobalscriptclass.cpp index 9ee2fe5..fc802b4 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 #include diff --git a/src/declarative/qml/qdeclarativeguard_p.h b/src/declarative/qml/qdeclarativeguard_p.h index 0861e9a..747d58f 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); -#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 5146bb6..6199aa9 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 diff --git a/src/declarative/qml/qdeclarativeinstruction.cpp b/src/declarative/qml/qdeclarativeinstruction.cpp index 9083ab3..3cf4d2b 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 diff --git a/src/declarative/qml/qdeclarativeintegercache.cpp b/src/declarative/qml/qdeclarativeintegercache.cpp index be36471..d1e17a0 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 5fb5a76..b3a3796 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 diff --git a/src/declarative/qml/qdeclarativelist.cpp b/src/declarative/qml/qdeclarativelist.cpp index 9691f32..45b8cd7 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 219aa4b..399b2a1 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 45a805a..b17f84a 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 ea04ad9..3958dd5 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 c512d97..af21765 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 #include diff --git a/src/declarative/qml/qdeclarativenotifier.cpp b/src/declarative/qml/qdeclarativenotifier.cpp index b12bf77..8c946f8 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 2a9660d..0781caf 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 84c9bef..d3ee67b 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 #include diff --git a/src/declarative/qml/qdeclarativeobjectscriptclass_p.h b/src/declarative/qml/qdeclarativeobjectscriptclass_p.h index 396b782..8941ae0 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 #include diff --git a/src/declarative/qml/qdeclarativeparser.cpp b/src/declarative/qml/qdeclarativeparser.cpp index 6e6080e..69186b6 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 f432024..fd3e22f 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 #include diff --git a/src/declarative/qml/qdeclarativeproperty.cpp b/src/declarative/qml/qdeclarativeproperty.cpp index caa1acf..affb6b9 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 #include diff --git a/src/declarative/qml/qdeclarativeproperty_p.h b/src/declarative/qml/qdeclarativeproperty_p.h index 1bbee64..420a1ba 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 diff --git a/src/declarative/qml/qdeclarativepropertycache.cpp b/src/declarative/qml/qdeclarativepropertycache.cpp index fea59e5..111259d 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 Q_DECLARE_METATYPE(QScriptValue); diff --git a/src/declarative/qml/qdeclarativepropertycache_p.h b/src/declarative/qml/qdeclarativepropertycache_p.h index bfbeff4..6b64a96 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 diff --git a/src/declarative/qml/qdeclarativeproxymetaobject.cpp b/src/declarative/qml/qdeclarativeproxymetaobject.cpp index 1decea1..fe0dce7 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 diff --git a/src/declarative/qml/qdeclarativeproxymetaobject_p.h b/src/declarative/qml/qdeclarativeproxymetaobject_p.h index 3f103b6..3daa22f 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 diff --git a/src/declarative/qml/qdeclarativerefcount.cpp b/src/declarative/qml/qdeclarativerefcount.cpp index 943e35c..351fcf3 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 afc6e63..3d40e77 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 diff --git a/src/declarative/qml/qdeclarativescriptparser.cpp b/src/declarative/qml/qdeclarativescriptparser.cpp index 2b9cd4b..cba5bb9 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 #include diff --git a/src/declarative/qml/qdeclarativescriptparser_p.h b/src/declarative/qml/qdeclarativescriptparser_p.h index 68f1840..28e960b 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 #include diff --git a/src/declarative/qml/qdeclarativesqldatabase.cpp b/src/declarative/qml/qdeclarativesqldatabase.cpp index 37d2d5b..45f277e 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 #include diff --git a/src/declarative/qml/qdeclarativestringconverters.cpp b/src/declarative/qml/qdeclarativestringconverters.cpp index f3497e5..5c88b9a 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 #include diff --git a/src/declarative/qml/qdeclarativetypenamecache.cpp b/src/declarative/qml/qdeclarativetypenamecache.cpp index c4a8707..ea32aa0 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 3e24f5c..afd2fd9 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 diff --git a/src/declarative/qml/qdeclarativetypenamescriptclass.cpp b/src/declarative/qml/qdeclarativetypenamescriptclass.cpp index 02370e0..9cac3e1 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 b6e3f51..8e07f02 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 diff --git a/src/declarative/qml/qdeclarativevaluetype.cpp b/src/declarative/qml/qdeclarativevaluetype.cpp index 00e6704..839e0dd 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 diff --git a/src/declarative/qml/qdeclarativevaluetype_p.h b/src/declarative/qml/qdeclarativevaluetype_p.h index ad2f6c4..1fe8bd2 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 #include diff --git a/src/declarative/qml/qdeclarativevaluetypescriptclass.cpp b/src/declarative/qml/qdeclarativevaluetypescriptclass.cpp index a567c38..f7902b9 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 2338bc3..5ba7f9b 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 diff --git a/src/declarative/qml/qdeclarativevme_p.h b/src/declarative/qml/qdeclarativevme_p.h index 1c6fd3c..87a1aab 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 #include diff --git a/src/declarative/qml/qdeclarativevmemetaobject.cpp b/src/declarative/qml/qdeclarativevmemetaobject.cpp index 9a7bdd6..2644ecf 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 839f0cd..f13dd34 100644 --- a/src/declarative/qml/qdeclarativevmemetaobject_p.h +++ b/src/declarative/qml/qdeclarativevmemetaobject_p.h @@ -65,9 +65,9 @@ #include -#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 2f61195..9ea84b8 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 628681f..ddb0ece 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 #include diff --git a/src/declarative/qml/qdeclarativexmlhttprequest.cpp b/src/declarative/qml/qdeclarativexmlhttprequest.cpp index 58e67fa..be2a1a7 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 #include diff --git a/src/declarative/qml/qmetaobjectbuilder.cpp b/src/declarative/qml/qmetaobjectbuilder.cpp index a518b03..6e4d7b8 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 diff --git a/src/declarative/qml/rewriter/rewriter.cpp b/src/declarative/qml/rewriter/rewriter.cpp index b458a8d..6d2ccfb 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 diff --git a/src/declarative/qml/rewriter/rewriter_p.h b/src/declarative/qml/rewriter/rewriter_p.h index d1445d8..4799469 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 diff --git a/src/declarative/qml/rewriter/textwriter.cpp b/src/declarative/qml/rewriter/textwriter.cpp index e63d24c..619f5c9 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 ba1444e..33ddb46 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 #include diff --git a/src/declarative/util/qdeclarativeanimation_p.h b/src/declarative/util/qdeclarativeanimation_p.h index f620786..c839c2c 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 #include diff --git a/src/declarative/util/qdeclarativeanimation_p_p.h b/src/declarative/util/qdeclarativeanimation_p_p.h index 8bcbeff..3b0f52e 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 #include diff --git a/src/declarative/util/qdeclarativebehavior.cpp b/src/declarative/util/qdeclarativebehavior.cpp index 87d6836..a6c578e 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 #include diff --git a/src/declarative/util/qdeclarativebehavior_p.h b/src/declarative/util/qdeclarativebehavior_p.h index ff58210..e8a809f 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 #include diff --git a/src/declarative/util/qdeclarativebind.cpp b/src/declarative/util/qdeclarativebind.cpp index 26baa38..b7bd4e8 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 #include diff --git a/src/declarative/util/qdeclarativeconnections.cpp b/src/declarative/util/qdeclarativeconnections.cpp index 0b9e3ab..596b306 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 #include diff --git a/src/declarative/util/qdeclarativefontloader.cpp b/src/declarative/util/qdeclarativefontloader.cpp index bf98d40..b577b81 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 #include diff --git a/src/declarative/util/qdeclarativelistaccessor.cpp b/src/declarative/util/qdeclarativelistaccessor.cpp index 4e56909..4ac587f 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 diff --git a/src/declarative/util/qdeclarativelistmodel.cpp b/src/declarative/util/qdeclarativelistmodel.cpp index 13662c5..ec23bb2 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 #include diff --git a/src/declarative/util/qdeclarativelistmodel_p_p.h b/src/declarative/util/qdeclarativelistmodel_p_p.h index 8041561..532eefa 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 0e38632..3c0a086 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 diff --git a/src/declarative/util/qdeclarativeopenmetaobject.cpp b/src/declarative/util/qdeclarativeopenmetaobject.cpp index 6611885..3d95125 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 #include diff --git a/src/declarative/util/qdeclarativepackage.cpp b/src/declarative/util/qdeclarativepackage.cpp index d144777..ac0788f 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 #include diff --git a/src/declarative/util/qdeclarativepixmapcache.cpp b/src/declarative/util/qdeclarativepixmapcache.cpp index 1da929e..e57d3c2 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 6ceec5d..e7228cc 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 #include diff --git a/src/declarative/util/qdeclarativepropertychanges_p.h b/src/declarative/util/qdeclarativepropertychanges_p.h index 1274b0c..c2ed466 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 QT_BEGIN_HEADER diff --git a/src/declarative/util/qdeclarativepropertymap.cpp b/src/declarative/util/qdeclarativepropertymap.cpp index 0bdd91b..0e477b1 100644 --- a/src/declarative/util/qdeclarativepropertymap.cpp +++ b/src/declarative/util/qdeclarativepropertymap.cpp @@ -42,7 +42,7 @@ #include "qdeclarativepropertymap.h" #include -#include "qdeclarativeopenmetaobject_p.h" +#include "private/qdeclarativeopenmetaobject_p.h" #include diff --git a/src/declarative/util/qdeclarativesmoothedanimation.cpp b/src/declarative/util/qdeclarativesmoothedanimation.cpp index b3a9b9a..3411642 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 -#include "qdeclarativeproperty_p.h" +#include "private/qdeclarativeproperty_p.h" -#include "qdeclarativeglobal_p.h" +#include "private/qdeclarativeglobal_p.h" #include diff --git a/src/declarative/util/qdeclarativesmoothedanimation_p.h b/src/declarative/util/qdeclarativesmoothedanimation_p.h index 50ed00c..df53104 100644 --- a/src/declarative/util/qdeclarativesmoothedanimation_p.h +++ b/src/declarative/util/qdeclarativesmoothedanimation_p.h @@ -43,7 +43,7 @@ #define QDECLARATIVESMOOTHEDANIMATION_H #include -#include "qdeclarativeanimation_p.h" +#include "private/qdeclarativeanimation_p.h" #include diff --git a/src/declarative/util/qdeclarativesmoothedanimation_p_p.h b/src/declarative/util/qdeclarativesmoothedanimation_p_p.h index bdceeb3..81cd229 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 diff --git a/src/declarative/util/qdeclarativespringfollow.cpp b/src/declarative/util/qdeclarativespringfollow.cpp index 063c3df..c42261d 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 diff --git a/src/declarative/util/qdeclarativestate.cpp b/src/declarative/util/qdeclarativestate.cpp index 802ff1c..5e6c35e 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 #include diff --git a/src/declarative/util/qdeclarativestate_p_p.h b/src/declarative/util/qdeclarativestate_p_p.h index 558c99b..4a2af0f 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 #include diff --git a/src/declarative/util/qdeclarativestategroup.cpp b/src/declarative/util/qdeclarativestategroup.cpp index 258a9e9..ff78c60 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 #include diff --git a/src/declarative/util/qdeclarativestategroup_p.h b/src/declarative/util/qdeclarativestategroup_p.h index 9650199..cac23f4 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 3469136..2cc1fcc 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 #include diff --git a/src/declarative/util/qdeclarativestateoperations_p.h b/src/declarative/util/qdeclarativestateoperations_p.h index c97b2da..d49ec63 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 #include diff --git a/src/declarative/util/qdeclarativestyledtext.cpp b/src/declarative/util/qdeclarativestyledtext.cpp index 461de12..babd71b 100644 --- a/src/declarative/util/qdeclarativestyledtext.cpp +++ b/src/declarative/util/qdeclarativestyledtext.cpp @@ -45,7 +45,7 @@ #include #include #include -#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 d819c27..9bb3f69 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 diff --git a/src/declarative/util/qdeclarativetimeline.cpp b/src/declarative/util/qdeclarativetimeline.cpp index 8e133b6..656c62b 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 #include diff --git a/src/declarative/util/qdeclarativetimer.cpp b/src/declarative/util/qdeclarativetimer.cpp index 104e3ae..76e6d5e 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 #include diff --git a/src/declarative/util/qdeclarativetransition.cpp b/src/declarative/util/qdeclarativetransition.cpp index 1e8be7f..815dc4c 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 diff --git a/src/declarative/util/qdeclarativetransition_p.h b/src/declarative/util/qdeclarativetransition_p.h index 2f9e7b5..fc7a577 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 diff --git a/src/declarative/util/qdeclarativetransitionmanager.cpp b/src/declarative/util/qdeclarativetransitionmanager.cpp index f07fb23..bc40377 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 #include diff --git a/src/declarative/util/qdeclarativetransitionmanager_p_p.h b/src/declarative/util/qdeclarativetransitionmanager_p_p.h index d6e626e..4131391 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 7f2f64a..d4c72bd 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 diff --git a/src/declarative/util/qdeclarativexmllistmodel.cpp b/src/declarative/util/qdeclarativexmllistmodel.cpp index efc614b..b33af06 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 #include -- cgit v0.12