diff options
Diffstat (limited to 'src/declarative/qml')
53 files changed, 170 insertions, 170 deletions
diff --git a/src/declarative/qml/qmlbasicscript.cpp b/src/declarative/qml/qmlbasicscript.cpp index b3bcf42..a27c4fb 100644 --- a/src/declarative/qml/qmlbasicscript.cpp +++ b/src/declarative/qml/qmlbasicscript.cpp @@ -42,14 +42,14 @@ #include "qmlbasicscript_p.h" #include <QColor> #include <QDebug> -#include <private/qmlengine_p.h> -#include <private/qmlcontext_p.h> +#include "qmlengine_p.h" +#include "qmlcontext_p.h" #include <QStack> -#include <private/qfxperf_p_p.h> -#include <private/qmlrefcount_p.h> -#include <private/qmljsast_p.h> -#include <private/qmljsengine_p.h> -#include <private/qmlglobal_p.h> +#include "qfxperf_p_p.h" +#include "qmlrefcount_p.h" +#include "qmljsast_p.h" +#include "qmljsengine_p.h" +#include "qmlglobal_p.h" QT_BEGIN_NAMESPACE diff --git a/src/declarative/qml/qmlbasicscript_p.h b/src/declarative/qml/qmlbasicscript_p.h index 57d4fa7..4c4b178 100644 --- a/src/declarative/qml/qmlbasicscript_p.h +++ b/src/declarative/qml/qmlbasicscript_p.h @@ -56,7 +56,7 @@ #include <QtCore/QList> #include <QtCore/QByteArray> #include <QtCore/QVariant> -#include <private/qmlparser_p.h> +#include "qmlparser_p.h" QT_BEGIN_HEADER diff --git a/src/declarative/qml/qmlbinding.cpp b/src/declarative/qml/qmlbinding.cpp index ef92308..bb9a803 100644 --- a/src/declarative/qml/qmlbinding.cpp +++ b/src/declarative/qml/qmlbinding.cpp @@ -45,11 +45,11 @@ #include <qmlcontext.h> #include <qmlinfo.h> #include <QVariant> -#include <private/qfxperf_p_p.h> +#include "qfxperf_p_p.h" #include <QtCore/qdebug.h> -#include <private/qmlcontext_p.h> -#include <private/qmldeclarativedata_p.h> -#include <private/qmlstringconverters_p.h> +#include "qmlcontext_p.h" +#include "qmldeclarativedata_p.h" +#include "qmlstringconverters_p.h" Q_DECLARE_METATYPE(QList<QObject *>); diff --git a/src/declarative/qml/qmlbindingoptimizations.cpp b/src/declarative/qml/qmlbindingoptimizations.cpp index 0efa600..5c67241 100644 --- a/src/declarative/qml/qmlbindingoptimizations.cpp +++ b/src/declarative/qml/qmlbindingoptimizations.cpp @@ -40,7 +40,7 @@ ****************************************************************************/ #include "qmlbindingoptimizations_p.h" -#include <private/qmlcontext_p.h> +#include "qmlcontext_p.h" QT_BEGIN_NAMESPACE diff --git a/src/declarative/qml/qmlbindingoptimizations_p.h b/src/declarative/qml/qmlbindingoptimizations_p.h index 2cdc07d..1e3723f 100644 --- a/src/declarative/qml/qmlbindingoptimizations_p.h +++ b/src/declarative/qml/qmlbindingoptimizations_p.h @@ -53,7 +53,7 @@ // We mean it. // -#include <private/qmlexpression_p.h> +#include "qmlexpression_p.h" #include <qmlbinding.h> QT_BEGIN_HEADER diff --git a/src/declarative/qml/qmlboundsignal.cpp b/src/declarative/qml/qmlboundsignal.cpp index deb15dc..4a0577a 100644 --- a/src/declarative/qml/qmlboundsignal.cpp +++ b/src/declarative/qml/qmlboundsignal.cpp @@ -40,15 +40,15 @@ ****************************************************************************/ #include "qmlboundsignal_p.h" -#include "private/qmetaobjectbuilder_p.h" -#include "private/qmlengine_p.h" -#include "private/qmlexpression_p.h" -#include "private/qmlcontext_p.h" +#include "qmetaobjectbuilder_p.h" +#include "qmlengine_p.h" +#include "qmlexpression_p.h" +#include "qmlcontext_p.h" #include <qmlmetatype.h> #include <qml.h> #include <qmlcontext.h> #include <QtCore/qdebug.h> -#include <private/qmlglobal_p.h> +#include "qmlglobal_p.h" QT_BEGIN_NAMESPACE diff --git a/src/declarative/qml/qmlcleanup.cpp b/src/declarative/qml/qmlcleanup.cpp index ef803d0..6b98191 100644 --- a/src/declarative/qml/qmlcleanup.cpp +++ b/src/declarative/qml/qmlcleanup.cpp @@ -40,7 +40,7 @@ ****************************************************************************/ #include "qmlcleanup_p.h" -#include <private/qmlengine_p.h> +#include "qmlengine_p.h" /*! \internal diff --git a/src/declarative/qml/qmlcompiler.cpp b/src/declarative/qml/qmlcompiler.cpp index a4e14b2..ee0c484 100644 --- a/src/declarative/qml/qmlcompiler.cpp +++ b/src/declarative/qml/qmlcompiler.cpp @@ -39,14 +39,14 @@ ** ****************************************************************************/ -#include "private/qmlcompiler_p.h" -#include "private/qmlcompositetypedata_p.h" -#include <private/qfxperf_p_p.h> +#include "qmlcompiler_p.h" +#include "qmlcompositetypedata_p.h" +#include "qfxperf_p_p.h" #include "qmlparser_p.h" -#include "private/qmlscriptparser_p.h" +#include "qmlscriptparser_p.h" #include <qmlpropertyvaluesource.h> #include <qmlcomponent.h> -#include "private/qmetaobjectbuilder_p.h" +#include "qmetaobjectbuilder_p.h" #include "qmlbasicscript_p.h" #include <QColor> #include <QDebug> @@ -54,23 +54,23 @@ #include <QSizeF> #include <QRectF> #include <QAtomicInt> -#include <private/qmlstringconverters_p.h> -#include <private/qmlengine_p.h> +#include "qmlstringconverters_p.h" +#include "qmlengine_p.h" #include <qmlengine.h> #include <qmlcontext.h> #include <qmlmetatype.h> #include <QtCore/qdebug.h> #include <QtGui/qapplication.h> -#include "private/qmlcustomparser_p_p.h" -#include <private/qmlcontext_p.h> -#include <private/qmlcomponent_p.h> +#include "qmlcustomparser_p_p.h" +#include "qmlcontext_p.h" +#include "qmlcomponent_p.h" #include "parser/qmljsast_p.h" -#include <private/qmlvmemetaobject_p.h> -#include <private/qmlexpression_p.h> +#include "qmlvmemetaobject_p.h" +#include "qmlexpression_p.h" #include "qmlmetaproperty_p.h" #include "qmlrewrite_p.h" #include <qmlscriptstring.h> -#include <private/qmlglobal_p.h> +#include "qmlglobal_p.h" #include "qmlscriptparser_p.h" @@ -2307,7 +2307,7 @@ bool QmlCompiler::buildDynamicMeta(QmlParser::Object *obj, DynamicMetaMode mode) return true; } -#include <private/qmljsparser_p.h> +#include "qmljsparser_p.h" static QStringList astNodeToStringList(QmlJS::AST::Node *node) { if (node->kind == QmlJS::AST::Node::Kind_IdentifierExpression) { diff --git a/src/declarative/qml/qmlcompiler_p.h b/src/declarative/qml/qmlcompiler_p.h index b54a62a..6b41a5f 100644 --- a/src/declarative/qml/qmlcompiler_p.h +++ b/src/declarative/qml/qmlcompiler_p.h @@ -57,14 +57,14 @@ #include <QtCore/qset.h> #include <qml.h> #include <qmlerror.h> -#include <private/qmlinstruction_p.h> -#include <private/qmlcompositetypemanager_p.h> -#include <private/qmlparser_p.h> -#include <private/qmlengine_p.h> -#include <private/qbitfield_p.h> -#include <private/qmlpropertycache_p.h> -#include <private/qmlintegercache_p.h> -#include <private/qmltypenamecache_p.h> +#include "qmlinstruction_p.h" +#include "qmlcompositetypemanager_p.h" +#include "qmlparser_p.h" +#include "qmlengine_p.h" +#include "qbitfield_p.h" +#include "qmlpropertycache_p.h" +#include "qmlintegercache_p.h" +#include "qmltypenamecache_p.h" QT_BEGIN_NAMESPACE diff --git a/src/declarative/qml/qmlcomponent.cpp b/src/declarative/qml/qmlcomponent.cpp index 5f8b816..1e03557 100644 --- a/src/declarative/qml/qmlcomponent.cpp +++ b/src/declarative/qml/qmlcomponent.cpp @@ -42,21 +42,21 @@ #include "qmlcomponent.h" #include "qmlcomponent_p.h" #include "qmlcompiler_p.h" -#include "private/qmlcontext_p.h" -#include "private/qmlcompositetypedata_p.h" -#include "private/qmlengine_p.h" +#include "qmlcontext_p.h" +#include "qmlcompositetypedata_p.h" +#include "qmlengine_p.h" #include "qmlvme_p.h" #include "qml.h" #include <QStack> -#include <private/qfxperf_p_p.h> +#include "qfxperf_p_p.h" #include <QStringList> #include <qmlengine.h> #include <QFileInfo> #include "qmlbinding.h" #include <QtCore/qdebug.h> #include <QApplication> -#include <private/qmlbinding_p.h> -#include <private/qmlglobal_p.h> +#include "qmlbinding_p.h" +#include "qmlglobal_p.h" #include "qmlscriptparser_p.h" diff --git a/src/declarative/qml/qmlcomponent_p.h b/src/declarative/qml/qmlcomponent_p.h index 61a8a10..c9dfac8 100644 --- a/src/declarative/qml/qmlcomponent_p.h +++ b/src/declarative/qml/qmlcomponent_p.h @@ -57,9 +57,9 @@ #include <QtCore/QStringList> #include <QtCore/QList> #include <private/qobject_p.h> -#include <private/qmlengine_p.h> -#include <private/qmlcompositetypemanager_p.h> -#include <private/qbitfield_p.h> +#include "qmlengine_p.h" +#include "qmlcompositetypemanager_p.h" +#include "qbitfield_p.h" #include <qmlerror.h> #include <qmlcomponent.h> #include <qml.h> diff --git a/src/declarative/qml/qmlcompositetypedata_p.h b/src/declarative/qml/qmlcompositetypedata_p.h index 0d2843d..96531982 100644 --- a/src/declarative/qml/qmlcompositetypedata_p.h +++ b/src/declarative/qml/qmlcompositetypedata_p.h @@ -54,7 +54,7 @@ // #include <QtCore/qglobal.h> -#include <private/qmlengine_p.h> +#include "qmlengine_p.h" QT_BEGIN_NAMESPACE diff --git a/src/declarative/qml/qmlcompositetypemanager.cpp b/src/declarative/qml/qmlcompositetypemanager.cpp index fa68951..ca07d84 100644 --- a/src/declarative/qml/qmlcompositetypemanager.cpp +++ b/src/declarative/qml/qmlcompositetypemanager.cpp @@ -39,17 +39,17 @@ ** ****************************************************************************/ -#include <private/qmlcompositetypedata_p.h> -#include <private/qmlcompositetypemanager_p.h> -#include <private/qmlscriptparser_p.h> +#include "qmlcompositetypedata_p.h" +#include "qmlcompositetypemanager_p.h" +#include "qmlscriptparser_p.h" #include <qmlengine.h> #include <QtNetwork/qnetworkreply.h> -#include <private/qmlengine_p.h> +#include "qmlengine_p.h" #include <QtCore/qdebug.h> #include <QtCore/qfile.h> #include <qmlcomponent.h> -#include <private/qmlcomponent_p.h> -#include <private/qmlcompiler_p.h> +#include "qmlcomponent_p.h" +#include "qmlcompiler_p.h" QT_BEGIN_NAMESPACE diff --git a/src/declarative/qml/qmlcompositetypemanager_p.h b/src/declarative/qml/qmlcompositetypemanager_p.h index 0abbfb5..f81e594 100644 --- a/src/declarative/qml/qmlcompositetypemanager_p.h +++ b/src/declarative/qml/qmlcompositetypemanager_p.h @@ -54,8 +54,8 @@ // #include <QtCore/qglobal.h> -#include <private/qmlscriptparser_p.h> -#include <private/qmlrefcount_p.h> +#include "qmlscriptparser_p.h" +#include "qmlrefcount_p.h" #include <qmlerror.h> #include <qmlengine.h> diff --git a/src/declarative/qml/qmlcontext.cpp b/src/declarative/qml/qmlcontext.cpp index 38cbcfa..be483c9 100644 --- a/src/declarative/qml/qmlcontext.cpp +++ b/src/declarative/qml/qmlcontext.cpp @@ -40,14 +40,14 @@ ****************************************************************************/ #include <qmlcontext.h> -#include <private/qmlcontext_p.h> -#include <private/qmlexpression_p.h> -#include <private/qmlengine_p.h> +#include "qmlcontext_p.h" +#include "qmlexpression_p.h" +#include "qmlengine_p.h" #include <qmlengine.h> #include <qscriptengine.h> #include <QtCore/qvarlengtharray.h> #include <QtCore/qdebug.h> -#include <private/qmlbindingoptimizations_p.h> +#include "qmlbindingoptimizations_p.h" #include <private/qscriptdeclarativeclass_p.h> #include <qmlinfo.h> diff --git a/src/declarative/qml/qmlcontext_p.h b/src/declarative/qml/qmlcontext_p.h index c8d0b2d..4ad524d 100644 --- a/src/declarative/qml/qmlcontext_p.h +++ b/src/declarative/qml/qmlcontext_p.h @@ -55,14 +55,14 @@ #include <qmlcontext.h> #include <private/qobject_p.h> -#include <private/qmldeclarativedata_p.h> +#include "qmldeclarativedata_p.h" #include <QtCore/qhash.h> #include <QtScript/qscriptvalue.h> #include <QtCore/qset.h> #include <private/qguard_p.h> -#include <private/qmlengine_p.h> -#include <private/qmlintegercache_p.h> -#include <private/qmltypenamecache_p.h> +#include "qmlengine_p.h" +#include "qmlintegercache_p.h" +#include "qmltypenamecache_p.h" QT_BEGIN_NAMESPACE diff --git a/src/declarative/qml/qmlcontextscriptclass.cpp b/src/declarative/qml/qmlcontextscriptclass.cpp index fda284a..acf6203 100644 --- a/src/declarative/qml/qmlcontextscriptclass.cpp +++ b/src/declarative/qml/qmlcontextscriptclass.cpp @@ -40,9 +40,9 @@ ****************************************************************************/ #include "qmlcontextscriptclass_p.h" -#include <private/qmlengine_p.h> -#include <private/qmlcontext_p.h> -#include <private/qmltypenamescriptclass_p.h> +#include "qmlengine_p.h" +#include "qmlcontext_p.h" +#include "qmltypenamescriptclass_p.h" QT_BEGIN_NAMESPACE diff --git a/src/declarative/qml/qmlcontextscriptclass_p.h b/src/declarative/qml/qmlcontextscriptclass_p.h index bbd779b..cf91242 100644 --- a/src/declarative/qml/qmlcontextscriptclass_p.h +++ b/src/declarative/qml/qmlcontextscriptclass_p.h @@ -55,7 +55,7 @@ #include <QtScript/qscriptclass.h> #include <private/qscriptdeclarativeclass_p.h> -#include <private/qmltypenamecache_p.h> +#include "qmltypenamecache_p.h" QT_BEGIN_NAMESPACE diff --git a/src/declarative/qml/qmlcustomparser_p.h b/src/declarative/qml/qmlcustomparser_p.h index 88a264f..9b09280 100644 --- a/src/declarative/qml/qmlcustomparser_p.h +++ b/src/declarative/qml/qmlcustomparser_p.h @@ -57,7 +57,7 @@ #include <QtCore/qxmlstream.h> #include <qmlmetatype.h> #include <qmlerror.h> -#include <private/qmlparser_p.h> +#include "qmlparser_p.h" QT_BEGIN_HEADER diff --git a/src/declarative/qml/qmldom.cpp b/src/declarative/qml/qmldom.cpp index f4a137c..596294f 100644 --- a/src/declarative/qml/qmldom.cpp +++ b/src/declarative/qml/qmldom.cpp @@ -41,14 +41,14 @@ #include "qmldom.h" #include "qmldom_p.h" -#include "private/qmlcompositetypedata_p.h" -#include "private/qmlcompiler_p.h" -#include "private/qmlengine_p.h" +#include "qmlcompositetypedata_p.h" +#include "qmlcompiler_p.h" +#include "qmlengine_p.h" #include <QtCore/QByteArray> #include <QtCore/QDebug> #include <QtCore/QString> #include "qmlscriptparser_p.h" -#include <private/qmlglobal_p.h> +#include "qmlglobal_p.h" QT_BEGIN_NAMESPACE diff --git a/src/declarative/qml/qmlengine.cpp b/src/declarative/qml/qmlengine.cpp index 864d07e..0221458 100644 --- a/src/declarative/qml/qmlengine.cpp +++ b/src/declarative/qml/qmlengine.cpp @@ -40,12 +40,12 @@ ****************************************************************************/ #include <QtCore/qmetaobject.h> -#include <private/qmlengine_p.h> -#include <private/qmlcontext_p.h> +#include "qmlengine_p.h" +#include "qmlcontext_p.h" #include <private/qobject_p.h> -#include <private/qmlcompiler_p.h> +#include "qmlcompiler_p.h" #include <private/qscriptdeclarativeclass_p.h> -#include <private/qmlglobalscriptclass_p.h> +#include "qmlglobalscriptclass_p.h" #include <QScriptClass> #include <QNetworkReply> @@ -58,9 +58,9 @@ #include <QDebug> #include <QMetaObject> #include "qml.h" -#include <private/qfxperf_p_p.h> +#include "qfxperf_p_p.h" #include <QStack> -#include "private/qmlbasicscript_p.h" +#include "qmlbasicscript_p.h" #include "qmlengine.h" #include "qmlcontext.h" #include "qmlexpression.h" @@ -73,19 +73,19 @@ #include <QtGui/qsound.h> #include <QGraphicsObject> #include <qmlcomponent.h> -#include <private/qmlmetaproperty_p.h> -#include <private/qmlbinding_p.h> -#include <private/qmlvme_p.h> -#include <private/qmlenginedebug_p.h> -#include <private/qmlstringconverters_p.h> -#include <private/qmlxmlhttprequest_p.h> -#include <private/qmlsqldatabase_p.h> -#include <private/qmltypenamescriptclass_p.h> -#include <private/qmllistscriptclass_p.h> +#include "qmlmetaproperty_p.h" +#include "qmlbinding_p.h" +#include "qmlvme_p.h" +#include "qmlenginedebug_p.h" +#include "qmlstringconverters_p.h" +#include "qmlxmlhttprequest_p.h" +#include "qmlsqldatabase_p.h" +#include "qmltypenamescriptclass_p.h" +#include "qmllistscriptclass_p.h" #include <qmlscriptstring.h> -#include <private/qmlglobal_p.h> +#include "qmlglobal_p.h" #include <QtCore/qcryptographichash.h> -#include <private/qmlworkerscript_p.h> +#include "qmlworkerscript_p.h" #ifdef Q_OS_WIN // for %APPDATA% #include "qt_windows.h" @@ -1207,7 +1207,7 @@ QmlEnginePrivate::Imports::~Imports() } #include <qmlmetatype.h> -#include <private/qmltypenamecache_p.h> +#include "qmltypenamecache_p.h" static QmlTypeNameCache *cacheForNamespace(QmlEngine *engine, const QmlEnginePrivate::ImportedNamespace &set, QmlTypeNameCache *cache) { if (!cache) diff --git a/src/declarative/qml/qmlengine_p.h b/src/declarative/qml/qmlengine_p.h index 9e0c1fc..93fe4a7 100644 --- a/src/declarative/qml/qmlengine_p.h +++ b/src/declarative/qml/qmlengine_p.h @@ -61,21 +61,21 @@ #include <QtCore/qpair.h> #include <QtCore/qstack.h> #include <private/qobject_p.h> -#include <private/qmlclassfactory_p.h> -#include <private/qmlcompositetypemanager_p.h> -#include <private/qpodvector_p.h> +#include "qmlclassfactory_p.h" +#include "qmlcompositetypemanager_p.h" +#include "qpodvector_p.h" #include <qml.h> -#include <private/qmlbasicscript_p.h> -#include <private/qmlvaluetype_p.h> +#include "qmlbasicscript_p.h" +#include "qmlvaluetype_p.h" #include <qmlcontext.h> #include <qmlengine.h> #include <qmlexpression.h> #include <QtScript/qscriptengine.h> -#include <private/qmlmetaproperty_p.h> -#include <private/qmlpropertycache_p.h> -#include <private/qmlobjectscriptclass_p.h> -#include <private/qmlcontextscriptclass_p.h> -#include <private/qmlvaluetypescriptclass_p.h> +#include "qmlmetaproperty_p.h" +#include "qmlpropertycache_p.h" +#include "qmlobjectscriptclass_p.h" +#include "qmlcontextscriptclass_p.h" +#include "qmlvaluetypescriptclass_p.h" QT_BEGIN_NAMESPACE diff --git a/src/declarative/qml/qmlenginedebug_p.h b/src/declarative/qml/qmlenginedebug_p.h index 8ba3d38..1804f6b 100644 --- a/src/declarative/qml/qmlenginedebug_p.h +++ b/src/declarative/qml/qmlenginedebug_p.h @@ -53,7 +53,7 @@ // We mean it. // -#include <private/qmldebugservice_p.h> +#include "qmldebugservice_p.h" #include <QtCore/qurl.h> #include <QtCore/qvariant.h> diff --git a/src/declarative/qml/qmlinfo.cpp b/src/declarative/qml/qmlinfo.cpp index bbd6022..3d9e0f7 100644 --- a/src/declarative/qml/qmlinfo.cpp +++ b/src/declarative/qml/qmlinfo.cpp @@ -40,7 +40,7 @@ ****************************************************************************/ #include "qmlinfo.h" -#include <private/qmldeclarativedata_p.h> +#include "qmldeclarativedata_p.h" #include <qmlcontext.h> #include <QtGui/qapplication.h> diff --git a/src/declarative/qml/qmlintegercache.cpp b/src/declarative/qml/qmlintegercache.cpp index 1103ef2..981e653 100644 --- a/src/declarative/qml/qmlintegercache.cpp +++ b/src/declarative/qml/qmlintegercache.cpp @@ -40,7 +40,7 @@ ****************************************************************************/ #include "qmlintegercache_p.h" -#include <private/qmlengine_p.h> +#include "qmlengine_p.h" #include <qmlmetatype.h> QT_BEGIN_NAMESPACE diff --git a/src/declarative/qml/qmlintegercache_p.h b/src/declarative/qml/qmlintegercache_p.h index 2b10dcc..1592337 100644 --- a/src/declarative/qml/qmlintegercache_p.h +++ b/src/declarative/qml/qmlintegercache_p.h @@ -53,9 +53,9 @@ // We mean it. // -#include <private/qmlrefcount_p.h> +#include "qmlrefcount_p.h" #include <private/qscriptdeclarativeclass_p.h> -#include <private/qmlcleanup_p.h> +#include "qmlcleanup_p.h" #include <QtCore/qhash.h> QT_BEGIN_NAMESPACE diff --git a/src/declarative/qml/qmllistscriptclass.cpp b/src/declarative/qml/qmllistscriptclass.cpp index a180e49..bb3eb21 100644 --- a/src/declarative/qml/qmllistscriptclass.cpp +++ b/src/declarative/qml/qmllistscriptclass.cpp @@ -40,7 +40,7 @@ ****************************************************************************/ #include "qmllistscriptclass_p.h" -#include <private/qmlengine_p.h> +#include "qmlengine_p.h" QT_BEGIN_NAMESPACE diff --git a/src/declarative/qml/qmlmetaproperty.cpp b/src/declarative/qml/qmlmetaproperty.cpp index 8bde318..0e34305 100644 --- a/src/declarative/qml/qmlmetaproperty.cpp +++ b/src/declarative/qml/qmlmetaproperty.cpp @@ -43,7 +43,7 @@ #include "qmlmetaproperty_p.h" #include "qmlcompositetypedata_p.h" #include <qml.h> -#include <private/qfxperf_p_p.h> +#include "qfxperf_p_p.h" #include <QStringList> #include "qmlbinding.h" #include <qmlcontext.h> @@ -51,8 +51,8 @@ #include <math.h> #include <QtCore/qdebug.h> #include <qmlengine.h> -#include <private/qmlengine_p.h> -#include <private/qmldeclarativedata_p.h> +#include "qmlengine_p.h" +#include "qmldeclarativedata_p.h" Q_DECLARE_METATYPE(QList<QObject *>); diff --git a/src/declarative/qml/qmlmetaproperty_p.h b/src/declarative/qml/qmlmetaproperty_p.h index d225afa..dfb05fb 100644 --- a/src/declarative/qml/qmlmetaproperty_p.h +++ b/src/declarative/qml/qmlmetaproperty_p.h @@ -55,7 +55,7 @@ #include "qmlmetaproperty.h" #include <private/qobject_p.h> -#include <private/qmlpropertycache_p.h> +#include "qmlpropertycache_p.h" QT_BEGIN_NAMESPACE diff --git a/src/declarative/qml/qmlmetatype.cpp b/src/declarative/qml/qmlmetatype.cpp index 5fb2f50..5172152 100644 --- a/src/declarative/qml/qmlmetatype.cpp +++ b/src/declarative/qml/qmlmetatype.cpp @@ -45,7 +45,7 @@ #include <QtCore/qmetaobject.h> #include <QtCore/qbitarray.h> #include <QtCore/qreadwritelock.h> -#include <private/qmlproxymetaobject_p.h> +#include "qmlproxymetaobject_p.h" #include <qmetatype.h> #include <qobjectdefs.h> @@ -58,7 +58,7 @@ #include <qlocale.h> #include <ctype.h> #include <QtCore/qcryptographichash.h> -#include <private/qmlcustomparser_p.h> +#include "qmlcustomparser_p.h" #ifdef QT_BOOTSTRAPPED # ifndef QT_NO_GEOM_VARIANT diff --git a/src/declarative/qml/qmlobjectscriptclass.cpp b/src/declarative/qml/qmlobjectscriptclass.cpp index 1a6f724..5110ea0 100644 --- a/src/declarative/qml/qmlobjectscriptclass.cpp +++ b/src/declarative/qml/qmlobjectscriptclass.cpp @@ -40,12 +40,12 @@ ****************************************************************************/ #include "qmlobjectscriptclass_p.h" -#include <private/qmlengine_p.h> +#include "qmlengine_p.h" #include <private/qguard_p.h> -#include <private/qmlcontext_p.h> -#include <private/qmldeclarativedata_p.h> -#include <private/qmltypenamescriptclass_p.h> -#include <private/qmllistscriptclass_p.h> +#include "qmlcontext_p.h" +#include "qmldeclarativedata_p.h" +#include "qmltypenamescriptclass_p.h" +#include "qmllistscriptclass_p.h" #include <qmlbinding.h> #include <QtCore/qtimer.h> diff --git a/src/declarative/qml/qmlobjectscriptclass_p.h b/src/declarative/qml/qmlobjectscriptclass_p.h index 6169812..771c3eb 100644 --- a/src/declarative/qml/qmlobjectscriptclass_p.h +++ b/src/declarative/qml/qmlobjectscriptclass_p.h @@ -55,8 +55,8 @@ #include <QtScript/qscriptclass.h> #include <private/qscriptdeclarativeclass_p.h> -#include <private/qmlpropertycache_p.h> -#include <private/qmltypenamecache_p.h> +#include "qmlpropertycache_p.h" +#include "qmltypenamecache_p.h" QT_BEGIN_NAMESPACE diff --git a/src/declarative/qml/qmlparser.cpp b/src/declarative/qml/qmlparser.cpp index 402c93e..04e2926 100644 --- a/src/declarative/qml/qmlparser.cpp +++ b/src/declarative/qml/qmlparser.cpp @@ -46,14 +46,14 @@ #include <QPointF> #include <QSizeF> #include <QRectF> -#include <private/qmlvme_p.h> -#include <private/qfxperf_p_p.h> +#include "qmlvme_p.h" +#include "qfxperf_p_p.h" #include <qml.h> -#include "private/qmlcomponent_p.h" +#include "qmlcomponent_p.h" #include <qmlcomponent.h> -#include "private/qmetaobjectbuilder_p.h" -#include <private/qmlvmemetaobject_p.h> -#include <private/qmlcompiler_p.h> +#include "qmetaobjectbuilder_p.h" +#include "qmlvmemetaobject_p.h" +#include "qmlcompiler_p.h" #include "parser/qmljsast_p.h" #include "parser/qmljsengine_p.h" #include <QtDebug> diff --git a/src/declarative/qml/qmlparser_p.h b/src/declarative/qml/qmlparser_p.h index 73bb498..d4bf88e 100644 --- a/src/declarative/qml/qmlparser_p.h +++ b/src/declarative/qml/qmlparser_p.h @@ -57,7 +57,7 @@ #include <QtCore/QList> #include <QtCore/qstring.h> #include <qml.h> -#include <private/qmlrefcount_p.h> +#include "qmlrefcount_p.h" #include <private/qobject_p.h> QT_BEGIN_HEADER diff --git a/src/declarative/qml/qmlpropertycache.cpp b/src/declarative/qml/qmlpropertycache.cpp index b7a5fad..c5cdbaa 100644 --- a/src/declarative/qml/qmlpropertycache.cpp +++ b/src/declarative/qml/qmlpropertycache.cpp @@ -40,7 +40,7 @@ ****************************************************************************/ #include "qmlpropertycache_p.h" -#include <private/qmlengine_p.h> +#include "qmlengine_p.h" #include <qmlbinding.h> QT_BEGIN_NAMESPACE diff --git a/src/declarative/qml/qmlpropertycache_p.h b/src/declarative/qml/qmlpropertycache_p.h index c2e8abe..28dd66d 100644 --- a/src/declarative/qml/qmlpropertycache_p.h +++ b/src/declarative/qml/qmlpropertycache_p.h @@ -53,9 +53,9 @@ // We mean it. // -#include <private/qmlrefcount_p.h> +#include "qmlrefcount_p.h" #include <private/qscriptdeclarativeclass_p.h> -#include <private/qmlcleanup_p.h> +#include "qmlcleanup_p.h" #include <QtCore/qvector.h> QT_BEGIN_NAMESPACE diff --git a/src/declarative/qml/qmlproxymetaobject_p.h b/src/declarative/qml/qmlproxymetaobject_p.h index 7f9163c..7a15bd9 100644 --- a/src/declarative/qml/qmlproxymetaobject_p.h +++ b/src/declarative/qml/qmlproxymetaobject_p.h @@ -55,7 +55,7 @@ #include <QtCore/QMetaObject> #include <QtCore/QObject> -#include <private/qmetaobjectbuilder_p.h> +#include "qmetaobjectbuilder_p.h" #include <private/qobject_p.h> #include <qml.h> diff --git a/src/declarative/qml/qmlrewrite.cpp b/src/declarative/qml/qmlrewrite.cpp index 32e2fef..dc90255 100644 --- a/src/declarative/qml/qmlrewrite.cpp +++ b/src/declarative/qml/qmlrewrite.cpp @@ -41,7 +41,7 @@ #include "qmlrewrite_p.h" #include <QtCore/qdebug.h> -#include <private/qmlglobal_p.h> +#include "qmlglobal_p.h" QT_BEGIN_NAMESPACE diff --git a/src/declarative/qml/qmlscriptparser.cpp b/src/declarative/qml/qmlscriptparser.cpp index 23c050c..3ee7b50 100644 --- a/src/declarative/qml/qmlscriptparser.cpp +++ b/src/declarative/qml/qmlscriptparser.cpp @@ -55,7 +55,7 @@ #include <QCoreApplication> #include <QtDebug> -#include <private/qfxperf_p_p.h> +#include "qfxperf_p_p.h" QT_BEGIN_NAMESPACE diff --git a/src/declarative/qml/qmlsqldatabase.cpp b/src/declarative/qml/qmlsqldatabase.cpp index 5a7e94c..3981d4c 100644 --- a/src/declarative/qml/qmlsqldatabase.cpp +++ b/src/declarative/qml/qmlsqldatabase.cpp @@ -41,7 +41,7 @@ #include <QtCore/qobject.h> #include <qmlengine.h> -#include <private/qmlengine_p.h> +#include "qmlengine_p.h" #include <QtScript/qscriptvalue.h> #include <QtScript/qscriptvalueiterator.h> #include <QtScript/qscriptcontext.h> @@ -51,8 +51,8 @@ #include <QtSql/qsqlquery.h> #include <QtSql/qsqlerror.h> #include <QtSql/qsqlrecord.h> -#include <private/qmlrefcount_p.h> -#include <private/qmlengine_p.h> +#include "qmlrefcount_p.h" +#include "qmlengine_p.h" #include <QtCore/qstack.h> #include <QtCore/qcryptographichash.h> #include "qmlsqldatabase_p.h" diff --git a/src/declarative/qml/qmltypenamecache.cpp b/src/declarative/qml/qmltypenamecache.cpp index 5c0d23b..ea2a4f3 100644 --- a/src/declarative/qml/qmltypenamecache.cpp +++ b/src/declarative/qml/qmltypenamecache.cpp @@ -40,7 +40,7 @@ ****************************************************************************/ #include "qmltypenamecache_p.h" -#include <private/qmlengine_p.h> +#include "qmlengine_p.h" QT_BEGIN_NAMESPACE diff --git a/src/declarative/qml/qmltypenamecache_p.h b/src/declarative/qml/qmltypenamecache_p.h index 6ff403d..619a788 100644 --- a/src/declarative/qml/qmltypenamecache_p.h +++ b/src/declarative/qml/qmltypenamecache_p.h @@ -53,9 +53,9 @@ // We mean it. // -#include <private/qmlrefcount_p.h> +#include "qmlrefcount_p.h" #include <private/qscriptdeclarativeclass_p.h> -#include <private/qmlcleanup_p.h> +#include "qmlcleanup_p.h" QT_BEGIN_NAMESPACE diff --git a/src/declarative/qml/qmltypenamescriptclass.cpp b/src/declarative/qml/qmltypenamescriptclass.cpp index 8b2addf..9db3426 100644 --- a/src/declarative/qml/qmltypenamescriptclass.cpp +++ b/src/declarative/qml/qmltypenamescriptclass.cpp @@ -40,8 +40,8 @@ ****************************************************************************/ #include "qmltypenamescriptclass_p.h" -#include <private/qmlengine_p.h> -#include <private/qmltypenamecache_p.h> +#include "qmlengine_p.h" +#include "qmltypenamecache_p.h" QT_BEGIN_NAMESPACE diff --git a/src/declarative/qml/qmltypenamescriptclass_p.h b/src/declarative/qml/qmltypenamescriptclass_p.h index f630854..cec134d 100644 --- a/src/declarative/qml/qmltypenamescriptclass_p.h +++ b/src/declarative/qml/qmltypenamescriptclass_p.h @@ -54,7 +54,7 @@ // #include <QtScript/qscriptclass.h> #include <private/qscriptdeclarativeclass_p.h> -#include <private/qmlengine_p.h> +#include "qmlengine_p.h" QT_BEGIN_NAMESPACE diff --git a/src/declarative/qml/qmlvaluetype_p.h b/src/declarative/qml/qmlvaluetype_p.h index 2af261d..770650a 100644 --- a/src/declarative/qml/qmlvaluetype_p.h +++ b/src/declarative/qml/qmlvaluetype_p.h @@ -58,7 +58,7 @@ #include <QtCore/qvariant.h> #include <QtGui/qvector3d.h> #include <QtGui/qfont.h> -#include <QmlMetaProperty> +#include <qmlmetaproperty.h> QT_BEGIN_NAMESPACE diff --git a/src/declarative/qml/qmlvaluetypescriptclass.cpp b/src/declarative/qml/qmlvaluetypescriptclass.cpp index e939e80..3b1953a 100644 --- a/src/declarative/qml/qmlvaluetypescriptclass.cpp +++ b/src/declarative/qml/qmlvaluetypescriptclass.cpp @@ -40,7 +40,7 @@ ****************************************************************************/ #include "qmlvaluetypescriptclass_p.h" -#include <private/qmlengine_p.h> +#include "qmlengine_p.h" QT_BEGIN_NAMESPACE diff --git a/src/declarative/qml/qmlvme.cpp b/src/declarative/qml/qmlvme.cpp index f2fb217..bee0ff1 100644 --- a/src/declarative/qml/qmlvme.cpp +++ b/src/declarative/qml/qmlvme.cpp @@ -41,13 +41,13 @@ #include "qmlvme_p.h" #include "qmlcompiler_p.h" -#include <private/qfxperf_p_p.h> -#include <private/qmlboundsignal_p.h> -#include <private/qmlstringconverters_p.h> -#include "private/qmetaobjectbuilder_p.h" -#include "private/qmldeclarativedata_p.h" +#include "qfxperf_p_p.h" +#include "qmlboundsignal_p.h" +#include "qmlstringconverters_p.h" +#include "qmetaobjectbuilder_p.h" +#include "qmldeclarativedata_p.h" #include <qml.h> -#include <private/qmlcustomparser_p.h> +#include "qmlcustomparser_p.h" #include <QStack> #include <QWidget> #include <QColor> @@ -58,15 +58,15 @@ #include <qmlcontext.h> #include <qmlcomponent.h> #include <qmlbinding.h> -#include <private/qmlengine_p.h> -#include <private/qmlcomponent_p.h> -#include "private/qmlvmemetaobject_p.h" +#include "qmlengine_p.h" +#include "qmlcomponent_p.h" +#include "qmlvmemetaobject_p.h" #include <QtCore/qdebug.h> #include <QtCore/qvarlengtharray.h> #include <QtGui/qapplication.h> -#include <private/qmlbinding_p.h> -#include <private/qmlcontext_p.h> -#include <private/qmlbindingoptimizations_p.h> +#include "qmlbinding_p.h" +#include "qmlcontext_p.h" +#include "qmlbindingoptimizations_p.h" #include <qmlscriptstring.h> QT_BEGIN_NAMESPACE diff --git a/src/declarative/qml/qmlvme_p.h b/src/declarative/qml/qmlvme_p.h index a15bd08..257b3b2 100644 --- a/src/declarative/qml/qmlvme_p.h +++ b/src/declarative/qml/qmlvme_p.h @@ -56,7 +56,7 @@ #include <QtCore/QString> #include <QtCore/QStack> #include <qmlerror.h> -#include <private/qbitfield_p.h> +#include "qbitfield_p.h" QT_BEGIN_NAMESPACE diff --git a/src/declarative/qml/qmlvmemetaobject.cpp b/src/declarative/qml/qmlvmemetaobject.cpp index 3f5dd475..b7ee316 100644 --- a/src/declarative/qml/qmlvmemetaobject.cpp +++ b/src/declarative/qml/qmlvmemetaobject.cpp @@ -41,13 +41,13 @@ #include "qmlvmemetaobject_p.h" #include <qml.h> -#include <private/qmlrefcount_p.h> +#include "qmlrefcount_p.h" #include <QColor> #include <QDate> #include <QtCore/qlist.h> #include <QtCore/qdebug.h> #include <qmlexpression.h> -#include <private/qmlcontext_p.h> +#include "qmlcontext_p.h" QT_BEGIN_NAMESPACE diff --git a/src/declarative/qml/qmlwatcher.cpp b/src/declarative/qml/qmlwatcher.cpp index 889ac78..3216a6b 100644 --- a/src/declarative/qml/qmlwatcher.cpp +++ b/src/declarative/qml/qmlwatcher.cpp @@ -42,7 +42,7 @@ #include <QtCore/qmetaobject.h> #include <QtCore/qdebug.h> #include <qmlexpression.h> -#include <private/qmldebugservice_p.h> +#include "qmldebugservice_p.h" #include <qmlcontext.h> #include <qml.h> diff --git a/src/declarative/qml/qmlworkerscript.cpp b/src/declarative/qml/qmlworkerscript.cpp index a6428dd..75c67cc 100644 --- a/src/declarative/qml/qmlworkerscript.cpp +++ b/src/declarative/qml/qmlworkerscript.cpp @@ -44,7 +44,7 @@ #include <QtCore/qcoreapplication.h> #include <QtCore/qdebug.h> #include <QtScript/qscriptengine.h> -#include <private/qmlengine_p.h> +#include "qmlengine_p.h" #include <QtCore/qmutex.h> #include <QtCore/qwaitcondition.h> #include <QtScript/qscriptvalueiterator.h> diff --git a/src/declarative/qml/qmlworkerscript_p.h b/src/declarative/qml/qmlworkerscript_p.h index 90861f8..b85238d 100644 --- a/src/declarative/qml/qmlworkerscript_p.h +++ b/src/declarative/qml/qmlworkerscript_p.h @@ -54,8 +54,8 @@ // #include <QtCore/qthread.h> -#include <QtDeclarative/qml.h> -#include <QtDeclarative/qmlparserstatus.h> +#include <qml.h> +#include <qmlparserstatus.h> #include <QtScript/qscriptvalue.h> #include <QtCore/qurl.h> diff --git a/src/declarative/qml/qmlxmlhttprequest.cpp b/src/declarative/qml/qmlxmlhttprequest.cpp index 216db6e..f5100ef 100644 --- a/src/declarative/qml/qmlxmlhttprequest.cpp +++ b/src/declarative/qml/qmlxmlhttprequest.cpp @@ -41,14 +41,14 @@ #include <QtCore/qobject.h> #include <qmlengine.h> -#include <private/qmlengine_p.h> +#include "qmlengine_p.h" #include <QtScript/qscriptvalue.h> #include <QtScript/qscriptcontext.h> #include <QtScript/qscriptengine.h> #include <QtNetwork/qnetworkreply.h> #include <QtCore/qxmlstream.h> -#include <private/qmlrefcount_p.h> -#include <private/qmlengine_p.h> +#include "qmlrefcount_p.h" +#include "qmlengine_p.h" #include <QtCore/qstack.h> #include "qmlxmlhttprequest_p.h" |