diff options
Diffstat (limited to 'src/declarative/qml')
63 files changed, 248 insertions, 262 deletions
diff --git a/src/declarative/qml/ftw/ftw.pri b/src/declarative/qml/ftw/ftw.pri index 05ac36ddbe..c7750468d9 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 4f1ff2fd21..3ae0a6d8eb 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 b84fe92820..609057dd88 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 <private/qdeclarativedebugtrace_p.h> #include <QVariant> #include <QtCore/qdebug.h> diff --git a/src/declarative/qml/qdeclarativebinding_p.h b/src/declarative/qml/qdeclarativebinding_p.h index fc9dd8758f..6f545fc2c6 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 <QtCore/QObject> #include <QtCore/QMetaProperty> diff --git a/src/declarative/qml/qdeclarativebinding_p_p.h b/src/declarative/qml/qdeclarativebinding_p_p.h index 78c4e0e829..c704919f78 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 11dec91158..6bbbb243fc 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 <private/qmetaobjectbuilder_p.h> +#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 <private/qdeclarativedebugtrace_p.h> +#include <private/qv8debugservice_p.h> #include <QtCore/qstringbuilder.h> #include <QtCore/qdebug.h> diff --git a/src/declarative/qml/qdeclarativecleanup.cpp b/src/declarative/qml/qdeclarativecleanup.cpp index d0d368773b..da7930fd07 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 6815967f57..cc976de500 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 <QtCore/qdebug.h> diff --git a/src/declarative/qml/qdeclarativecompiler.cpp b/src/declarative/qml/qdeclarativecompiler.cpp index 32c6546d0a..06d543ab36 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 <private/qmetaobjectbuilder_p.h> -#include "private/qfastmetabuilder_p.h" -#include "private/qdeclarativestringconverters_p.h" -#include "private/qdeclarativeengine_p.h" +#include <private/qfastmetabuilder_p.h> +#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 <private/qdeclarativejsast_p.h> +#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 <private/qv4compiler_p.h> #include <QColor> #include <QDebug> @@ -3027,7 +3027,7 @@ bool QDeclarativeCompiler::checkValidId(QDeclarativeScript::Value *v, const QStr return true; } -#include <qdeclarativejsparser_p.h> +#include <private/qdeclarativejsparser_p.h> static QStringList astNodeToStringList(QDeclarativeJS::AST::Node *node) { diff --git a/src/declarative/qml/qdeclarativecompiler_p.h b/src/declarative/qml/qdeclarativecompiler_p.h index 86471a65a2..ef37335ad8 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 <private/qv8_p.h> +#include "qdeclarativeinstruction_p.h" +#include "qdeclarativescript_p.h" +#include "qdeclarativeengine_p.h" +#include <private/qbitfield_p.h> +#include "qdeclarativepropertycache_p.h" +#include "qdeclarativeintegercache_p.h" +#include "qdeclarativetypenamecache_p.h" +#include "qdeclarativetypeloader_p.h" #include <QtCore/qbytearray.h> #include <QtCore/qset.h> diff --git a/src/declarative/qml/qdeclarativecomponent.cpp b/src/declarative/qml/qdeclarativecomponent.cpp index eafe8539df..580ce5b801 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 <private/qdeclarativedebugtrace_p.h> +#include <private/qdeclarativeenginedebugservice_p.h> #include "qdeclarativeincubator.h" -#include "private/qdeclarativeincubator_p.h" +#include "qdeclarativeincubator_p.h" -#include "private/qv8engine_p.h" -#include "private/qv8include_p.h" +#include <private/qv8engine_p.h> +#include <private/qv8include_p.h> #include <QStack> #include <QStringList> diff --git a/src/declarative/qml/qdeclarativecomponent_p.h b/src/declarative/qml/qdeclarativecomponent_p.h index bbbf8bdfb7..ea68291942 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 <private/qv8_p.h> +#include "qdeclarativeengine_p.h" +#include "qdeclarativetypeloader_p.h" +#include <private/qbitfield_p.h> +#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 fc5091e09d..d4662cf43a 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 <private/qv4bindings_p.h> +#include <private/qv8bindings_p.h> #include <qjsengine.h> #include <QtCore/qvarlengtharray.h> diff --git a/src/declarative/qml/qdeclarativecontext_p.h b/src/declarative/qml/qdeclarativecontext_p.h index 6fd8957f7d..ba4edb8e15 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 <QtCore/qhash.h> #include <QtDeclarative/qjsvalue.h> #include <QtCore/qset.h> #include <private/qobject_p.h> -#include "private/qdeclarativeguard_p.h" +#include "qdeclarativeguard_p.h" #include <private/qv8_p.h> diff --git a/src/declarative/qml/qdeclarativecustomparser.cpp b/src/declarative/qml/qdeclarativecustomparser.cpp index 4327110d18..e783d3ac75 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 <QtCore/qdebug.h> diff --git a/src/declarative/qml/qdeclarativecustomparser_p.h b/src/declarative/qml/qdeclarativecustomparser_p.h index 9aca8030c7..94b68652f4 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 <QtCore/qbytearray.h> #include <QtCore/qxmlstream.h> diff --git a/src/declarative/qml/qdeclarativecustomparser_p_p.h b/src/declarative/qml/qdeclarativecustomparser_p_p.h index cebad26b33..7a9c58db23 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 <QtCore/qglobal.h> diff --git a/src/declarative/qml/qdeclarativedirparser.cpp b/src/declarative/qml/qdeclarativedirparser.cpp index 08d953f3e4..0af6775b6e 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 <private/qdeclarativeglobal_p.h> +#include "qdeclarativeglobal_p.h" #include <QtCore/QTextStream> #include <QtCore/QFile> diff --git a/src/declarative/qml/qdeclarativeengine.cpp b/src/declarative/qml/qdeclarativeengine.cpp index 383d37a3ed..dc32c4147a 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 <private/qdeclarativeenginedebugservice_p.h> +#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 <private/qdeclarativedebugtrace_p.h> +#include <private/qdeclarativeapplication_p.h> +#include <private/qv8debugservice_p.h> #include "qdeclarativeincubator.h" -#include "private/qv8profilerservice_p.h" +#include <private/qv8profilerservice_p.h> #include <QtCore/qmetaobject.h> #include <QNetworkAccessManager> diff --git a/src/declarative/qml/qdeclarativeengine_p.h b/src/declarative/qml/qdeclarativeengine_p.h index 71d6220860..88eda390e3 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 <private/qpodvector_p.h> #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 <private/qintrusivelist_p.h> #include <QtCore/qlist.h> #include <QtCore/qpair.h> diff --git a/src/declarative/qml/qdeclarativeexpression.cpp b/src/declarative/qml/qdeclarativeexpression.cpp index c62314d94b..27979afb9c 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 <QtCore/qdebug.h> diff --git a/src/declarative/qml/qdeclarativefastproperties.cpp b/src/declarative/qml/qdeclarativefastproperties.cpp index 93703e2bdc..5816b3f8cb 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 <private/qdeclarativedata_p.h> -#include <private/qdeclarativenotifier_p.h> +#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 21e91de910..f94e9e4bae 100644 --- a/src/declarative/qml/qdeclarativeimport.cpp +++ b/src/declarative/qml/qdeclarativeimport.cpp @@ -52,7 +52,7 @@ #include <private/qdeclarativeengine_p.h> #ifdef Q_OS_SYMBIAN -#include "private/qcore_symbian_p.h" +#include <private/qcore_symbian_p.h> #endif QT_BEGIN_NAMESPACE diff --git a/src/declarative/qml/qdeclarativeincubator.cpp b/src/declarative/qml/qdeclarativeincubator.cpp index c771a6d469..1417ed466a 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 <private/qdeclarativecompiler_p.h> -#include <private/qdeclarativeexpression_p.h> +#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 d221eaeefb..4f1bae002d 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 <QCoreApplication> diff --git a/src/declarative/qml/qdeclarativeinstruction.cpp b/src/declarative/qml/qdeclarativeinstruction.cpp index c47f68f5bf..5f8b253858 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 <QtCore/qdebug.h> diff --git a/src/declarative/qml/qdeclarativeintegercache.cpp b/src/declarative/qml/qdeclarativeintegercache.cpp index 16bf8d1dab..372c7a2b3b 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 1ac03ada66..ee2fbc2b66 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 <private/qdeclarativerefcount_p.h> +#include <private/qhashedstring_p.h> QT_BEGIN_NAMESPACE diff --git a/src/declarative/qml/qdeclarativelist.cpp b/src/declarative/qml/qdeclarativelist.cpp index 458812a896..04cef6c737 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 8a69504c28..10495e990c 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 0590b2c7e4..5577993fc5 100644 --- a/src/declarative/qml/qdeclarativemetatype.cpp +++ b/src/declarative/qml/qdeclarativemetatype.cpp @@ -40,7 +40,7 @@ ****************************************************************************/ #include <QtDeclarative/qdeclarativeprivate.h> -#include "private/qdeclarativemetatype_p.h" +#include "qdeclarativemetatype_p.h" #include <private/qdeclarativeproxymetaobject_p.h> #include <private/qdeclarativecustomparser_p.h> diff --git a/src/declarative/qml/qdeclarativenotifier.cpp b/src/declarative/qml/qdeclarativenotifier.cpp index 77bce8e440..a195280316 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 d9c334a4c1..1d0d4fc6f5 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 e43cd6f9e2..a402d24fe8 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 <QStringList> #include <QtCore/qdebug.h> diff --git a/src/declarative/qml/qdeclarativepropertycache.cpp b/src/declarative/qml/qdeclarativepropertycache.cpp index 6337750335..cf2022cb0a 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 <private/qv8engine_p.h> #include <private/qmetaobject_p.h> diff --git a/src/declarative/qml/qdeclarativepropertycache_p.h b/src/declarative/qml/qdeclarativepropertycache_p.h index f1161b2e6f..068db589bd 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 <private/qdeclarativerefcount_p.h> +#include "qdeclarativecleanup_p.h" +#include "qdeclarativenotifier_p.h" -#include "private/qhashedstring_p.h" +#include <private/qhashedstring_p.h> #include <QtCore/qvector.h> QT_BEGIN_NAMESPACE diff --git a/src/declarative/qml/qdeclarativeproxymetaobject.cpp b/src/declarative/qml/qdeclarativeproxymetaobject.cpp index 3263ae5af2..f4029fc76b 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 be399dd074..98bd34f9ed 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 <QtCore/qdebug.h> diff --git a/src/declarative/qml/qdeclarativescript.cpp b/src/declarative/qml/qdeclarativescript.cpp index 2bc358a579..fb4f26a781 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 <private/qdeclarativerewrite_p.h> #include <QStack> #include <QCoreApplication> diff --git a/src/declarative/qml/qdeclarativesqldatabase.cpp b/src/declarative/qml/qdeclarativesqldatabase.cpp index 7fc62078f3..dff87b2f78 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 <private/qdeclarativerefcount_p.h> #include <QtCore/qobject.h> #include <QtSql/qsqldatabase.h> diff --git a/src/declarative/qml/qdeclarativestringconverters.cpp b/src/declarative/qml/qdeclarativestringconverters.cpp index b949adf5ec..51bb3a4517 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 <QtGui/qcolor.h> #include <QtGui/qvector3d.h> diff --git a/src/declarative/qml/qdeclarativetypenamecache.cpp b/src/declarative/qml/qdeclarativetypenamecache.cpp index 31ad48a0dd..8ff6532bd5 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 219d07a5eb..a0a3d53d87 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 <private/qdeclarativerefcount_p.h> +#include "qdeclarativecleanup_p.h" +#include "qdeclarativemetatype_p.h" #include <private/qhashedstring_p.h> diff --git a/src/declarative/qml/qdeclarativevaluetype.cpp b/src/declarative/qml/qdeclarativevaluetype.cpp index 3e77f4b503..9f43d0ef72 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 <private/qfont_p.h> #include <QtCore/qdebug.h> diff --git a/src/declarative/qml/qdeclarativevaluetype_p.h b/src/declarative/qml/qdeclarativevaluetype_p.h index 41d5e7cb8f..1feab4147b 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 <QtCore/qobject.h> #include <QtCore/qrect.h> diff --git a/src/declarative/qml/qdeclarativevme.cpp b/src/declarative/qml/qdeclarativevme.cpp index d407fae1ce..b7abef4aef 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 <private/qmetaobjectbuilder_p.h> -#include "private/qfastmetabuilder_p.h" -#include "private/qdeclarativedata_p.h" +#include <private/qfastmetabuilder_p.h> +#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 <private/qv4bindings_p.h> +#include <private/qv8bindings_p.h> +#include "qdeclarativeglobal_p.h" +#include <private/qfinitestack_p.h> #include "qdeclarativescriptstring.h" #include "qdeclarativescriptstring_p.h" diff --git a/src/declarative/qml/qdeclarativevme_p.h b/src/declarative/qml/qdeclarativevme_p.h index 19db2ef217..b74bc547bf 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 <private/qbitfield_p.h> +#include "qdeclarativeinstruction_p.h" +#include <private/qrecursionwatcher_p.h> #include <QtCore/QStack> #include <QtCore/QString> diff --git a/src/declarative/qml/qdeclarativevmemetaobject.cpp b/src/declarative/qml/qdeclarativevmemetaobject.cpp index abf73490d1..9cdec020a7 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 <private/qdeclarativerefcount_p.h> #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 0c02b7632c..400961b27f 100644 --- a/src/declarative/qml/qdeclarativevmemetaobject_p.h +++ b/src/declarative/qml/qdeclarativevmemetaobject_p.h @@ -65,11 +65,11 @@ #include <private/qobject_p.h> -#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 <private/qv8gccallback_p.h> #include <private/qv8_p.h> diff --git a/src/declarative/qml/qdeclarativewatcher.cpp b/src/declarative/qml/qdeclarativewatcher.cpp index 33f0358003..42c0b5cc72 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 <qdeclarativedebugservice_p.h> -#include "private/qdeclarativeproperty_p.h" -#include "private/qdeclarativevaluetype_p.h" +#include <private/qdeclarativedebugservice_p.h> +#include "qdeclarativeproperty_p.h" +#include "qdeclarativevaluetype_p.h" #include <QtCore/qmetaobject.h> #include <QtCore/qdebug.h> diff --git a/src/declarative/qml/qdeclarativeworkerscript.cpp b/src/declarative/qml/qdeclarativeworkerscript.cpp index c6425d087c..98aaddceef 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 <private/qdeclarativelistmodel_p.h> +#include <private/qdeclarativelistmodelworkeragent_p.h> +#include "qdeclarativeengine_p.h" +#include "qdeclarativeexpression_p.h" #include <QtCore/qcoreevent.h> #include <QtCore/qcoreapplication.h> diff --git a/src/declarative/qml/qdeclarativexmlhttprequest.cpp b/src/declarative/qml/qdeclarativexmlhttprequest.cpp index 23f21c91e3..0009163036 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 <private/qv8engine_p.h> #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 <private/qdeclarativerefcount_p.h> +#include "qdeclarativeengine_p.h" +#include "qdeclarativeexpression_p.h" #include "qdeclarativeglobal_p.h" -#include "qv8domerrors_p.h" +#include <private/qv8domerrors_p.h> #include <QtCore/qobject.h> #include <QtDeclarative/qjsvalue.h> diff --git a/src/declarative/qml/qml.pri b/src/declarative/qml/qml.pri index 608b212915..b14e547f40 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 a9fa1b5772..e51ee5ba4e 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 d3a68d0ecc..e4b4597ebf 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 b5229ae89c..2e8a360f36 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 <private/qdeclarativefastproperties_p.h> #include <private/qdeclarativedebugtrace_p.h> diff --git a/src/declarative/qml/v4/qv4ir_p.h b/src/declarative/qml/v4/qv4ir_p.h index 86b0d9d03e..9dbd22047a 100644 --- a/src/declarative/qml/v4/qv4ir_p.h +++ b/src/declarative/qml/v4/qv4ir_p.h @@ -60,7 +60,7 @@ #include <private/qdeclarativeengine_p.h> #include <private/qv4compiler_p.h> -#include <qdeclarativepool_p.h> +#include <private/qdeclarativepool_p.h> #include <QtCore/qvarlengtharray.h> // #define DEBUG_IR_STRUCTURE diff --git a/src/declarative/qml/v4/v4.pri b/src/declarative/qml/v4/v4.pri index a96975d44e..b6784851d8 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 68075e55f3..102c7879d8 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 <qjsvalueiterator_p.h> -#include <qv8engine_p.h> -#include <qjsconverter_p.h> +#include "qjsvalueiterator_p.h" +#include <private/qv8engine_p.h> +#include "qjsconverter_p.h" inline QJSValueIteratorPrivate::QJSValueIteratorPrivate(const QJSValuePrivate* value) : m_object(const_cast<QJSValuePrivate*>(value)) diff --git a/src/declarative/qml/v8/qv8bindings_p.h b/src/declarative/qml/v8/qv8bindings_p.h index 60b1afd551..f7581a41aa 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 <private/qdeclarativepropertycache_p.h> +#include <private/qdeclarativeexpression_p.h> +#include <private/qdeclarativebinding_p.h> QT_BEGIN_HEADER diff --git a/src/declarative/qml/v8/qv8variantwrapper.cpp b/src/declarative/qml/v8/qv8variantwrapper.cpp index 4b2acfc965..fbf083273d 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 <private/qdeclarativeengine_p.h> QT_BEGIN_NAMESPACE diff --git a/src/declarative/qml/v8/script.pri b/src/declarative/qml/v8/script.pri index 68a8c64c27..587ab6f42d 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 104f34fd25..c4372ab82a 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) |