From 7fa3aa4d48c3b7d9bf17b6135bc6bdeb62e899d2 Mon Sep 17 00:00:00 2001 From: Kent Hansen Date: Wed, 12 Oct 2011 08:26:22 +0200 Subject: [PATCH] Clean up declarative includes MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit (This commit is in preparation of moving several files to a separate library (QtQuick2).) Don't add all subfolders to the includepath (from the .pri files). There's no good reason to do that. For headers (both public and private) that are in the same folder as the file that includes them, prefer to use #include "foo.h" #include "bar_p.h" For public headers that are outside the current folder but have "unambiguous" names (e.g. qdeclarative prefix), use #include For private headers that are outside the current folder, use #include Also change #include to #include The header filenames already have a qdeclarative or qsg prefix; there's no need to prefix by module name to disambiguate. Finally, #include "private/foo_p.h" should be avoided. private/ is used for auto-generated (forwarding) headers, which never reside in the current (source) directory. Use angle brackets instead. Change-Id: I04f8477fdba043546064ee276475c09dc373f8f2 Reviewed-by: Jędrzej Nowacki --- src/declarative/debugger/debugger.pri | 2 - .../debugger/qdeclarativedebugclient.cpp | 4 +- .../debugger/qdeclarativedebuggerstatus.cpp | 2 +- .../debugger/qdeclarativedebughelper.cpp | 2 +- .../debugger/qdeclarativedebugserver.cpp | 8 ++-- .../debugger/qdeclarativedebugserverconnection_p.h | 2 +- .../debugger/qdeclarativedebugservice.cpp | 6 +- .../debugger/qdeclarativeenginedebug.cpp | 6 +- .../debugger/qdeclarativeenginedebugservice.cpp | 26 +++++----- .../debugger/qdeclarativeinspectorinterface_p.h | 2 +- .../debugger/qdeclarativeinspectorservice.cpp | 4 +- .../debugger/qdeclarativeinspectorservice_p.h | 2 +- src/declarative/debugger/qpacketprotocol.cpp | 2 +- src/declarative/debugger/qv8debugservice.cpp | 6 +- src/declarative/debugger/qv8debugservice_p.h | 2 +- src/declarative/debugger/qv8profilerservice.cpp | 5 +- src/declarative/debugger/qv8profilerservice_p.h | 2 +- src/declarative/designer/designersupport.cpp | 12 +++--- src/declarative/items/context2d/context2d.pri | 2 - src/declarative/items/context2d/qsgcanvasitem.cpp | 8 ++-- src/declarative/items/context2d/qsgcanvasitem_p.h | 2 +- src/declarative/items/context2d/qsgcontext2d.cpp | 18 ++++---- .../items/context2d/qsgcontext2dcommandbuffer.cpp | 2 +- .../items/context2d/qsgcontext2dcommandbuffer_p.h | 2 +- .../items/context2d/qsgcontext2dnode_p.h | 4 +- .../items/context2d/qsgcontext2dtexture.cpp | 4 +- .../items/context2d/qsgcontext2dtexture_p.h | 2 +- src/declarative/items/items.pri | 2 - src/declarative/items/qsganimation.cpp | 4 +- src/declarative/items/qsgimplicitsizeitem.cpp | 4 +- src/declarative/items/qsgimplicitsizeitem_p_p.h | 6 +- src/declarative/items/qsgitemsmodule.cpp | 6 +- src/declarative/items/qsgloader_p_p.h | 2 +- src/declarative/items/qsgshadereffect.cpp | 4 +- src/declarative/items/qsgtextinput.cpp | 2 +- src/declarative/items/qsgtextnode_p.h | 2 +- src/declarative/items/qsgview_p.h | 3 +- src/declarative/items/qsgvisualadaptormodel_p.h | 2 +- src/declarative/particles/particles.pri | 2 - src/declarative/particles/qsgcustomparticle_p.h | 2 +- src/declarative/particles/qsggroupgoal.cpp | 4 +- src/declarative/particles/qsgimageparticle.cpp | 4 +- src/declarative/particles/qsgitemparticle.cpp | 2 +- src/declarative/particles/qsgparticlegroup_p.h | 2 +- src/declarative/particles/qsgparticlesystem.cpp | 4 +- src/declarative/particles/qsgparticlesystem_p.h | 2 +- src/declarative/particles/qsgspritegoal.cpp | 4 +- src/declarative/qml/ftw/ftw.pri | 2 - src/declarative/qml/parser/parser.pri | 2 - src/declarative/qml/qdeclarativebinding.cpp | 14 +++--- src/declarative/qml/qdeclarativebinding_p.h | 2 +- src/declarative/qml/qdeclarativebinding_p_p.h | 4 +- src/declarative/qml/qdeclarativeboundsignal.cpp | 18 ++++---- src/declarative/qml/qdeclarativecleanup.cpp | 4 +- src/declarative/qml/qdeclarativecompileddata.cpp | 8 ++-- src/declarative/qml/qdeclarativecompiler.cpp | 34 +++++++------- src/declarative/qml/qdeclarativecompiler_p.h | 18 ++++---- src/declarative/qml/qdeclarativecomponent.cpp | 28 ++++++------ src/declarative/qml/qdeclarativecomponent_p.h | 10 ++-- src/declarative/qml/qdeclarativecontext.cpp | 12 +++--- src/declarative/qml/qdeclarativecontext_p.h | 12 +++--- src/declarative/qml/qdeclarativecustomparser.cpp | 6 +- src/declarative/qml/qdeclarativecustomparser_p.h | 6 +- src/declarative/qml/qdeclarativecustomparser_p_p.h | 4 +- src/declarative/qml/qdeclarativedirparser.cpp | 4 +- src/declarative/qml/qdeclarativeengine.cpp | 40 ++++++++-------- src/declarative/qml/qdeclarativeengine_p.h | 20 ++++---- src/declarative/qml/qdeclarativeexpression.cpp | 12 +++--- src/declarative/qml/qdeclarativefastproperties.cpp | 6 +- src/declarative/qml/qdeclarativeimport.cpp | 2 +- src/declarative/qml/qdeclarativeincubator.cpp | 4 +- src/declarative/qml/qdeclarativeinfo.cpp | 8 ++-- src/declarative/qml/qdeclarativeinstruction.cpp | 4 +- src/declarative/qml/qdeclarativeintegercache.cpp | 2 +- src/declarative/qml/qdeclarativeintegercache_p.h | 4 +- src/declarative/qml/qdeclarativelist.cpp | 6 +- src/declarative/qml/qdeclarativelist_p.h | 2 +- src/declarative/qml/qdeclarativemetatype.cpp | 2 +- src/declarative/qml/qdeclarativenotifier.cpp | 4 +- src/declarative/qml/qdeclarativenotifier_p.h | 4 +- src/declarative/qml/qdeclarativeproperty.cpp | 22 +++++----- src/declarative/qml/qdeclarativepropertycache.cpp | 8 ++-- src/declarative/qml/qdeclarativepropertycache_p.h | 8 ++-- .../qml/qdeclarativeproxymetaobject.cpp | 4 +- src/declarative/qml/qdeclarativerewrite.cpp | 4 +- src/declarative/qml/qdeclarativescript.cpp | 4 +- src/declarative/qml/qdeclarativesqldatabase.cpp | 7 +-- .../qml/qdeclarativestringconverters.cpp | 2 +- src/declarative/qml/qdeclarativetypenamecache.cpp | 4 +- src/declarative/qml/qdeclarativetypenamecache_p.h | 6 +- src/declarative/qml/qdeclarativevaluetype.cpp | 6 +- src/declarative/qml/qdeclarativevaluetype_p.h | 4 +- src/declarative/qml/qdeclarativevme.cpp | 34 +++++++------- src/declarative/qml/qdeclarativevme_p.h | 6 +- src/declarative/qml/qdeclarativevmemetaobject.cpp | 10 ++-- src/declarative/qml/qdeclarativevmemetaobject_p.h | 8 ++-- src/declarative/qml/qdeclarativewatcher.cpp | 8 ++-- src/declarative/qml/qdeclarativeworkerscript.cpp | 10 ++-- src/declarative/qml/qdeclarativexmlhttprequest.cpp | 12 +++--- src/declarative/qml/qml.pri | 1 - src/declarative/qml/rewriter/rewriter.pri | 2 - src/declarative/qml/rewriter/textwriter.cpp | 2 +- src/declarative/qml/v4/qv4bindings.cpp | 8 ++-- src/declarative/qml/v4/qv4ir_p.h | 2 +- src/declarative/qml/v4/v4.pri | 2 - src/declarative/qml/v8/qjsvalueiterator_impl_p.h | 6 +- src/declarative/qml/v8/qv8bindings_p.h | 6 +- src/declarative/qml/v8/qv8variantwrapper.cpp | 2 +- src/declarative/qml/v8/script.pri | 3 - src/declarative/qml/v8/v8.pri | 1 - src/declarative/scenegraph/coreapi/qsgrenderer.cpp | 2 +- .../scenegraph/qsgdistancefieldglyphnode_p.h | 2 +- src/declarative/scenegraph/scenegraph.pri | 1 - .../scenegraph/util/qsgtextureprovider.cpp | 4 +- src/declarative/util/qdeclarativeanimation.cpp | 22 +++++----- src/declarative/util/qdeclarativeanimation_p.h | 4 +- src/declarative/util/qdeclarativeanimation_p_p.h | 6 +- src/declarative/util/qdeclarativebehavior.cpp | 12 +++--- src/declarative/util/qdeclarativebehavior_p.h | 2 +- src/declarative/util/qdeclarativebind.cpp | 10 ++-- src/declarative/util/qdeclarativeconnections.cpp | 8 ++-- src/declarative/util/qdeclarativefontloader.cpp | 2 +- src/declarative/util/qdeclarativelistaccessor.cpp | 6 +- src/declarative/util/qdeclarativelistmodel.cpp | 16 +++--- src/declarative/util/qdeclarativelistmodel_p_p.h | 8 ++-- .../util/qdeclarativelistmodelworkeragent.cpp | 10 ++-- .../util/qdeclarativelistmodelworkeragent_p.h | 2 +- .../util/qdeclarativeopenmetaobject.cpp | 6 +- src/declarative/util/qdeclarativepackage.cpp | 2 +- src/declarative/util/qdeclarativepath.cpp | 6 +- src/declarative/util/qdeclarativepath_p.h | 2 +- src/declarative/util/qdeclarativepath_p_p.h | 2 +- .../util/qdeclarativepathinterpolator.cpp | 2 +- src/declarative/util/qdeclarativepixmapcache.cpp | 6 +- .../util/qdeclarativepropertychanges.cpp | 24 +++++----- .../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 +- .../util/qdeclarativespringanimation.cpp | 6 +- .../util/qdeclarativespringanimation_p.h | 2 +- src/declarative/util/qdeclarativestate.cpp | 18 ++++---- src/declarative/util/qdeclarativestate_p_p.h | 6 +- src/declarative/util/qdeclarativestategroup.cpp | 10 ++-- src/declarative/util/qdeclarativestategroup_p.h | 2 +- .../util/qdeclarativestateoperations.cpp | 14 +++--- .../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 | 12 +++--- .../util/qdeclarativetransitionmanager_p_p.h | 2 +- src/declarative/util/qdeclarativeutilmodule.cpp | 48 ++++++++++---------- src/declarative/util/qdeclarativexmllistmodel.cpp | 4 +- src/declarative/util/qlistmodelinterface.cpp | 2 +- src/declarative/util/util.pri | 2 - 160 files changed, 514 insertions(+), 541 deletions(-) diff --git a/src/declarative/debugger/debugger.pri b/src/declarative/debugger/debugger.pri index 7bfb5a1..5bc0a2d 100644 --- a/src/declarative/debugger/debugger.pri +++ b/src/declarative/debugger/debugger.pri @@ -1,5 +1,3 @@ -INCLUDEPATH += $$PWD - SOURCES += \ $$PWD/qdeclarativedebuggerstatus.cpp \ $$PWD/qpacketprotocol.cpp \ diff --git a/src/declarative/debugger/qdeclarativedebugclient.cpp b/src/declarative/debugger/qdeclarativedebugclient.cpp index 606ad2d..5018e95 100644 --- a/src/declarative/debugger/qdeclarativedebugclient.cpp +++ b/src/declarative/debugger/qdeclarativedebugclient.cpp @@ -39,9 +39,9 @@ ** ****************************************************************************/ -#include "private/qdeclarativedebugclient_p.h" +#include "qdeclarativedebugclient_p.h" -#include "private/qpacketprotocol_p.h" +#include "qpacketprotocol_p.h" #include #include diff --git a/src/declarative/debugger/qdeclarativedebuggerstatus.cpp b/src/declarative/debugger/qdeclarativedebuggerstatus.cpp index 609e144..4f016b4 100644 --- a/src/declarative/debugger/qdeclarativedebuggerstatus.cpp +++ b/src/declarative/debugger/qdeclarativedebuggerstatus.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include "private/qdeclarativedebuggerstatus_p.h" +#include "qdeclarativedebuggerstatus_p.h" QT_BEGIN_NAMESPACE diff --git a/src/declarative/debugger/qdeclarativedebughelper.cpp b/src/declarative/debugger/qdeclarativedebughelper.cpp index cbe4a85..c91802d 100644 --- a/src/declarative/debugger/qdeclarativedebughelper.cpp +++ b/src/declarative/debugger/qdeclarativedebughelper.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include "private/qdeclarativedebughelper_p.h" +#include "qdeclarativedebughelper_p.h" #include #include diff --git a/src/declarative/debugger/qdeclarativedebugserver.cpp b/src/declarative/debugger/qdeclarativedebugserver.cpp index eeb000b..5a888c7 100644 --- a/src/declarative/debugger/qdeclarativedebugserver.cpp +++ b/src/declarative/debugger/qdeclarativedebugserver.cpp @@ -39,10 +39,10 @@ ** ****************************************************************************/ -#include "private/qdeclarativedebugserver_p.h" -#include "private/qdeclarativedebugservice_p.h" -#include "private/qdeclarativedebugservice_p_p.h" -#include "private/qdeclarativeengine_p.h" +#include "qdeclarativedebugserver_p.h" +#include "qdeclarativedebugservice_p.h" +#include "qdeclarativedebugservice_p_p.h" +#include #include #include diff --git a/src/declarative/debugger/qdeclarativedebugserverconnection_p.h b/src/declarative/debugger/qdeclarativedebugserverconnection_p.h index 832224e..a3e439d 100644 --- a/src/declarative/debugger/qdeclarativedebugserverconnection_p.h +++ b/src/declarative/debugger/qdeclarativedebugserverconnection_p.h @@ -42,7 +42,7 @@ #ifndef QDECLARATIVEDEBUGSERVERCONNECTION_H #define QDECLARATIVEDEBUGSERVERCONNECTION_H -#include +#include // // W A R N I N G diff --git a/src/declarative/debugger/qdeclarativedebugservice.cpp b/src/declarative/debugger/qdeclarativedebugservice.cpp index ecd9e0f..be60ea4 100644 --- a/src/declarative/debugger/qdeclarativedebugservice.cpp +++ b/src/declarative/debugger/qdeclarativedebugservice.cpp @@ -39,9 +39,9 @@ ** ****************************************************************************/ -#include "private/qdeclarativedebugservice_p.h" -#include "private/qdeclarativedebugservice_p_p.h" -#include "private/qdeclarativedebugserver_p.h" +#include "qdeclarativedebugservice_p.h" +#include "qdeclarativedebugservice_p_p.h" +#include "qdeclarativedebugserver_p.h" #include #include diff --git a/src/declarative/debugger/qdeclarativeenginedebug.cpp b/src/declarative/debugger/qdeclarativeenginedebug.cpp index 237e2d6..537e1e6 100644 --- a/src/declarative/debugger/qdeclarativeenginedebug.cpp +++ b/src/declarative/debugger/qdeclarativeenginedebug.cpp @@ -39,11 +39,11 @@ ** ****************************************************************************/ -#include "private/qdeclarativeenginedebug_p.h" +#include "qdeclarativeenginedebug_p.h" -#include "private/qdeclarativedebugclient_p.h" +#include "qdeclarativedebugclient_p.h" -#include +#include "qdeclarativeenginedebugservice_p.h" #include diff --git a/src/declarative/debugger/qdeclarativeenginedebugservice.cpp b/src/declarative/debugger/qdeclarativeenginedebugservice.cpp index 9ba99af..7fa577d 100644 --- a/src/declarative/debugger/qdeclarativeenginedebugservice.cpp +++ b/src/declarative/debugger/qdeclarativeenginedebugservice.cpp @@ -39,20 +39,20 @@ ** ****************************************************************************/ -#include "private/qdeclarativeenginedebugservice_p.h" - -#include "private/qdeclarativeboundsignal_p.h" -#include "qdeclarativeengine.h" -#include "private/qdeclarativemetatype_p.h" -#include "qdeclarativeproperty.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 "private/qdeclarativevmemetaobject_p.h" -#include "private/qdeclarativeexpression_p.h" -#include "private/qdeclarativepropertychanges_p.h" +#include "qdeclarativeenginedebugservice_p.h" + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/src/declarative/debugger/qdeclarativeinspectorinterface_p.h b/src/declarative/debugger/qdeclarativeinspectorinterface_p.h index d0d9f44..d4cd783 100644 --- a/src/declarative/debugger/qdeclarativeinspectorinterface_p.h +++ b/src/declarative/debugger/qdeclarativeinspectorinterface_p.h @@ -53,7 +53,7 @@ // We mean it. // -#include +#include QT_BEGIN_HEADER diff --git a/src/declarative/debugger/qdeclarativeinspectorservice.cpp b/src/declarative/debugger/qdeclarativeinspectorservice.cpp index f1ae354..d19cae7 100644 --- a/src/declarative/debugger/qdeclarativeinspectorservice.cpp +++ b/src/declarative/debugger/qdeclarativeinspectorservice.cpp @@ -39,8 +39,8 @@ ** ****************************************************************************/ -#include "private/qdeclarativeinspectorservice_p.h" -#include "private/qdeclarativeinspectorinterface_p.h" +#include "qdeclarativeinspectorservice_p.h" +#include "qdeclarativeinspectorinterface_p.h" #include #include diff --git a/src/declarative/debugger/qdeclarativeinspectorservice_p.h b/src/declarative/debugger/qdeclarativeinspectorservice_p.h index 98b2e9d..c660fb4 100644 --- a/src/declarative/debugger/qdeclarativeinspectorservice_p.h +++ b/src/declarative/debugger/qdeclarativeinspectorservice_p.h @@ -53,7 +53,7 @@ // We mean it. // -#include "private/qdeclarativedebugservice_p.h" +#include "qdeclarativedebugservice_p.h" #include #include diff --git a/src/declarative/debugger/qpacketprotocol.cpp b/src/declarative/debugger/qpacketprotocol.cpp index 9b95d06..3abb369 100644 --- a/src/declarative/debugger/qpacketprotocol.cpp +++ b/src/declarative/debugger/qpacketprotocol.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include "private/qpacketprotocol_p.h" +#include "qpacketprotocol_p.h" #include #include diff --git a/src/declarative/debugger/qv8debugservice.cpp b/src/declarative/debugger/qv8debugservice.cpp index 157bb8c..ecdf597 100644 --- a/src/declarative/debugger/qv8debugservice.cpp +++ b/src/declarative/debugger/qv8debugservice.cpp @@ -41,9 +41,9 @@ #include "qv8debugservice_p.h" #include "qdeclarativedebugservice_p_p.h" -#include "qv8debug_p.h" -#include "qv8engine_p.h" -#include "qdeclarativeengine_p.h" +#include +#include +#include #include #include diff --git a/src/declarative/debugger/qv8debugservice_p.h b/src/declarative/debugger/qv8debugservice_p.h index 861e5f5..d8101ae 100644 --- a/src/declarative/debugger/qv8debugservice_p.h +++ b/src/declarative/debugger/qv8debugservice_p.h @@ -53,7 +53,7 @@ // We mean it. // -#include "private/qdeclarativedebugservice_p.h" +#include "qdeclarativedebugservice_p.h" QT_BEGIN_HEADER diff --git a/src/declarative/debugger/qv8profilerservice.cpp b/src/declarative/debugger/qv8profilerservice.cpp index 9195729..92a1916 100644 --- a/src/declarative/debugger/qv8profilerservice.cpp +++ b/src/declarative/debugger/qv8profilerservice.cpp @@ -41,9 +41,8 @@ #include "qv8profilerservice_p.h" #include "qdeclarativedebugservice_p_p.h" -#include "qdeclarativeengine_p.h" -#include "private/qv8profiler_p.h" -#include "qjsconverter_p.h" +#include +#include #include diff --git a/src/declarative/debugger/qv8profilerservice_p.h b/src/declarative/debugger/qv8profilerservice_p.h index 1e912d0..ea5119c 100644 --- a/src/declarative/debugger/qv8profilerservice_p.h +++ b/src/declarative/debugger/qv8profilerservice_p.h @@ -53,7 +53,7 @@ // We mean it. // -#include "private/qdeclarativedebugservice_p.h" +#include QT_BEGIN_HEADER diff --git a/src/declarative/designer/designersupport.cpp b/src/declarative/designer/designersupport.cpp index aaaeeb4..d582ed1 100644 --- a/src/declarative/designer/designersupport.cpp +++ b/src/declarative/designer/designersupport.cpp @@ -40,13 +40,13 @@ ****************************************************************************/ #include "designersupport.h" -#include "qsgitem_p.h" +#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include QT_BEGIN_NAMESPACE diff --git a/src/declarative/items/context2d/context2d.pri b/src/declarative/items/context2d/context2d.pri index 60fe28d..31ed75d 100644 --- a/src/declarative/items/context2d/context2d.pri +++ b/src/declarative/items/context2d/context2d.pri @@ -1,5 +1,3 @@ -INCLUDEPATH += $$PWD - SOURCES += \ $$PWD/qsgcanvasitem.cpp \ $$PWD/qsgcontext2d.cpp \ diff --git a/src/declarative/items/context2d/qsgcanvasitem.cpp b/src/declarative/items/context2d/qsgcanvasitem.cpp index 3445cf0..b3b4eab 100644 --- a/src/declarative/items/context2d/qsgcanvasitem.cpp +++ b/src/declarative/items/context2d/qsgcanvasitem.cpp @@ -39,16 +39,16 @@ ** ****************************************************************************/ -#include "private/qsgadaptationlayer_p.h" +#include #include "qsgcanvasitem_p.h" -#include "qsgitem_p.h" +#include #include "qsgcontext2d_p.h" #include "qsgcontext2dnode_p.h" #include "qsgcontext2dtexture_p.h" -#include "qdeclarativepixmapcache_p.h" +#include #include -#include "qdeclarativeengine_p.h" +#include #include QT_BEGIN_NAMESPACE diff --git a/src/declarative/items/context2d/qsgcanvasitem_p.h b/src/declarative/items/context2d/qsgcanvasitem_p.h index a2dfb79..131a3f5 100644 --- a/src/declarative/items/context2d/qsgcanvasitem_p.h +++ b/src/declarative/items/context2d/qsgcanvasitem_p.h @@ -42,7 +42,7 @@ #ifndef QSGCANVASITEM_P_H #define QSGCANVASITEM_P_H -#include "qsgitem.h" +#include #include QT_BEGIN_HEADER diff --git a/src/declarative/items/context2d/qsgcontext2d.cpp b/src/declarative/items/context2d/qsgcontext2d.cpp index a1248b8..e75713d 100644 --- a/src/declarative/items/context2d/qsgcontext2d.cpp +++ b/src/declarative/items/context2d/qsgcontext2d.cpp @@ -42,24 +42,24 @@ #include "qsgcontext2d_p.h" #include "qsgcontext2dcommandbuffer_p.h" #include "qsgcanvasitem_p.h" -#include "qsgitem_p.h" -#include "qsgshadereffectsource_p.h" +#include +#include #include #include -#include "private/qsgcontext_p.h" -#include "private/qdeclarativesvgparser_p.h" -#include "private/qdeclarativepath_p.h" +#include +#include +#include -#include "private/qsgimage_p_p.h" +#include #include #include #include -#include "qv8engine_p.h" +#include -#include "qdeclarativeengine.h" -#include "qv8domerrors_p.h" +#include +#include #include QT_BEGIN_NAMESPACE diff --git a/src/declarative/items/context2d/qsgcontext2dcommandbuffer.cpp b/src/declarative/items/context2d/qsgcontext2dcommandbuffer.cpp index dff4f9f..9dff4e8 100644 --- a/src/declarative/items/context2d/qsgcontext2dcommandbuffer.cpp +++ b/src/declarative/items/context2d/qsgcontext2dcommandbuffer.cpp @@ -41,7 +41,7 @@ #include "qsgcontext2dcommandbuffer_p.h" #include "qsgcanvasitem_p.h" -#include "qdeclarative.h" +#include #include #define HAS_SHADOW(offsetX, offsetY, blur, color) (color.isValid() && color.alpha() && (blur || offsetX || offsetY)) diff --git a/src/declarative/items/context2d/qsgcontext2dcommandbuffer_p.h b/src/declarative/items/context2d/qsgcontext2dcommandbuffer_p.h index 95d0e96..cab82e2 100644 --- a/src/declarative/items/context2d/qsgcontext2dcommandbuffer_p.h +++ b/src/declarative/items/context2d/qsgcontext2dcommandbuffer_p.h @@ -43,7 +43,7 @@ #define QSGCONTEXT2DCOMMANDBUFFER_P_H #include "qsgcontext2d_p.h" -#include "qdeclarativepixmapcache_p.h" +#include QT_BEGIN_HEADER diff --git a/src/declarative/items/context2d/qsgcontext2dnode_p.h b/src/declarative/items/context2d/qsgcontext2dnode_p.h index 957c14b..88c3619 100644 --- a/src/declarative/items/context2d/qsgcontext2dnode_p.h +++ b/src/declarative/items/context2d/qsgcontext2dnode_p.h @@ -42,8 +42,8 @@ #ifndef QSGCONTEXT2DNODE_P_H #define QSGCONTEXT2DNODE_P_H -#include "qsgnode.h" -#include "qsgtexturematerial.h" +#include +#include #include "qsgcanvasitem_p.h" #include "qsgcontext2dtexture_p.h" diff --git a/src/declarative/items/context2d/qsgcontext2dtexture.cpp b/src/declarative/items/context2d/qsgcontext2dtexture.cpp index 8e22ceb..a57a5e5 100644 --- a/src/declarative/items/context2d/qsgcontext2dtexture.cpp +++ b/src/declarative/items/context2d/qsgcontext2dtexture.cpp @@ -42,8 +42,8 @@ #include "qsgcontext2dtexture_p.h" #include "qsgcontext2dtile_p.h" #include "qsgcanvasitem_p.h" -#include "qsgitem_p.h" -#include "private/qsgtexture_p.h" +#include +#include #include "qsgcontext2dcommandbuffer_p.h" #include diff --git a/src/declarative/items/context2d/qsgcontext2dtexture_p.h b/src/declarative/items/context2d/qsgcontext2dtexture_p.h index 1555120..dbc383d 100644 --- a/src/declarative/items/context2d/qsgcontext2dtexture_p.h +++ b/src/declarative/items/context2d/qsgcontext2dtexture_p.h @@ -42,7 +42,7 @@ #ifndef QSGCONTEXT2DTEXTURE_P_H #define QSGCONTEXT2DTEXTURE_P_H -#include "qsgtexture.h" +#include #include "qsgcanvasitem_p.h" #include "qsgcontext2d_p.h" diff --git a/src/declarative/items/items.pri b/src/declarative/items/items.pri index 355a762..025f67a 100644 --- a/src/declarative/items/items.pri +++ b/src/declarative/items/items.pri @@ -1,5 +1,3 @@ -INCLUDEPATH += $$PWD - HEADERS += \ $$PWD/qsgevents_p_p.h \ $$PWD/qsgitemchangelistener_p.h \ diff --git a/src/declarative/items/qsganimation.cpp b/src/declarative/items/qsganimation.cpp index e57edbd..b0dc820 100644 --- a/src/declarative/items/qsganimation.cpp +++ b/src/declarative/items/qsganimation.cpp @@ -43,8 +43,8 @@ #include "qsganimation_p_p.h" #include "qsgstateoperations_p.h" -#include -#include +#include +#include #include #include diff --git a/src/declarative/items/qsgimplicitsizeitem.cpp b/src/declarative/items/qsgimplicitsizeitem.cpp index 34890d8..163b73b 100644 --- a/src/declarative/items/qsgimplicitsizeitem.cpp +++ b/src/declarative/items/qsgimplicitsizeitem.cpp @@ -39,8 +39,8 @@ ** ****************************************************************************/ -#include "private/qsgimplicitsizeitem_p.h" -#include "private/qsgimplicitsizeitem_p_p.h" +#include "qsgimplicitsizeitem_p.h" +#include "qsgimplicitsizeitem_p_p.h" QT_BEGIN_NAMESPACE diff --git a/src/declarative/items/qsgimplicitsizeitem_p_p.h b/src/declarative/items/qsgimplicitsizeitem_p_p.h index 30631de..3ddd69d 100644 --- a/src/declarative/items/qsgimplicitsizeitem_p_p.h +++ b/src/declarative/items/qsgimplicitsizeitem_p_p.h @@ -54,9 +54,9 @@ // We mean it. // -#include "private/qsgitem_p.h" -#include "private/qsgpainteditem_p.h" -#include "private/qsgimplicitsizeitem_p.h" +#include "qsgitem_p.h" +#include "qsgpainteditem_p.h" +#include "qsgimplicitsizeitem_p.h" QT_BEGIN_NAMESPACE diff --git a/src/declarative/items/qsgitemsmodule.cpp b/src/declarative/items/qsgitemsmodule.cpp index 5a99ef7..bb471dd 100644 --- a/src/declarative/items/qsgitemsmodule.cpp +++ b/src/declarative/items/qsgitemsmodule.cpp @@ -73,9 +73,9 @@ #include "qsganimation_p.h" #include #include -//#include "private/qsgpincharea_p.h" -#include "qsgcanvasitem_p.h" -#include "qsgcontext2d_p.h" +//#include +#include +#include #include "qsgsprite_p.h" #include "qsgspriteimage_p.h" #include "qsgdrag_p.h" diff --git a/src/declarative/items/qsgloader_p_p.h b/src/declarative/items/qsgloader_p_p.h index ea8c11d..36059ca 100644 --- a/src/declarative/items/qsgloader_p_p.h +++ b/src/declarative/items/qsgloader_p_p.h @@ -57,7 +57,7 @@ #include "qsgloader_p.h" #include "qsgimplicitsizeitem_p_p.h" #include "qsgitemchangelistener_p.h" -#include "qdeclarativeincubator.h" +#include #include diff --git a/src/declarative/items/qsgshadereffect.cpp b/src/declarative/items/qsgshadereffect.cpp index f4ad80e..81adf8d 100644 --- a/src/declarative/items/qsgshadereffect.cpp +++ b/src/declarative/items/qsgshadereffect.cpp @@ -49,8 +49,8 @@ #include #include "qsgcanvas.h" -#include -#include +#include "qsgimage_p.h" +#include "qsgshadereffectsource_p.h" #include #include diff --git a/src/declarative/items/qsgtextinput.cpp b/src/declarative/items/qsgtextinput.cpp index 3f1d95a..e6e2d21 100644 --- a/src/declarative/items/qsgtextinput.cpp +++ b/src/declarative/items/qsgtextinput.cpp @@ -49,7 +49,7 @@ #include #include #include -#include +#include "qsgtextnode_p.h" #include #include diff --git a/src/declarative/items/qsgtextnode_p.h b/src/declarative/items/qsgtextnode_p.h index b49a8a1..7a9462c 100644 --- a/src/declarative/items/qsgtextnode_p.h +++ b/src/declarative/items/qsgtextnode_p.h @@ -43,7 +43,7 @@ #define QSGTEXTNODE_P_H #include -#include +#include "qsgtext_p.h" #include #include diff --git a/src/declarative/items/qsgview_p.h b/src/declarative/items/qsgview_p.h index 3f8d69e..f2b962c 100644 --- a/src/declarative/items/qsgview_p.h +++ b/src/declarative/items/qsgview_p.h @@ -48,9 +48,8 @@ #include #include #include -#include #include -#include +#include "qsgcanvas_p.h" #include "qsgitemchangelistener_p.h" diff --git a/src/declarative/items/qsgvisualadaptormodel_p.h b/src/declarative/items/qsgvisualadaptormodel_p.h index bc9d388..43af78b 100644 --- a/src/declarative/items/qsgvisualadaptormodel_p.h +++ b/src/declarative/items/qsgvisualadaptormodel_p.h @@ -45,7 +45,7 @@ #include #include -#include +#include QT_BEGIN_HEADER diff --git a/src/declarative/particles/particles.pri b/src/declarative/particles/particles.pri index 4502cc4..a3a8c90 100644 --- a/src/declarative/particles/particles.pri +++ b/src/declarative/particles/particles.pri @@ -1,5 +1,3 @@ -INCLUDEPATH += $$PWD - HEADERS += \ $$PWD/qsgangledirection_p.h \ $$PWD/qsgcustomparticle_p.h \ diff --git a/src/declarative/particles/qsgcustomparticle_p.h b/src/declarative/particles/qsgcustomparticle_p.h index db3a788..99f63d5 100644 --- a/src/declarative/particles/qsgcustomparticle_p.h +++ b/src/declarative/particles/qsgcustomparticle_p.h @@ -42,7 +42,7 @@ #ifndef CUSTOM_PARTICLE_H #define CUSTOM_PARTICLE_H #include "qsgparticlepainter_p.h" -#include +#include #include QT_BEGIN_HEADER diff --git a/src/declarative/particles/qsggroupgoal.cpp b/src/declarative/particles/qsggroupgoal.cpp index 7f0b938..f380101 100644 --- a/src/declarative/particles/qsggroupgoal.cpp +++ b/src/declarative/particles/qsggroupgoal.cpp @@ -40,8 +40,8 @@ ****************************************************************************/ #include "qsggroupgoal_p.h" -#include "private/qsgspriteengine_p.h" -#include "private/qsgsprite_p.h" +#include +#include #include "qsgimageparticle_p.h" #include diff --git a/src/declarative/particles/qsgimageparticle.cpp b/src/declarative/particles/qsgimageparticle.cpp index d219fc3..02b3a7a 100644 --- a/src/declarative/particles/qsgimageparticle.cpp +++ b/src/declarative/particles/qsgimageparticle.cpp @@ -47,8 +47,8 @@ #include #include "qsgimageparticle_p.h" #include "qsgparticleemitter_p.h" -#include "qsgsprite_p.h" -#include "qsgspriteengine_p.h" +#include +#include #include #include #include diff --git a/src/declarative/particles/qsgitemparticle.cpp b/src/declarative/particles/qsgitemparticle.cpp index 19e64b2..20bd18d 100644 --- a/src/declarative/particles/qsgitemparticle.cpp +++ b/src/declarative/particles/qsgitemparticle.cpp @@ -40,7 +40,7 @@ ****************************************************************************/ #include "qsgitemparticle_p.h" -#include +#include #include #include #include diff --git a/src/declarative/particles/qsgparticlegroup_p.h b/src/declarative/particles/qsgparticlegroup_p.h index a809b63..26bed55 100644 --- a/src/declarative/particles/qsgparticlegroup_p.h +++ b/src/declarative/particles/qsgparticlegroup_p.h @@ -40,7 +40,7 @@ ****************************************************************************/ #ifndef QSGPARTICLEGROUP #define QSGPARTICLEGROUP -#include "qsgspriteengine_p.h" +#include #include "qsgparticlesystem_p.h" #include "qdeclarativeparserstatus.h" diff --git a/src/declarative/particles/qsgparticlesystem.cpp b/src/declarative/particles/qsgparticlesystem.cpp index fd4b75d..1d44988 100644 --- a/src/declarative/particles/qsgparticlesystem.cpp +++ b/src/declarative/particles/qsgparticlesystem.cpp @@ -44,8 +44,8 @@ #include "qsgparticleemitter_p.h" #include "qsgparticleaffector_p.h" #include "qsgparticlepainter_p.h" -#include "qsgspriteengine_p.h" -#include "qsgsprite_p.h" +#include +#include #include "qsgv8particledata_p.h" #include "qsgparticlegroup_p.h" diff --git a/src/declarative/particles/qsgparticlesystem_p.h b/src/declarative/particles/qsgparticlesystem_p.h index 0729727..c739954 100644 --- a/src/declarative/particles/qsgparticlesystem_p.h +++ b/src/declarative/particles/qsgparticlesystem_p.h @@ -48,7 +48,7 @@ #include #include #include -#include +#include #include #include #include //For QDeclarativeV8Handle diff --git a/src/declarative/particles/qsgspritegoal.cpp b/src/declarative/particles/qsgspritegoal.cpp index 1e8feec..12d985f 100644 --- a/src/declarative/particles/qsgspritegoal.cpp +++ b/src/declarative/particles/qsgspritegoal.cpp @@ -40,8 +40,8 @@ ****************************************************************************/ #include "qsgspritegoal_p.h" -#include "private/qsgspriteengine_p.h" -#include "private/qsgsprite_p.h" +#include +#include #include "qsgimageparticle_p.h" #include diff --git a/src/declarative/qml/ftw/ftw.pri b/src/declarative/qml/ftw/ftw.pri index 05ac36d..c775046 100644 --- a/src/declarative/qml/ftw/ftw.pri +++ b/src/declarative/qml/ftw/ftw.pri @@ -1,5 +1,3 @@ -INCLUDEPATH += $$PWD - HEADERS += \ $$PWD/qbitfield_p.h \ $$PWD/qintrusivelist_p.h \ diff --git a/src/declarative/qml/parser/parser.pri b/src/declarative/qml/parser/parser.pri index 4f1ff2f..3ae0a6d 100644 --- a/src/declarative/qml/parser/parser.pri +++ b/src/declarative/qml/parser/parser.pri @@ -1,5 +1,3 @@ -INCLUDEPATH += $$PWD - HEADERS += \ $$PWD/qdeclarativejsast_p.h \ $$PWD/qdeclarativejsastfwd_p.h \ diff --git a/src/declarative/qml/qdeclarativebinding.cpp b/src/declarative/qml/qdeclarativebinding.cpp index b84fe92..609057d 100644 --- a/src/declarative/qml/qdeclarativebinding.cpp +++ b/src/declarative/qml/qdeclarativebinding.cpp @@ -39,17 +39,17 @@ ** ****************************************************************************/ -#include "private/qdeclarativebinding_p.h" -#include "private/qdeclarativebinding_p_p.h" +#include "qdeclarativebinding_p.h" +#include "qdeclarativebinding_p_p.h" #include "qdeclarative.h" #include "qdeclarativecontext.h" #include "qdeclarativeinfo.h" -#include "private/qdeclarativecontext_p.h" -#include "private/qdeclarativecompiler_p.h" -#include "private/qdeclarativedata_p.h" -#include "private/qdeclarativestringconverters_p.h" -#include "private/qdeclarativedebugtrace_p.h" +#include "qdeclarativecontext_p.h" +#include "qdeclarativecompiler_p.h" +#include "qdeclarativedata_p.h" +#include "qdeclarativestringconverters_p.h" +#include #include #include diff --git a/src/declarative/qml/qdeclarativebinding_p.h b/src/declarative/qml/qdeclarativebinding_p.h index fc9dd87..6f545fc 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 "private/qdeclarativeproperty_p.h" +#include "qdeclarativeproperty_p.h" #include #include diff --git a/src/declarative/qml/qdeclarativebinding_p_p.h b/src/declarative/qml/qdeclarativebinding_p_p.h index 78c4e0e..c704919 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 "private/qdeclarativebinding_p.h" +#include "qdeclarativebinding_p.h" #include "qdeclarativeproperty.h" -#include "private/qdeclarativeexpression_p.h" +#include "qdeclarativeexpression_p.h" QT_BEGIN_NAMESPACE diff --git a/src/declarative/qml/qdeclarativeboundsignal.cpp b/src/declarative/qml/qdeclarativeboundsignal.cpp index 11dec91..6bbbb24 100644 --- a/src/declarative/qml/qdeclarativeboundsignal.cpp +++ b/src/declarative/qml/qdeclarativeboundsignal.cpp @@ -39,18 +39,18 @@ ** ****************************************************************************/ -#include "private/qdeclarativeboundsignal_p.h" +#include "qdeclarativeboundsignal_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 +#include "qdeclarativeengine_p.h" +#include "qdeclarativeexpression_p.h" +#include "qdeclarativecontext_p.h" +#include "qdeclarativemetatype_p.h" #include "qdeclarative.h" #include "qdeclarativecontext.h" -#include "private/qdeclarativeglobal_p.h" -#include "private/qdeclarativedebugtrace_p.h" -#include "private/qv8debugservice_p.h" +#include "qdeclarativeglobal_p.h" +#include +#include #include #include diff --git a/src/declarative/qml/qdeclarativecleanup.cpp b/src/declarative/qml/qdeclarativecleanup.cpp index d0d3687..da7930f 100644 --- a/src/declarative/qml/qdeclarativecleanup.cpp +++ b/src/declarative/qml/qdeclarativecleanup.cpp @@ -39,9 +39,9 @@ ** ****************************************************************************/ -#include "private/qdeclarativecleanup_p.h" +#include "qdeclarativecleanup_p.h" -#include "private/qdeclarativeengine_p.h" +#include "qdeclarativeengine_p.h" QT_BEGIN_NAMESPACE diff --git a/src/declarative/qml/qdeclarativecompileddata.cpp b/src/declarative/qml/qdeclarativecompileddata.cpp index 6815967..cc976de 100644 --- a/src/declarative/qml/qdeclarativecompileddata.cpp +++ b/src/declarative/qml/qdeclarativecompileddata.cpp @@ -39,14 +39,14 @@ ** ****************************************************************************/ -#include "private/qdeclarativecompiler_p.h" +#include "qdeclarativecompiler_p.h" #include "qdeclarativeengine.h" #include "qdeclarativecomponent.h" -#include "private/qdeclarativecomponent_p.h" +#include "qdeclarativecomponent_p.h" #include "qdeclarativecontext.h" -#include "private/qdeclarativecontext_p.h" +#include "qdeclarativecontext_p.h" #ifdef QML_THREADED_VME_INTERPRETER -#include "private/qdeclarativevme_p.h" +#include "qdeclarativevme_p.h" #endif #include diff --git a/src/declarative/qml/qdeclarativecompiler.cpp b/src/declarative/qml/qdeclarativecompiler.cpp index 32c6546..06d543a 100644 --- a/src/declarative/qml/qdeclarativecompiler.cpp +++ b/src/declarative/qml/qdeclarativecompiler.cpp @@ -39,29 +39,29 @@ ** ****************************************************************************/ -#include "private/qdeclarativecompiler_p.h" +#include "qdeclarativecompiler_p.h" #include "qdeclarativepropertyvaluesource.h" #include "qdeclarativecomponent.h" #include -#include "private/qfastmetabuilder_p.h" -#include "private/qdeclarativestringconverters_p.h" -#include "private/qdeclarativeengine_p.h" +#include +#include "qdeclarativestringconverters_p.h" +#include "qdeclarativeengine_p.h" #include "qdeclarativeengine.h" #include "qdeclarativecontext.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 "private/qdeclarativevmemetaobject_p.h" -#include "private/qdeclarativeexpression_p.h" -#include "private/qdeclarativeproperty_p.h" -#include "private/qdeclarativerewrite_p.h" +#include "qdeclarativemetatype_p.h" +#include "qdeclarativecustomparser_p_p.h" +#include "qdeclarativecontext_p.h" +#include "qdeclarativecomponent_p.h" +#include +#include "qdeclarativevmemetaobject_p.h" +#include "qdeclarativeexpression_p.h" +#include "qdeclarativeproperty_p.h" +#include "qdeclarativerewrite_p.h" #include "qdeclarativescriptstring.h" -#include "private/qdeclarativeglobal_p.h" -#include "private/qdeclarativebinding_p.h" -#include "private/qv4compiler_p.h" +#include "qdeclarativeglobal_p.h" +#include "qdeclarativebinding_p.h" +#include #include #include @@ -3027,7 +3027,7 @@ bool QDeclarativeCompiler::checkValidId(QDeclarativeScript::Value *v, const QStr return true; } -#include +#include static QStringList astNodeToStringList(QDeclarativeJS::AST::Node *node) { diff --git a/src/declarative/qml/qdeclarativecompiler_p.h b/src/declarative/qml/qdeclarativecompiler_p.h index 86471a6..ef37335 100644 --- a/src/declarative/qml/qdeclarativecompiler_p.h +++ b/src/declarative/qml/qdeclarativecompiler_p.h @@ -55,15 +55,15 @@ #include "qdeclarative.h" #include "qdeclarativeerror.h" -#include "private/qv8_p.h" -#include "private/qdeclarativeinstruction_p.h" -#include "private/qdeclarativescript_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 "private/qdeclarativetypeloader_p.h" +#include +#include "qdeclarativeinstruction_p.h" +#include "qdeclarativescript_p.h" +#include "qdeclarativeengine_p.h" +#include +#include "qdeclarativepropertycache_p.h" +#include "qdeclarativeintegercache_p.h" +#include "qdeclarativetypenamecache_p.h" +#include "qdeclarativetypeloader_p.h" #include #include diff --git a/src/declarative/qml/qdeclarativecomponent.cpp b/src/declarative/qml/qdeclarativecomponent.cpp index eafe853..580ce5b 100644 --- a/src/declarative/qml/qdeclarativecomponent.cpp +++ b/src/declarative/qml/qdeclarativecomponent.cpp @@ -40,25 +40,25 @@ ****************************************************************************/ #include "qdeclarativecomponent.h" -#include "private/qdeclarativecomponent_p.h" +#include "qdeclarativecomponent_p.h" -#include "private/qdeclarativecompiler_p.h" -#include "private/qdeclarativecontext_p.h" -#include "private/qdeclarativeengine_p.h" -#include "private/qdeclarativevme_p.h" +#include "qdeclarativecompiler_p.h" +#include "qdeclarativecontext_p.h" +#include "qdeclarativeengine_p.h" +#include "qdeclarativevme_p.h" #include "qdeclarative.h" #include "qdeclarativeengine.h" -#include "private/qdeclarativebinding_p.h" -#include "private/qdeclarativebinding_p_p.h" -#include "private/qdeclarativeglobal_p.h" -#include "private/qdeclarativescript_p.h" -#include "private/qdeclarativedebugtrace_p.h" -#include "private/qdeclarativeenginedebugservice_p.h" +#include "qdeclarativebinding_p.h" +#include "qdeclarativebinding_p_p.h" +#include "qdeclarativeglobal_p.h" +#include "qdeclarativescript_p.h" +#include +#include #include "qdeclarativeincubator.h" -#include "private/qdeclarativeincubator_p.h" +#include "qdeclarativeincubator_p.h" -#include "private/qv8engine_p.h" -#include "private/qv8include_p.h" +#include +#include #include #include diff --git a/src/declarative/qml/qdeclarativecomponent_p.h b/src/declarative/qml/qdeclarativecomponent_p.h index bbbf8bd..ea68291 100644 --- a/src/declarative/qml/qdeclarativecomponent_p.h +++ b/src/declarative/qml/qdeclarativecomponent_p.h @@ -55,11 +55,11 @@ #include "qdeclarativecomponent.h" -#include "private/qv8_p.h" -#include "private/qdeclarativeengine_p.h" -#include "private/qdeclarativetypeloader_p.h" -#include "private/qbitfield_p.h" -#include "private/qdeclarativevme_p.h" +#include +#include "qdeclarativeengine_p.h" +#include "qdeclarativetypeloader_p.h" +#include +#include "qdeclarativevme_p.h" #include "qdeclarativeerror.h" #include "qdeclarative.h" diff --git a/src/declarative/qml/qdeclarativecontext.cpp b/src/declarative/qml/qdeclarativecontext.cpp index fc5091e..d4662cf 100644 --- a/src/declarative/qml/qdeclarativecontext.cpp +++ b/src/declarative/qml/qdeclarativecontext.cpp @@ -40,15 +40,15 @@ ****************************************************************************/ #include "qdeclarativecontext.h" -#include "private/qdeclarativecontext_p.h" +#include "qdeclarativecontext_p.h" -#include "private/qdeclarativecomponent_p.h" -#include "private/qdeclarativeexpression_p.h" -#include "private/qdeclarativeengine_p.h" +#include "qdeclarativecomponent_p.h" +#include "qdeclarativeexpression_p.h" +#include "qdeclarativeengine_p.h" #include "qdeclarativeengine.h" #include "qdeclarativeinfo.h" -#include "private/qv4bindings_p.h" -#include "private/qv8bindings_p.h" +#include +#include #include #include diff --git a/src/declarative/qml/qdeclarativecontext_p.h b/src/declarative/qml/qdeclarativecontext_p.h index 6fd8957..ba4edb8 100644 --- a/src/declarative/qml/qdeclarativecontext_p.h +++ b/src/declarative/qml/qdeclarativecontext_p.h @@ -55,19 +55,19 @@ #include "qdeclarativecontext.h" -#include "private/qdeclarativedata_p.h" -#include "private/qdeclarativeintegercache_p.h" -#include "private/qdeclarativetypenamecache_p.h" -#include "private/qdeclarativenotifier_p.h" +#include "qdeclarativedata_p.h" +#include "qdeclarativeintegercache_p.h" +#include "qdeclarativetypenamecache_p.h" +#include "qdeclarativenotifier_p.h" #include "qdeclarativelist.h" -#include "private/qdeclarativescript_p.h" +#include "qdeclarativescript_p.h" #include #include #include #include -#include "private/qdeclarativeguard_p.h" +#include "qdeclarativeguard_p.h" #include diff --git a/src/declarative/qml/qdeclarativecustomparser.cpp b/src/declarative/qml/qdeclarativecustomparser.cpp index 4327110..e783d3a 100644 --- a/src/declarative/qml/qdeclarativecustomparser.cpp +++ b/src/declarative/qml/qdeclarativecustomparser.cpp @@ -39,10 +39,10 @@ ** ****************************************************************************/ -#include "private/qdeclarativecustomparser_p.h" -#include "private/qdeclarativecustomparser_p_p.h" +#include "qdeclarativecustomparser_p.h" +#include "qdeclarativecustomparser_p_p.h" -#include "private/qdeclarativecompiler_p.h" +#include "qdeclarativecompiler_p.h" #include diff --git a/src/declarative/qml/qdeclarativecustomparser_p.h b/src/declarative/qml/qdeclarativecustomparser_p.h index 9aca803..94b6865 100644 --- a/src/declarative/qml/qdeclarativecustomparser_p.h +++ b/src/declarative/qml/qdeclarativecustomparser_p.h @@ -53,10 +53,10 @@ // We mean it. // -#include "private/qdeclarativemetatype_p.h" +#include "qdeclarativemetatype_p.h" #include "qdeclarativeerror.h" -#include "private/qdeclarativescript_p.h" -#include "private/qdeclarativebinding_p.h" +#include "qdeclarativescript_p.h" +#include "qdeclarativebinding_p.h" #include #include diff --git a/src/declarative/qml/qdeclarativecustomparser_p_p.h b/src/declarative/qml/qdeclarativecustomparser_p_p.h index cebad26..7a9c58d 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 "private/qdeclarativecustomparser_p.h" +#include "qdeclarativecustomparser_p.h" -#include "private/qdeclarativescript_p.h" +#include "qdeclarativescript_p.h" #include diff --git a/src/declarative/qml/qdeclarativedirparser.cpp b/src/declarative/qml/qdeclarativedirparser.cpp index 08d953f..0af6775 100644 --- a/src/declarative/qml/qdeclarativedirparser.cpp +++ b/src/declarative/qml/qdeclarativedirparser.cpp @@ -39,9 +39,9 @@ ** ****************************************************************************/ -#include "private/qdeclarativedirparser_p.h" +#include "qdeclarativedirparser_p.h" #include "qdeclarativeerror.h" -#include +#include "qdeclarativeglobal_p.h" #include #include diff --git a/src/declarative/qml/qdeclarativeengine.cpp b/src/declarative/qml/qdeclarativeengine.cpp index 383d37a..dc32c41 100644 --- a/src/declarative/qml/qdeclarativeengine.cpp +++ b/src/declarative/qml/qdeclarativeengine.cpp @@ -39,37 +39,37 @@ ** ****************************************************************************/ -#include "private/qdeclarativeengine_p.h" +#include "qdeclarativeengine_p.h" #include "qdeclarativeengine.h" -#include "private/qdeclarativecontext_p.h" -#include "private/qdeclarativecompiler_p.h" +#include "qdeclarativecontext_p.h" +#include "qdeclarativecompiler_p.h" #include "qdeclarative.h" #include "qdeclarativecontext.h" #include "qdeclarativeexpression.h" #include "qdeclarativecomponent.h" -#include "private/qdeclarativebinding_p_p.h" -#include "private/qdeclarativevme_p.h" -#include "private/qdeclarativeenginedebugservice_p.h" -#include "private/qdeclarativestringconverters_p.h" -#include "private/qdeclarativexmlhttprequest_p.h" -#include "private/qdeclarativesqldatabase_p.h" +#include "qdeclarativebinding_p_p.h" +#include "qdeclarativevme_p.h" +#include +#include "qdeclarativestringconverters_p.h" +#include "qdeclarativexmlhttprequest_p.h" +#include "qdeclarativesqldatabase_p.h" #include "qdeclarativescriptstring.h" -#include "private/qdeclarativeglobal_p.h" -#include "private/qdeclarativeworkerscript_p.h" -#include "private/qdeclarativecomponent_p.h" +#include "qdeclarativeglobal_p.h" +#include "qdeclarativeworkerscript_p.h" +#include "qdeclarativecomponent_p.h" #include "qdeclarativenetworkaccessmanagerfactory.h" #include "qdeclarativeimageprovider.h" -#include "private/qdeclarativedirparser_p.h" +#include "qdeclarativedirparser_p.h" #include "qdeclarativeextensioninterface.h" -#include "private/qdeclarativelist_p.h" -#include "private/qdeclarativetypenamecache_p.h" -#include "private/qdeclarativenotifier_p.h" -#include "private/qdeclarativedebugtrace_p.h" -#include "private/qdeclarativeapplication_p.h" -#include "private/qv8debugservice_p.h" +#include "qdeclarativelist_p.h" +#include "qdeclarativetypenamecache_p.h" +#include "qdeclarativenotifier_p.h" +#include +#include +#include #include "qdeclarativeincubator.h" -#include "private/qv8profilerservice_p.h" +#include #include #include diff --git a/src/declarative/qml/qdeclarativeengine_p.h b/src/declarative/qml/qdeclarativeengine_p.h index 71d6220..88eda39 100644 --- a/src/declarative/qml/qdeclarativeengine_p.h +++ b/src/declarative/qml/qdeclarativeengine_p.h @@ -55,20 +55,20 @@ #include "qdeclarativeengine.h" -#include "private/qdeclarativetypeloader_p.h" -#include "private/qdeclarativeimport_p.h" -#include "private/qpodvector_p.h" +#include "qdeclarativetypeloader_p.h" +#include "qdeclarativeimport_p.h" +#include #include "qdeclarative.h" -#include "private/qdeclarativevaluetype_p.h" +#include "qdeclarativevaluetype_p.h" #include "qdeclarativecontext.h" -#include "private/qdeclarativecontext_p.h" +#include "qdeclarativecontext_p.h" #include "qdeclarativeexpression.h" #include "qdeclarativeimageprovider.h" -#include "private/qdeclarativeproperty_p.h" -#include "private/qdeclarativepropertycache_p.h" -#include "private/qdeclarativemetatype_p.h" -#include "private/qdeclarativedirparser_p.h" -#include "private/qintrusivelist_p.h" +#include "qdeclarativeproperty_p.h" +#include "qdeclarativepropertycache_p.h" +#include "qdeclarativemetatype_p.h" +#include "qdeclarativedirparser_p.h" +#include #include #include diff --git a/src/declarative/qml/qdeclarativeexpression.cpp b/src/declarative/qml/qdeclarativeexpression.cpp index c62314d..27979af 100644 --- a/src/declarative/qml/qdeclarativeexpression.cpp +++ b/src/declarative/qml/qdeclarativeexpression.cpp @@ -40,13 +40,13 @@ ****************************************************************************/ #include "qdeclarativeexpression.h" -#include "private/qdeclarativeexpression_p.h" +#include "qdeclarativeexpression_p.h" -#include "private/qdeclarativeengine_p.h" -#include "private/qdeclarativecontext_p.h" -#include "private/qdeclarativerewrite_p.h" -#include "private/qdeclarativescriptstring_p.h" -#include "private/qdeclarativecompiler_p.h" +#include "qdeclarativeengine_p.h" +#include "qdeclarativecontext_p.h" +#include "qdeclarativerewrite_p.h" +#include "qdeclarativescriptstring_p.h" +#include "qdeclarativecompiler_p.h" #include diff --git a/src/declarative/qml/qdeclarativefastproperties.cpp b/src/declarative/qml/qdeclarativefastproperties.cpp index 93703e2..5816b3f 100644 --- a/src/declarative/qml/qdeclarativefastproperties.cpp +++ b/src/declarative/qml/qdeclarativefastproperties.cpp @@ -39,10 +39,10 @@ ** ****************************************************************************/ -#include "private/qdeclarativefastproperties_p.h" +#include "qdeclarativefastproperties_p.h" -#include -#include +#include "qdeclarativedata_p.h" +#include "qdeclarativenotifier_p.h" QT_BEGIN_NAMESPACE diff --git a/src/declarative/qml/qdeclarativeimport.cpp b/src/declarative/qml/qdeclarativeimport.cpp index 21e91de..f94e9e4 100644 --- a/src/declarative/qml/qdeclarativeimport.cpp +++ b/src/declarative/qml/qdeclarativeimport.cpp @@ -52,7 +52,7 @@ #include #ifdef Q_OS_SYMBIAN -#include "private/qcore_symbian_p.h" +#include #endif QT_BEGIN_NAMESPACE diff --git a/src/declarative/qml/qdeclarativeincubator.cpp b/src/declarative/qml/qdeclarativeincubator.cpp index c771a6d..1417ed4 100644 --- a/src/declarative/qml/qdeclarativeincubator.cpp +++ b/src/declarative/qml/qdeclarativeincubator.cpp @@ -43,8 +43,8 @@ #include "qdeclarativecomponent.h" #include "qdeclarativeincubator_p.h" -#include -#include +#include "qdeclarativecompiler_p.h" +#include "qdeclarativeexpression_p.h" // XXX TODO // - check that the Component.onCompleted behavior is the same as 4.8 in the synchronous and diff --git a/src/declarative/qml/qdeclarativeinfo.cpp b/src/declarative/qml/qdeclarativeinfo.cpp index d221eae..4f1bae0 100644 --- a/src/declarative/qml/qdeclarativeinfo.cpp +++ b/src/declarative/qml/qdeclarativeinfo.cpp @@ -41,11 +41,11 @@ #include "qdeclarativeinfo.h" -#include "private/qdeclarativedata_p.h" +#include "qdeclarativedata_p.h" #include "qdeclarativecontext.h" -#include "private/qdeclarativecontext_p.h" -#include "private/qdeclarativemetatype_p.h" -#include "private/qdeclarativeengine_p.h" +#include "qdeclarativecontext_p.h" +#include "qdeclarativemetatype_p.h" +#include "qdeclarativeengine_p.h" #include diff --git a/src/declarative/qml/qdeclarativeinstruction.cpp b/src/declarative/qml/qdeclarativeinstruction.cpp index c47f68f..5f8b253 100644 --- a/src/declarative/qml/qdeclarativeinstruction.cpp +++ b/src/declarative/qml/qdeclarativeinstruction.cpp @@ -39,9 +39,9 @@ ** ****************************************************************************/ -#include "private/qdeclarativeinstruction_p.h" +#include "qdeclarativeinstruction_p.h" -#include "private/qdeclarativecompiler_p.h" +#include "qdeclarativecompiler_p.h" #include diff --git a/src/declarative/qml/qdeclarativeintegercache.cpp b/src/declarative/qml/qdeclarativeintegercache.cpp index 16bf8d1..372c7a2 100644 --- a/src/declarative/qml/qdeclarativeintegercache.cpp +++ b/src/declarative/qml/qdeclarativeintegercache.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include "private/qdeclarativeintegercache_p.h" +#include "qdeclarativeintegercache_p.h" QT_BEGIN_NAMESPACE diff --git a/src/declarative/qml/qdeclarativeintegercache_p.h b/src/declarative/qml/qdeclarativeintegercache_p.h index 1ac03ad..ee2fbc2 100644 --- a/src/declarative/qml/qdeclarativeintegercache_p.h +++ b/src/declarative/qml/qdeclarativeintegercache_p.h @@ -53,8 +53,8 @@ // We mean it. // -#include "private/qdeclarativerefcount_p.h" -#include "private/qhashedstring_p.h" +#include +#include QT_BEGIN_NAMESPACE diff --git a/src/declarative/qml/qdeclarativelist.cpp b/src/declarative/qml/qdeclarativelist.cpp index 458812a..04cef6c 100644 --- a/src/declarative/qml/qdeclarativelist.cpp +++ b/src/declarative/qml/qdeclarativelist.cpp @@ -40,9 +40,9 @@ ****************************************************************************/ #include "qdeclarativelist.h" -#include "private/qdeclarativelist_p.h" -#include "private/qdeclarativeengine_p.h" -#include "private/qdeclarativeproperty_p.h" +#include "qdeclarativelist_p.h" +#include "qdeclarativeengine_p.h" +#include "qdeclarativeproperty_p.h" QT_BEGIN_NAMESPACE diff --git a/src/declarative/qml/qdeclarativelist_p.h b/src/declarative/qml/qdeclarativelist_p.h index 8a69504..10495e9 100644 --- a/src/declarative/qml/qdeclarativelist_p.h +++ b/src/declarative/qml/qdeclarativelist_p.h @@ -54,7 +54,7 @@ // #include "qdeclarativelist.h" -#include "private/qdeclarativeguard_p.h" +#include "qdeclarativeguard_p.h" QT_BEGIN_NAMESPACE diff --git a/src/declarative/qml/qdeclarativemetatype.cpp b/src/declarative/qml/qdeclarativemetatype.cpp index 0590b2c..5577993 100644 --- a/src/declarative/qml/qdeclarativemetatype.cpp +++ b/src/declarative/qml/qdeclarativemetatype.cpp @@ -40,7 +40,7 @@ ****************************************************************************/ #include -#include "private/qdeclarativemetatype_p.h" +#include "qdeclarativemetatype_p.h" #include #include diff --git a/src/declarative/qml/qdeclarativenotifier.cpp b/src/declarative/qml/qdeclarativenotifier.cpp index 77bce8e..a195280 100644 --- a/src/declarative/qml/qdeclarativenotifier.cpp +++ b/src/declarative/qml/qdeclarativenotifier.cpp @@ -39,8 +39,8 @@ ** ****************************************************************************/ -#include "private/qdeclarativenotifier_p.h" -#include "private/qdeclarativeproperty_p.h" +#include "qdeclarativenotifier_p.h" +#include "qdeclarativeproperty_p.h" QT_BEGIN_NAMESPACE diff --git a/src/declarative/qml/qdeclarativenotifier_p.h b/src/declarative/qml/qdeclarativenotifier_p.h index d9c334a..1d0d4fc 100644 --- a/src/declarative/qml/qdeclarativenotifier_p.h +++ b/src/declarative/qml/qdeclarativenotifier_p.h @@ -42,8 +42,8 @@ #ifndef QDECLARATIVENOTIFIER_P_H #define QDECLARATIVENOTIFIER_P_H -#include "private/qdeclarativedata_p.h" -#include "private/qdeclarativeguard_p.h" +#include "qdeclarativedata_p.h" +#include "qdeclarativeguard_p.h" QT_BEGIN_NAMESPACE diff --git a/src/declarative/qml/qdeclarativeproperty.cpp b/src/declarative/qml/qdeclarativeproperty.cpp index e43cd6f..a402d24 100644 --- a/src/declarative/qml/qdeclarativeproperty.cpp +++ b/src/declarative/qml/qdeclarativeproperty.cpp @@ -40,21 +40,21 @@ ****************************************************************************/ #include "qdeclarativeproperty.h" -#include "private/qdeclarativeproperty_p.h" +#include "qdeclarativeproperty_p.h" #include "qdeclarative.h" -#include "private/qdeclarativebinding_p.h" +#include "qdeclarativebinding_p.h" #include "qdeclarativecontext.h" -#include "private/qdeclarativecontext_p.h" -#include "private/qdeclarativeboundsignal_p.h" +#include "qdeclarativecontext_p.h" +#include "qdeclarativeboundsignal_p.h" #include "qdeclarativeengine.h" -#include "private/qdeclarativeengine_p.h" -#include "private/qdeclarativedata_p.h" -#include "private/qdeclarativestringconverters_p.h" -#include "private/qdeclarativelist_p.h" -#include "private/qdeclarativecompiler_p.h" -#include "private/qdeclarativevmemetaobject_p.h" -#include "private/qdeclarativeexpression_p.h" +#include "qdeclarativeengine_p.h" +#include "qdeclarativedata_p.h" +#include "qdeclarativestringconverters_p.h" +#include "qdeclarativelist_p.h" +#include "qdeclarativecompiler_p.h" +#include "qdeclarativevmemetaobject_p.h" +#include "qdeclarativeexpression_p.h" #include #include diff --git a/src/declarative/qml/qdeclarativepropertycache.cpp b/src/declarative/qml/qdeclarativepropertycache.cpp index 6337750..cf2022c 100644 --- a/src/declarative/qml/qdeclarativepropertycache.cpp +++ b/src/declarative/qml/qdeclarativepropertycache.cpp @@ -39,11 +39,11 @@ ** ****************************************************************************/ -#include "private/qdeclarativepropertycache_p.h" +#include "qdeclarativepropertycache_p.h" -#include "private/qdeclarativeengine_p.h" -#include "private/qdeclarativebinding_p.h" -#include "private/qv8engine_p.h" +#include "qdeclarativeengine_p.h" +#include "qdeclarativebinding_p.h" +#include #include diff --git a/src/declarative/qml/qdeclarativepropertycache_p.h b/src/declarative/qml/qdeclarativepropertycache_p.h index f1161b2..068db58 100644 --- a/src/declarative/qml/qdeclarativepropertycache_p.h +++ b/src/declarative/qml/qdeclarativepropertycache_p.h @@ -53,11 +53,11 @@ // We mean it. // -#include "private/qdeclarativerefcount_p.h" -#include "private/qdeclarativecleanup_p.h" -#include "private/qdeclarativenotifier_p.h" +#include +#include "qdeclarativecleanup_p.h" +#include "qdeclarativenotifier_p.h" -#include "private/qhashedstring_p.h" +#include #include QT_BEGIN_NAMESPACE diff --git a/src/declarative/qml/qdeclarativeproxymetaobject.cpp b/src/declarative/qml/qdeclarativeproxymetaobject.cpp index 3263ae5..f4029fc 100644 --- a/src/declarative/qml/qdeclarativeproxymetaobject.cpp +++ b/src/declarative/qml/qdeclarativeproxymetaobject.cpp @@ -39,8 +39,8 @@ ** ****************************************************************************/ -#include "private/qdeclarativeproxymetaobject_p.h" -#include "private/qdeclarativeproperty_p.h" +#include "qdeclarativeproxymetaobject_p.h" +#include "qdeclarativeproperty_p.h" QT_BEGIN_NAMESPACE diff --git a/src/declarative/qml/qdeclarativerewrite.cpp b/src/declarative/qml/qdeclarativerewrite.cpp index be399dd..98bd34f 100644 --- a/src/declarative/qml/qdeclarativerewrite.cpp +++ b/src/declarative/qml/qdeclarativerewrite.cpp @@ -39,9 +39,9 @@ ** ****************************************************************************/ -#include "private/qdeclarativerewrite_p.h" +#include "qdeclarativerewrite_p.h" -#include "private/qdeclarativeglobal_p.h" +#include "qdeclarativeglobal_p.h" #include diff --git a/src/declarative/qml/qdeclarativescript.cpp b/src/declarative/qml/qdeclarativescript.cpp index 2bc358a..fb4f26a 100644 --- a/src/declarative/qml/qdeclarativescript.cpp +++ b/src/declarative/qml/qdeclarativescript.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include "private/qdeclarativescript_p.h" +#include "qdeclarativescript_p.h" #include "parser/qdeclarativejsengine_p.h" #include "parser/qdeclarativejsparser_p.h" @@ -47,7 +47,7 @@ #include "parser/qdeclarativejsmemorypool_p.h" #include "parser/qdeclarativejsastvisitor_p.h" #include "parser/qdeclarativejsast_p.h" -#include "private/qdeclarativerewrite_p.h" +#include #include #include diff --git a/src/declarative/qml/qdeclarativesqldatabase.cpp b/src/declarative/qml/qdeclarativesqldatabase.cpp index 7fc6207..dff87b2 100644 --- a/src/declarative/qml/qdeclarativesqldatabase.cpp +++ b/src/declarative/qml/qdeclarativesqldatabase.cpp @@ -39,12 +39,11 @@ ** ****************************************************************************/ -#include "private/qdeclarativesqldatabase_p.h" +#include "qdeclarativesqldatabase_p.h" #include "qdeclarativeengine.h" -#include "private/qdeclarativeengine_p.h" -#include "private/qdeclarativerefcount_p.h" -#include "private/qdeclarativeengine_p.h" +#include "qdeclarativeengine_p.h" +#include #include #include diff --git a/src/declarative/qml/qdeclarativestringconverters.cpp b/src/declarative/qml/qdeclarativestringconverters.cpp index b949adf..51bb3a4 100644 --- a/src/declarative/qml/qdeclarativestringconverters.cpp +++ b/src/declarative/qml/qdeclarativestringconverters.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include "private/qdeclarativestringconverters_p.h" +#include "qdeclarativestringconverters_p.h" #include #include diff --git a/src/declarative/qml/qdeclarativetypenamecache.cpp b/src/declarative/qml/qdeclarativetypenamecache.cpp index 31ad48a..8ff6532 100644 --- a/src/declarative/qml/qdeclarativetypenamecache.cpp +++ b/src/declarative/qml/qdeclarativetypenamecache.cpp @@ -39,9 +39,9 @@ ** ****************************************************************************/ -#include "private/qdeclarativetypenamecache_p.h" +#include "qdeclarativetypenamecache_p.h" -#include "private/qdeclarativeengine_p.h" +#include "qdeclarativeengine_p.h" QT_BEGIN_NAMESPACE diff --git a/src/declarative/qml/qdeclarativetypenamecache_p.h b/src/declarative/qml/qdeclarativetypenamecache_p.h index 219d07a..a0a3d53 100644 --- a/src/declarative/qml/qdeclarativetypenamecache_p.h +++ b/src/declarative/qml/qdeclarativetypenamecache_p.h @@ -53,9 +53,9 @@ // We mean it. // -#include "private/qdeclarativerefcount_p.h" -#include "private/qdeclarativecleanup_p.h" -#include "private/qdeclarativemetatype_p.h" +#include +#include "qdeclarativecleanup_p.h" +#include "qdeclarativemetatype_p.h" #include diff --git a/src/declarative/qml/qdeclarativevaluetype.cpp b/src/declarative/qml/qdeclarativevaluetype.cpp index 3e77f4b..9f43d0e 100644 --- a/src/declarative/qml/qdeclarativevaluetype.cpp +++ b/src/declarative/qml/qdeclarativevaluetype.cpp @@ -39,10 +39,10 @@ ** ****************************************************************************/ -#include "private/qdeclarativevaluetype_p.h" +#include "qdeclarativevaluetype_p.h" -#include "private/qdeclarativemetatype_p.h" -#include "private/qfont_p.h" +#include "qdeclarativemetatype_p.h" +#include #include diff --git a/src/declarative/qml/qdeclarativevaluetype_p.h b/src/declarative/qml/qdeclarativevaluetype_p.h index 41d5e7c..1feab41 100644 --- a/src/declarative/qml/qdeclarativevaluetype_p.h +++ b/src/declarative/qml/qdeclarativevaluetype_p.h @@ -54,8 +54,8 @@ // #include "qdeclarativeproperty.h" -#include "private/qdeclarativeproperty_p.h" -#include "private/qdeclarativenullablevalue_p_p.h" +#include "qdeclarativeproperty_p.h" +#include "qdeclarativenullablevalue_p_p.h" #include #include diff --git a/src/declarative/qml/qdeclarativevme.cpp b/src/declarative/qml/qdeclarativevme.cpp index d407fae..b7abef4 100644 --- a/src/declarative/qml/qdeclarativevme.cpp +++ b/src/declarative/qml/qdeclarativevme.cpp @@ -39,29 +39,29 @@ ** ****************************************************************************/ -#include "private/qdeclarativevme_p.h" +#include "qdeclarativevme_p.h" -#include "private/qdeclarativecompiler_p.h" -#include "private/qdeclarativeboundsignal_p.h" -#include "private/qdeclarativestringconverters_p.h" +#include "qdeclarativecompiler_p.h" +#include "qdeclarativeboundsignal_p.h" +#include "qdeclarativestringconverters_p.h" #include -#include "private/qfastmetabuilder_p.h" -#include "private/qdeclarativedata_p.h" +#include +#include "qdeclarativedata_p.h" #include "qdeclarative.h" -#include "private/qdeclarativecustomparser_p.h" +#include "qdeclarativecustomparser_p.h" #include "qdeclarativeengine.h" #include "qdeclarativecontext.h" #include "qdeclarativecomponent.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/qv4bindings_p.h" -#include "private/qv8bindings_p.h" -#include "private/qdeclarativeglobal_p.h" -#include "private/qfinitestack_p.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 +#include +#include "qdeclarativeglobal_p.h" +#include #include "qdeclarativescriptstring.h" #include "qdeclarativescriptstring_p.h" diff --git a/src/declarative/qml/qdeclarativevme_p.h b/src/declarative/qml/qdeclarativevme_p.h index 19db2ef..b74bc54 100644 --- a/src/declarative/qml/qdeclarativevme_p.h +++ b/src/declarative/qml/qdeclarativevme_p.h @@ -54,9 +54,9 @@ // #include "qdeclarativeerror.h" -#include "private/qbitfield_p.h" -#include "private/qdeclarativeinstruction_p.h" -#include "private/qrecursionwatcher_p.h" +#include +#include "qdeclarativeinstruction_p.h" +#include #include #include diff --git a/src/declarative/qml/qdeclarativevmemetaobject.cpp b/src/declarative/qml/qdeclarativevmemetaobject.cpp index abf7349..9cdec02 100644 --- a/src/declarative/qml/qdeclarativevmemetaobject.cpp +++ b/src/declarative/qml/qdeclarativevmemetaobject.cpp @@ -39,14 +39,14 @@ ** ****************************************************************************/ -#include "private/qdeclarativevmemetaobject_p.h" +#include "qdeclarativevmemetaobject_p.h" #include "qdeclarative.h" -#include "private/qdeclarativerefcount_p.h" +#include #include "qdeclarativeexpression.h" -#include "private/qdeclarativeexpression_p.h" -#include "private/qdeclarativecontext_p.h" -#include "private/qdeclarativebinding_p.h" +#include "qdeclarativeexpression_p.h" +#include "qdeclarativecontext_p.h" +#include "qdeclarativebinding_p.h" Q_DECLARE_METATYPE(QJSValue); diff --git a/src/declarative/qml/qdeclarativevmemetaobject_p.h b/src/declarative/qml/qdeclarativevmemetaobject_p.h index 0c02b76..400961b 100644 --- a/src/declarative/qml/qdeclarativevmemetaobject_p.h +++ b/src/declarative/qml/qdeclarativevmemetaobject_p.h @@ -65,11 +65,11 @@ #include -#include "private/qdeclarativeguard_p.h" -#include "private/qdeclarativecompiler_p.h" -#include "private/qdeclarativecontext_p.h" +#include "qdeclarativeguard_p.h" +#include "qdeclarativecompiler_p.h" +#include "qdeclarativecontext_p.h" -#include "private/qv8gccallback_p.h" +#include #include diff --git a/src/declarative/qml/qdeclarativewatcher.cpp b/src/declarative/qml/qdeclarativewatcher.cpp index 33f0358..42c0b5c 100644 --- a/src/declarative/qml/qdeclarativewatcher.cpp +++ b/src/declarative/qml/qdeclarativewatcher.cpp @@ -39,15 +39,15 @@ ** ****************************************************************************/ -#include "private/qdeclarativewatcher_p.h" +#include "qdeclarativewatcher_p.h" #include "qdeclarativeexpression.h" #include "qdeclarativecontext.h" #include "qdeclarative.h" -#include -#include "private/qdeclarativeproperty_p.h" -#include "private/qdeclarativevaluetype_p.h" +#include +#include "qdeclarativeproperty_p.h" +#include "qdeclarativevaluetype_p.h" #include #include diff --git a/src/declarative/qml/qdeclarativeworkerscript.cpp b/src/declarative/qml/qdeclarativeworkerscript.cpp index c6425d0..98aaddc 100644 --- a/src/declarative/qml/qdeclarativeworkerscript.cpp +++ b/src/declarative/qml/qdeclarativeworkerscript.cpp @@ -39,11 +39,11 @@ ** ****************************************************************************/ -#include "private/qdeclarativeworkerscript_p.h" -#include "private/qdeclarativelistmodel_p.h" -#include "private/qdeclarativelistmodelworkeragent_p.h" -#include "private/qdeclarativeengine_p.h" -#include "private/qdeclarativeexpression_p.h" +#include "qdeclarativeworkerscript_p.h" +#include +#include +#include "qdeclarativeengine_p.h" +#include "qdeclarativeexpression_p.h" #include #include diff --git a/src/declarative/qml/qdeclarativexmlhttprequest.cpp b/src/declarative/qml/qdeclarativexmlhttprequest.cpp index 23f21c9..0009163 100644 --- a/src/declarative/qml/qdeclarativexmlhttprequest.cpp +++ b/src/declarative/qml/qdeclarativexmlhttprequest.cpp @@ -39,17 +39,17 @@ ** ****************************************************************************/ -#include "private/qdeclarativexmlhttprequest_p.h" +#include "qdeclarativexmlhttprequest_p.h" #include #include "qdeclarativeengine.h" -#include "private/qdeclarativeengine_p.h" -#include "private/qdeclarativerefcount_p.h" -#include "private/qdeclarativeengine_p.h" -#include "private/qdeclarativeexpression_p.h" +#include "qdeclarativeengine_p.h" +#include +#include "qdeclarativeengine_p.h" +#include "qdeclarativeexpression_p.h" #include "qdeclarativeglobal_p.h" -#include "qv8domerrors_p.h" +#include #include #include diff --git a/src/declarative/qml/qml.pri b/src/declarative/qml/qml.pri index 608b212..b14e547 100644 --- a/src/declarative/qml/qml.pri +++ b/src/declarative/qml/qml.pri @@ -1,4 +1,3 @@ -INCLUDEPATH += $$PWD SOURCES += \ $$PWD/qdeclarativeinstruction.cpp \ $$PWD/qdeclarativevmemetaobject.cpp \ diff --git a/src/declarative/qml/rewriter/rewriter.pri b/src/declarative/qml/rewriter/rewriter.pri index a9fa1b5..e51ee5b 100644 --- a/src/declarative/qml/rewriter/rewriter.pri +++ b/src/declarative/qml/rewriter/rewriter.pri @@ -1,4 +1,2 @@ -INCLUDEPATH += $$PWD - HEADERS += $$PWD/textwriter_p.h SOURCES += $$PWD/textwriter.cpp diff --git a/src/declarative/qml/rewriter/textwriter.cpp b/src/declarative/qml/rewriter/textwriter.cpp index d3a68d0..e4b4597 100644 --- a/src/declarative/qml/rewriter/textwriter.cpp +++ b/src/declarative/qml/rewriter/textwriter.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include "private/textwriter_p.h" +#include "textwriter_p.h" QT_QML_BEGIN_NAMESPACE diff --git a/src/declarative/qml/v4/qv4bindings.cpp b/src/declarative/qml/v4/qv4bindings.cpp index b5229ae..2e8a360 100644 --- a/src/declarative/qml/v4/qv4bindings.cpp +++ b/src/declarative/qml/v4/qv4bindings.cpp @@ -41,10 +41,10 @@ // #define REGISTER_CLEANUP_DEBUG -#include "private/qv4bindings_p.h" -#include "private/qv4program_p.h" -#include "private/qv4compiler_p.h" -#include "private/qv4compiler_p_p.h" +#include "qv4bindings_p.h" +#include "qv4program_p.h" +#include "qv4compiler_p.h" +#include "qv4compiler_p_p.h" #include #include diff --git a/src/declarative/qml/v4/qv4ir_p.h b/src/declarative/qml/v4/qv4ir_p.h index 86b0d9d..9dbd220 100644 --- a/src/declarative/qml/v4/qv4ir_p.h +++ b/src/declarative/qml/v4/qv4ir_p.h @@ -60,7 +60,7 @@ #include #include -#include +#include #include // #define DEBUG_IR_STRUCTURE diff --git a/src/declarative/qml/v4/v4.pri b/src/declarative/qml/v4/v4.pri index a96975d..b678485 100644 --- a/src/declarative/qml/v4/v4.pri +++ b/src/declarative/qml/v4/v4.pri @@ -1,5 +1,3 @@ -INCLUDEPATH += $$PWD - HEADERS += \ $$PWD/qv4compiler_p.h \ $$PWD/qv4compiler_p_p.h \ diff --git a/src/declarative/qml/v8/qjsvalueiterator_impl_p.h b/src/declarative/qml/v8/qjsvalueiterator_impl_p.h index 68075e5..102c787 100644 --- a/src/declarative/qml/v8/qjsvalueiterator_impl_p.h +++ b/src/declarative/qml/v8/qjsvalueiterator_impl_p.h @@ -24,9 +24,9 @@ #ifndef QJSVALUEITERATOR_IMPL_P_H #define QJSVALUEITERATOR_IMPL_P_H -#include -#include -#include +#include "qjsvalueiterator_p.h" +#include +#include "qjsconverter_p.h" inline QJSValueIteratorPrivate::QJSValueIteratorPrivate(const QJSValuePrivate* value) : m_object(const_cast(value)) diff --git a/src/declarative/qml/v8/qv8bindings_p.h b/src/declarative/qml/v8/qv8bindings_p.h index 60b1afd..f7581a4 100644 --- a/src/declarative/qml/v8/qv8bindings_p.h +++ b/src/declarative/qml/v8/qv8bindings_p.h @@ -53,9 +53,9 @@ // We mean it. // -#include "private/qdeclarativepropertycache_p.h" -#include "private/qdeclarativeexpression_p.h" -#include "private/qdeclarativebinding_p.h" +#include +#include +#include QT_BEGIN_HEADER diff --git a/src/declarative/qml/v8/qv8variantwrapper.cpp b/src/declarative/qml/v8/qv8variantwrapper.cpp index 4b2acfc..fbf0832 100644 --- a/src/declarative/qml/v8/qv8variantwrapper.cpp +++ b/src/declarative/qml/v8/qv8variantwrapper.cpp @@ -41,7 +41,7 @@ #include "qv8variantwrapper_p.h" #include "qv8engine_p.h" -#include "qdeclarativeengine_p.h" +#include QT_BEGIN_NAMESPACE diff --git a/src/declarative/qml/v8/script.pri b/src/declarative/qml/v8/script.pri index 68a8c64..587ab6f 100644 --- a/src/declarative/qml/v8/script.pri +++ b/src/declarative/qml/v8/script.pri @@ -1,6 +1,3 @@ - -INCLUDEPATH += $$PWD - SOURCES += \ $$PWD/qjsengine.cpp \ $$PWD/qjsvalue.cpp \ diff --git a/src/declarative/qml/v8/v8.pri b/src/declarative/qml/v8/v8.pri index 104f34f..c4372ab 100644 --- a/src/declarative/qml/v8/v8.pri +++ b/src/declarative/qml/v8/v8.pri @@ -1,5 +1,4 @@ INCLUDEPATH += $$PWD/../../../3rdparty/javascriptcore -INCLUDEPATH += $$PWD include(script.pri) diff --git a/src/declarative/scenegraph/coreapi/qsgrenderer.cpp b/src/declarative/scenegraph/coreapi/qsgrenderer.cpp index 45aef34..b22631a 100644 --- a/src/declarative/scenegraph/coreapi/qsgrenderer.cpp +++ b/src/declarative/scenegraph/coreapi/qsgrenderer.cpp @@ -45,7 +45,7 @@ #include "qsgnodeupdater_p.h" #include "qsggeometry_p.h" -#include "private/qsgadaptationlayer_p.h" +#include #include #include diff --git a/src/declarative/scenegraph/qsgdistancefieldglyphnode_p.h b/src/declarative/scenegraph/qsgdistancefieldglyphnode_p.h index a5bdf36..9004549 100644 --- a/src/declarative/scenegraph/qsgdistancefieldglyphnode_p.h +++ b/src/declarative/scenegraph/qsgdistancefieldglyphnode_p.h @@ -44,7 +44,7 @@ #include #include "qsgtexture.h" -#include +#include QT_BEGIN_HEADER diff --git a/src/declarative/scenegraph/scenegraph.pri b/src/declarative/scenegraph/scenegraph.pri index d29a3bc..d4e0707 100644 --- a/src/declarative/scenegraph/scenegraph.pri +++ b/src/declarative/scenegraph/scenegraph.pri @@ -1,4 +1,3 @@ -INCLUDEPATH += $$PWD/coreapi $$PWD/convenience $$PWD/3d !contains(QT_CONFIG, egl):DEFINES += QT_NO_EGL # Core API diff --git a/src/declarative/scenegraph/util/qsgtextureprovider.cpp b/src/declarative/scenegraph/util/qsgtextureprovider.cpp index 49d157d..5605f28 100644 --- a/src/declarative/scenegraph/util/qsgtextureprovider.cpp +++ b/src/declarative/scenegraph/util/qsgtextureprovider.cpp @@ -41,8 +41,8 @@ #include "qsgtextureprovider_p.h" -#include -#include +#include +#include #ifndef GL_CLAMP_TO_EDGE #define GL_CLAMP_TO_EDGE 0x812F diff --git a/src/declarative/util/qdeclarativeanimation.cpp b/src/declarative/util/qdeclarativeanimation.cpp index bbb5e33..2fe2aa0 100644 --- a/src/declarative/util/qdeclarativeanimation.cpp +++ b/src/declarative/util/qdeclarativeanimation.cpp @@ -39,23 +39,23 @@ ** ****************************************************************************/ -#include "private/qdeclarativeanimation_p.h" -#include "private/qdeclarativeanimation_p_p.h" +#include "qdeclarativeanimation_p.h" +#include "qdeclarativeanimation_p_p.h" -#include "private/qdeclarativebehavior_p.h" -#include "private/qdeclarativestateoperations_p.h" -#include "private/qdeclarativecontext_p.h" +#include +#include +#include #include #include #include #include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/src/declarative/util/qdeclarativeanimation_p.h b/src/declarative/util/qdeclarativeanimation_p.h index 30f05ec..ac2cb3c 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 "private/qdeclarativetransition_p.h" -#include "private/qdeclarativestate_p.h" +#include "qdeclarativetransition_p.h" +#include "qdeclarativestate_p.h" #include #include diff --git a/src/declarative/util/qdeclarativeanimation_p_p.h b/src/declarative/util/qdeclarativeanimation_p_p.h index 17caa9a..a14356d 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 "private/qdeclarativeanimation_p.h" +#include "qdeclarativeanimation_p.h" -#include "private/qdeclarativenullablevalue_p_p.h" -#include "private/qdeclarativetimeline_p_p.h" +#include +#include #include #include diff --git a/src/declarative/util/qdeclarativebehavior.cpp b/src/declarative/util/qdeclarativebehavior.cpp index 71bbc7f..3b0ec86 100644 --- a/src/declarative/util/qdeclarativebehavior.cpp +++ b/src/declarative/util/qdeclarativebehavior.cpp @@ -39,16 +39,16 @@ ** ****************************************************************************/ -#include "private/qdeclarativebehavior_p.h" +#include "qdeclarativebehavior_p.h" -#include "private/qdeclarativeanimation_p.h" -#include "private/qdeclarativetransition_p.h" +#include "qdeclarativeanimation_p.h" +#include "qdeclarativetransition_p.h" #include #include -#include -#include -#include +#include +#include +#include #include diff --git a/src/declarative/util/qdeclarativebehavior_p.h b/src/declarative/util/qdeclarativebehavior_p.h index 732754b..233be2b 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 "private/qdeclarativestate_p.h" +#include "qdeclarativestate_p.h" #include #include diff --git a/src/declarative/util/qdeclarativebind.cpp b/src/declarative/util/qdeclarativebind.cpp index ba120b9..5d62830 100644 --- a/src/declarative/util/qdeclarativebind.cpp +++ b/src/declarative/util/qdeclarativebind.cpp @@ -39,12 +39,12 @@ ** ****************************************************************************/ -#include "private/qdeclarativebind_p.h" +#include "qdeclarativebind_p.h" -#include "private/qdeclarativenullablevalue_p_p.h" -#include "private/qdeclarativeproperty_p.h" -#include "private/qdeclarativebinding_p.h" -#include "private/qdeclarativeguard_p.h" +#include +#include +#include +#include #include #include diff --git a/src/declarative/util/qdeclarativeconnections.cpp b/src/declarative/util/qdeclarativeconnections.cpp index adb9b15..c57363f 100644 --- a/src/declarative/util/qdeclarativeconnections.cpp +++ b/src/declarative/util/qdeclarativeconnections.cpp @@ -39,13 +39,13 @@ ** ****************************************************************************/ -#include "private/qdeclarativeconnections_p.h" +#include "qdeclarativeconnections_p.h" #include -#include -#include +#include +#include #include -#include +#include #include #include diff --git a/src/declarative/util/qdeclarativefontloader.cpp b/src/declarative/util/qdeclarativefontloader.cpp index f7a7738..e95bd11 100644 --- a/src/declarative/util/qdeclarativefontloader.cpp +++ b/src/declarative/util/qdeclarativefontloader.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include "private/qdeclarativefontloader_p.h" +#include "qdeclarativefontloader_p.h" #include #include diff --git a/src/declarative/util/qdeclarativelistaccessor.cpp b/src/declarative/util/qdeclarativelistaccessor.cpp index e85b1ed..0063514 100644 --- a/src/declarative/util/qdeclarativelistaccessor.cpp +++ b/src/declarative/util/qdeclarativelistaccessor.cpp @@ -39,15 +39,15 @@ ** ****************************************************************************/ -#include "private/qdeclarativelistaccessor_p.h" +#include "qdeclarativelistaccessor_p.h" -#include +#include #include #include // ### Remove me -#include +#include QT_BEGIN_NAMESPACE diff --git a/src/declarative/util/qdeclarativelistmodel.cpp b/src/declarative/util/qdeclarativelistmodel.cpp index cf1dd3b..4e67182 100644 --- a/src/declarative/util/qdeclarativelistmodel.cpp +++ b/src/declarative/util/qdeclarativelistmodel.cpp @@ -39,15 +39,15 @@ ** ****************************************************************************/ -#include "private/qdeclarativelistmodel_p_p.h" -#include "private/qdeclarativelistmodelworkeragent_p.h" -#include "private/qdeclarativeopenmetaobject_p.h" -#include "parser/qdeclarativejsast_p.h" -#include "parser/qdeclarativejsengine_p.h" - -#include -#include -#include +#include "qdeclarativelistmodel_p_p.h" +#include "qdeclarativelistmodelworkeragent_p.h" +#include "qdeclarativeopenmetaobject_p.h" +#include +#include + +#include +#include +#include #include #include diff --git a/src/declarative/util/qdeclarativelistmodel_p_p.h b/src/declarative/util/qdeclarativelistmodel_p_p.h index 971f0d8..99cab4c 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 "private/qdeclarativelistmodel_p.h" -#include "private/qdeclarativeengine_p.h" -#include "private/qdeclarativeopenmetaobject_p.h" -#include "qdeclarative.h" +#include "qdeclarativelistmodel_p.h" +#include +#include "qdeclarativeopenmetaobject_p.h" +#include QT_BEGIN_HEADER diff --git a/src/declarative/util/qdeclarativelistmodelworkeragent.cpp b/src/declarative/util/qdeclarativelistmodelworkeragent.cpp index c6855d3..b27e3e3 100644 --- a/src/declarative/util/qdeclarativelistmodelworkeragent.cpp +++ b/src/declarative/util/qdeclarativelistmodelworkeragent.cpp @@ -39,11 +39,11 @@ ** ****************************************************************************/ -#include "private/qdeclarativelistmodelworkeragent_p.h" -#include "private/qdeclarativelistmodel_p_p.h" -#include "private/qdeclarativedata_p.h" -#include "private/qdeclarativeengine_p.h" -#include "qdeclarativeinfo.h" +#include "qdeclarativelistmodelworkeragent_p.h" +#include "qdeclarativelistmodel_p_p.h" +#include +#include +#include #include #include diff --git a/src/declarative/util/qdeclarativelistmodelworkeragent_p.h b/src/declarative/util/qdeclarativelistmodelworkeragent_p.h index d814029..12505e9 100644 --- a/src/declarative/util/qdeclarativelistmodelworkeragent_p.h +++ b/src/declarative/util/qdeclarativelistmodelworkeragent_p.h @@ -53,7 +53,7 @@ // We mean it. // -#include "qdeclarative.h" +#include #include #include diff --git a/src/declarative/util/qdeclarativeopenmetaobject.cpp b/src/declarative/util/qdeclarativeopenmetaobject.cpp index 695d28a..d4dd824 100644 --- a/src/declarative/util/qdeclarativeopenmetaobject.cpp +++ b/src/declarative/util/qdeclarativeopenmetaobject.cpp @@ -39,9 +39,9 @@ ** ****************************************************************************/ -#include "private/qdeclarativeopenmetaobject_p.h" -#include "private/qdeclarativepropertycache_p.h" -#include "private/qdeclarativedata_p.h" +#include "qdeclarativeopenmetaobject_p.h" +#include +#include #include #include diff --git a/src/declarative/util/qdeclarativepackage.cpp b/src/declarative/util/qdeclarativepackage.cpp index 4973ee2..1d46574 100644 --- a/src/declarative/util/qdeclarativepackage.cpp +++ b/src/declarative/util/qdeclarativepackage.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include "private/qdeclarativepackage_p.h" +#include "qdeclarativepackage_p.h" #include #include diff --git a/src/declarative/util/qdeclarativepath.cpp b/src/declarative/util/qdeclarativepath.cpp index 05d56e0..146fbf9 100644 --- a/src/declarative/util/qdeclarativepath.cpp +++ b/src/declarative/util/qdeclarativepath.cpp @@ -39,9 +39,9 @@ ** ****************************************************************************/ -#include "private/qdeclarativepath_p.h" -#include "private/qdeclarativepath_p_p.h" -#include "private/qdeclarativesvgparser_p.h" +#include "qdeclarativepath_p.h" +#include "qdeclarativepath_p_p.h" +#include "qdeclarativesvgparser_p.h" #include #include diff --git a/src/declarative/util/qdeclarativepath_p.h b/src/declarative/util/qdeclarativepath_p.h index e997240..e449e23 100644 --- a/src/declarative/util/qdeclarativepath_p.h +++ b/src/declarative/util/qdeclarativepath_p.h @@ -44,7 +44,7 @@ #include -#include "private/qdeclarativenullablevalue_p_p.h" +#include #include #include diff --git a/src/declarative/util/qdeclarativepath_p_p.h b/src/declarative/util/qdeclarativepath_p_p.h index c7313ea..910b762 100644 --- a/src/declarative/util/qdeclarativepath_p_p.h +++ b/src/declarative/util/qdeclarativepath_p_p.h @@ -53,7 +53,7 @@ // We mean it. // -#include "private/qdeclarativepath_p.h" +#include "qdeclarativepath_p.h" #include #include diff --git a/src/declarative/util/qdeclarativepathinterpolator.cpp b/src/declarative/util/qdeclarativepathinterpolator.cpp index db6ef15..569884d 100644 --- a/src/declarative/util/qdeclarativepathinterpolator.cpp +++ b/src/declarative/util/qdeclarativepathinterpolator.cpp @@ -41,7 +41,7 @@ #include "qdeclarativepathinterpolator_p.h" -#include "private/qdeclarativepath_p.h" +#include "qdeclarativepath_p.h" QT_BEGIN_NAMESPACE diff --git a/src/declarative/util/qdeclarativepixmapcache.cpp b/src/declarative/util/qdeclarativepixmapcache.cpp index 276219e..556524c 100644 --- a/src/declarative/util/qdeclarativepixmapcache.cpp +++ b/src/declarative/util/qdeclarativepixmapcache.cpp @@ -39,9 +39,9 @@ ** ****************************************************************************/ -#include "private/qdeclarativepixmapcache_p.h" -#include "qdeclarativenetworkaccessmanagerfactory.h" -#include "qdeclarativeimageprovider.h" +#include "qdeclarativepixmapcache_p.h" +#include +#include #include #include diff --git a/src/declarative/util/qdeclarativepropertychanges.cpp b/src/declarative/util/qdeclarativepropertychanges.cpp index 3684b38..fc55943 100644 --- a/src/declarative/util/qdeclarativepropertychanges.cpp +++ b/src/declarative/util/qdeclarativepropertychanges.cpp @@ -39,23 +39,23 @@ ** ****************************************************************************/ -#include "private/qdeclarativepropertychanges_p.h" +#include "qdeclarativepropertychanges_p.h" -#include "private/qdeclarativeopenmetaobject_p.h" -#include "private/qdeclarativerewrite_p.h" -#include "private/qdeclarativeengine_p.h" -#include "private/qdeclarativecompiler_p.h" +#include "qdeclarativeopenmetaobject_p.h" +#include +#include +#include #include -#include -#include +#include +#include #include -#include +#include #include -#include -#include -#include -#include +#include +#include +#include +#include #include diff --git a/src/declarative/util/qdeclarativepropertychanges_p.h b/src/declarative/util/qdeclarativepropertychanges_p.h index fe3dc39..6d3e032 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 "private/qdeclarativestateoperations_p.h" +#include "qdeclarativestateoperations_p.h" #include QT_BEGIN_HEADER diff --git a/src/declarative/util/qdeclarativepropertymap.cpp b/src/declarative/util/qdeclarativepropertymap.cpp index 6e0c12d..1149683 100644 --- a/src/declarative/util/qdeclarativepropertymap.cpp +++ b/src/declarative/util/qdeclarativepropertymap.cpp @@ -42,7 +42,7 @@ #include "qdeclarativepropertymap.h" #include -#include "private/qdeclarativeopenmetaobject_p.h" +#include "qdeclarativeopenmetaobject_p.h" #include diff --git a/src/declarative/util/qdeclarativesmoothedanimation.cpp b/src/declarative/util/qdeclarativesmoothedanimation.cpp index dd7bfe2..45c6885 100644 --- a/src/declarative/util/qdeclarativesmoothedanimation.cpp +++ b/src/declarative/util/qdeclarativesmoothedanimation.cpp @@ -39,15 +39,15 @@ ** ****************************************************************************/ -#include "private/qdeclarativesmoothedanimation_p.h" -#include "private/qdeclarativesmoothedanimation_p_p.h" +#include "qdeclarativesmoothedanimation_p.h" +#include "qdeclarativesmoothedanimation_p_p.h" -#include "private/qdeclarativeanimation_p_p.h" +#include "qdeclarativeanimation_p_p.h" #include -#include "private/qdeclarativeproperty_p.h" +#include -#include "private/qdeclarativeglobal_p.h" +#include #include diff --git a/src/declarative/util/qdeclarativesmoothedanimation_p.h b/src/declarative/util/qdeclarativesmoothedanimation_p.h index b1cb44f..9417383 100644 --- a/src/declarative/util/qdeclarativesmoothedanimation_p.h +++ b/src/declarative/util/qdeclarativesmoothedanimation_p.h @@ -43,7 +43,7 @@ #define QDECLARATIVESMOOTHEDANIMATION_H #include -#include "private/qdeclarativeanimation_p.h" +#include "qdeclarativeanimation_p.h" #include diff --git a/src/declarative/util/qdeclarativesmoothedanimation_p_p.h b/src/declarative/util/qdeclarativesmoothedanimation_p_p.h index 224dc75..08b1450 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 "private/qdeclarativesmoothedanimation_p.h" -#include "private/qdeclarativeanimation_p.h" +#include "qdeclarativesmoothedanimation_p.h" +#include "qdeclarativeanimation_p.h" -#include "private/qdeclarativeanimation_p_p.h" +#include "qdeclarativeanimation_p_p.h" #include diff --git a/src/declarative/util/qdeclarativespringanimation.cpp b/src/declarative/util/qdeclarativespringanimation.cpp index 619811f..b0b12c7 100644 --- a/src/declarative/util/qdeclarativespringanimation.cpp +++ b/src/declarative/util/qdeclarativespringanimation.cpp @@ -39,10 +39,10 @@ ** ****************************************************************************/ -#include "private/qdeclarativespringanimation_p.h" +#include "qdeclarativespringanimation_p.h" -#include "private/qdeclarativeanimation_p_p.h" -#include +#include "qdeclarativeanimation_p_p.h" +#include #include diff --git a/src/declarative/util/qdeclarativespringanimation_p.h b/src/declarative/util/qdeclarativespringanimation_p.h index bb9762b..14a34b4 100644 --- a/src/declarative/util/qdeclarativespringanimation_p.h +++ b/src/declarative/util/qdeclarativespringanimation_p.h @@ -43,7 +43,7 @@ #define QDECLARATIVESPRINGANIMATION_H #include -#include "private/qdeclarativeanimation_p.h" +#include "qdeclarativeanimation_p.h" #include diff --git a/src/declarative/util/qdeclarativestate.cpp b/src/declarative/util/qdeclarativestate.cpp index 4779208..e5e245f 100644 --- a/src/declarative/util/qdeclarativestate.cpp +++ b/src/declarative/util/qdeclarativestate.cpp @@ -39,17 +39,17 @@ ** ****************************************************************************/ -#include "private/qdeclarativestate_p_p.h" -#include "private/qdeclarativestate_p.h" +#include "qdeclarativestate_p_p.h" +#include "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 "qdeclarativetransition_p.h" +#include "qdeclarativestategroup_p.h" +#include "qdeclarativestateoperations_p.h" +#include "qdeclarativeanimation_p.h" +#include "qdeclarativeanimation_p_p.h" -#include -#include +#include +#include #include diff --git a/src/declarative/util/qdeclarativestate_p_p.h b/src/declarative/util/qdeclarativestate_p_p.h index 2479413..5ddd0d5 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 "private/qdeclarativestate_p.h" +#include "qdeclarativestate_p.h" -#include "private/qdeclarativeanimation_p_p.h" -#include "private/qdeclarativetransitionmanager_p_p.h" +#include "qdeclarativeanimation_p_p.h" +#include "qdeclarativetransitionmanager_p_p.h" #include #include diff --git a/src/declarative/util/qdeclarativestategroup.cpp b/src/declarative/util/qdeclarativestategroup.cpp index a349ea9..c29aaa7 100644 --- a/src/declarative/util/qdeclarativestategroup.cpp +++ b/src/declarative/util/qdeclarativestategroup.cpp @@ -39,13 +39,13 @@ ** ****************************************************************************/ -#include "private/qdeclarativestategroup_p.h" +#include "qdeclarativestategroup_p.h" -#include "private/qdeclarativetransition_p.h" -#include "private/qdeclarativestate_p_p.h" +#include "qdeclarativetransition_p.h" +#include "qdeclarativestate_p_p.h" -#include -#include +#include +#include #include #include diff --git a/src/declarative/util/qdeclarativestategroup_p.h b/src/declarative/util/qdeclarativestategroup_p.h index e539f3f..c593255 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 "private/qdeclarativestate_p.h" +#include "qdeclarativestate_p.h" QT_BEGIN_HEADER diff --git a/src/declarative/util/qdeclarativestateoperations.cpp b/src/declarative/util/qdeclarativestateoperations.cpp index 89cc947..ec79120 100644 --- a/src/declarative/util/qdeclarativestateoperations.cpp +++ b/src/declarative/util/qdeclarativestateoperations.cpp @@ -39,18 +39,18 @@ ** ****************************************************************************/ -#include "private/qdeclarativestateoperations_p.h" +#include "qdeclarativestateoperations_p.h" #include #include #include #include -#include -#include -#include "private/qdeclarativecontext_p.h" -#include "private/qdeclarativeproperty_p.h" -#include "private/qdeclarativebinding_p.h" -#include "private/qdeclarativestate_p_p.h" +#include +#include +#include +#include +#include +#include "qdeclarativestate_p_p.h" #include #include diff --git a/src/declarative/util/qdeclarativestateoperations_p.h b/src/declarative/util/qdeclarativestateoperations_p.h index 9d30bf7..68d3338 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 "private/qdeclarativestate_p.h" +#include "qdeclarativestate_p.h" #include QT_BEGIN_HEADER diff --git a/src/declarative/util/qdeclarativestyledtext.cpp b/src/declarative/util/qdeclarativestyledtext.cpp index b3d6c87..872bad6 100644 --- a/src/declarative/util/qdeclarativestyledtext.cpp +++ b/src/declarative/util/qdeclarativestyledtext.cpp @@ -45,7 +45,7 @@ #include #include #include -#include "private/qdeclarativestyledtext_p.h" +#include "qdeclarativestyledtext_p.h" /* QDeclarativeStyledText supports few tags: diff --git a/src/declarative/util/qdeclarativesystempalette.cpp b/src/declarative/util/qdeclarativesystempalette.cpp index b4216cb..61d8406 100644 --- a/src/declarative/util/qdeclarativesystempalette.cpp +++ b/src/declarative/util/qdeclarativesystempalette.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include "private/qdeclarativesystempalette_p.h" +#include "qdeclarativesystempalette_p.h" #include diff --git a/src/declarative/util/qdeclarativetimeline.cpp b/src/declarative/util/qdeclarativetimeline.cpp index ce7044a..7066d3d 100644 --- a/src/declarative/util/qdeclarativetimeline.cpp +++ b/src/declarative/util/qdeclarativetimeline.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include "private/qdeclarativetimeline_p_p.h" +#include "qdeclarativetimeline_p_p.h" #include #include diff --git a/src/declarative/util/qdeclarativetimer.cpp b/src/declarative/util/qdeclarativetimer.cpp index de37f60..a4a2362 100644 --- a/src/declarative/util/qdeclarativetimer.cpp +++ b/src/declarative/util/qdeclarativetimer.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include "private/qdeclarativetimer_p.h" +#include "qdeclarativetimer_p.h" #include #include diff --git a/src/declarative/util/qdeclarativetransition.cpp b/src/declarative/util/qdeclarativetransition.cpp index df22a57..b0f8cbd 100644 --- a/src/declarative/util/qdeclarativetransition.cpp +++ b/src/declarative/util/qdeclarativetransition.cpp @@ -39,13 +39,13 @@ ** ****************************************************************************/ -#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 "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 diff --git a/src/declarative/util/qdeclarativetransition_p.h b/src/declarative/util/qdeclarativetransition_p.h index db10258..a53346e 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 "private/qdeclarativestate_p.h" +#include "qdeclarativestate_p.h" #include diff --git a/src/declarative/util/qdeclarativetransitionmanager.cpp b/src/declarative/util/qdeclarativetransitionmanager.cpp index 30504cb..57336f5 100644 --- a/src/declarative/util/qdeclarativetransitionmanager.cpp +++ b/src/declarative/util/qdeclarativetransitionmanager.cpp @@ -39,14 +39,14 @@ ** ****************************************************************************/ -#include "private/qdeclarativetransitionmanager_p_p.h" +#include "qdeclarativetransitionmanager_p_p.h" -#include "private/qdeclarativestate_p_p.h" -#include "private/qdeclarativestate_p.h" +#include "qdeclarativestate_p_p.h" +#include "qdeclarativestate_p.h" -#include -#include -#include +#include +#include +#include QT_BEGIN_NAMESPACE diff --git a/src/declarative/util/qdeclarativetransitionmanager_p_p.h b/src/declarative/util/qdeclarativetransitionmanager_p_p.h index c3645ad..94a2dd1 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 "private/qdeclarativestateoperations_p.h" +#include "qdeclarativestateoperations_p.h" QT_BEGIN_NAMESPACE diff --git a/src/declarative/util/qdeclarativeutilmodule.cpp b/src/declarative/util/qdeclarativeutilmodule.cpp index 18fefa4..0a8f04b 100644 --- a/src/declarative/util/qdeclarativeutilmodule.cpp +++ b/src/declarative/util/qdeclarativeutilmodule.cpp @@ -39,31 +39,31 @@ ** ****************************************************************************/ -#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/qdeclarativepackage_p.h" -#include "private/qdeclarativepropertychanges_p.h" -#include "private/qdeclarativespringanimation_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/qdeclarativesystempalette_p.h" -#include "private/qdeclarativetimer_p.h" -#include "private/qdeclarativetransition_p.h" -#include "private/qdeclarativeapplication_p.h" -#include "qdeclarativeinfo.h" -#include "private/qdeclarativetypenotavailable_p.h" +#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 "qdeclarativepackage_p.h" +#include "qdeclarativepropertychanges_p.h" +#include "qdeclarativespringanimation_p.h" +#include "qdeclarativestategroup_p.h" +#include "qdeclarativestateoperations_p.h" +#include "qdeclarativestate_p.h" +#include "qdeclarativestate_p_p.h" +#include "qdeclarativesystempalette_p.h" +#include "qdeclarativetimer_p.h" +#include "qdeclarativetransition_p.h" +#include "qdeclarativeapplication_p.h" +#include +#include #ifndef QT_NO_XMLPATTERNS -#include "private/qdeclarativexmllistmodel_p.h" +#include "qdeclarativexmllistmodel_p.h" #endif #include #include diff --git a/src/declarative/util/qdeclarativexmllistmodel.cpp b/src/declarative/util/qdeclarativexmllistmodel.cpp index 2dd7b57..d757516 100644 --- a/src/declarative/util/qdeclarativexmllistmodel.cpp +++ b/src/declarative/util/qdeclarativexmllistmodel.cpp @@ -39,10 +39,10 @@ ** ****************************************************************************/ -#include "private/qdeclarativexmllistmodel_p.h" +#include "qdeclarativexmllistmodel_p.h" #include -#include +#include #include #include diff --git a/src/declarative/util/qlistmodelinterface.cpp b/src/declarative/util/qlistmodelinterface.cpp index 56fc8ee..4461456 100644 --- a/src/declarative/util/qlistmodelinterface.cpp +++ b/src/declarative/util/qlistmodelinterface.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include "private/qlistmodelinterface_p.h" +#include "qlistmodelinterface_p.h" QT_BEGIN_NAMESPACE diff --git a/src/declarative/util/util.pri b/src/declarative/util/util.pri index ae67a86..1d71225 100644 --- a/src/declarative/util/util.pri +++ b/src/declarative/util/util.pri @@ -1,5 +1,3 @@ -INCLUDEPATH += $$PWD - SOURCES += \ $$PWD/qdeclarativeapplication.cpp \ $$PWD/qdeclarativeutilmodule.cpp\ -- 1.7.2.5