diff options
| author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2009-12-03 00:28:51 (GMT) |
|---|---|---|
| committer | Aaron Kennedy <aaron.kennedy@nokia.com> | 2009-12-03 00:28:51 (GMT) |
| commit | 4a68ca535074625d8ec20435e21fa658652e7680 (patch) | |
| tree | 8348012dcb11375d809b1950c2c27e684bdee89b /src/declarative/qml/qmlcompiler.cpp | |
| parent | 2b86b3074ca3473e309bfe4a6975f96020322f08 (diff) | |
| parent | 5e7a6806f32b9ff922325a9cad9b2b2405747b0b (diff) | |
| download | Qt-4a68ca535074625d8ec20435e21fa658652e7680.zip Qt-4a68ca535074625d8ec20435e21fa658652e7680.tar.gz Qt-4a68ca535074625d8ec20435e21fa658652e7680.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'src/declarative/qml/qmlcompiler.cpp')
| -rw-r--r-- | src/declarative/qml/qmlcompiler.cpp | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/src/declarative/qml/qmlcompiler.cpp b/src/declarative/qml/qmlcompiler.cpp index 8edf023..7a31673 100644 --- a/src/declarative/qml/qmlcompiler.cpp +++ b/src/declarative/qml/qmlcompiler.cpp @@ -39,40 +39,40 @@ ** ****************************************************************************/ -#include "qmlcompiler_p.h" -#include "qmlcompositetypedata_p.h" -#include "qfxperf_p_p.h" -#include "qmlparser_p.h" -#include "qmlscriptparser_p.h" +#include <private/qmlcompiler_p.h> +#include <private/qmlcompositetypedata_p.h> +#include <private/qfxperf_p_p.h> +#include <private/qmlparser_p.h> +#include <private/qmlscriptparser_p.h> #include <qmlpropertyvaluesource.h> #include <qmlcomponent.h> -#include "qmetaobjectbuilder_p.h" -#include "qmlbasicscript_p.h" +#include <private/qmetaobjectbuilder_p.h> +#include <private/qmlbasicscript_p.h> #include <QColor> #include <QDebug> #include <QPointF> #include <QSizeF> #include <QRectF> #include <QAtomicInt> -#include "qmlstringconverters_p.h" -#include "qmlengine_p.h" +#include <private/qmlstringconverters_p.h> +#include <private/qmlengine_p.h> #include <qmlengine.h> #include <qmlcontext.h> #include <qmlmetatype.h> #include <QtCore/qdebug.h> #include <QtGui/qapplication.h> -#include "qmlcustomparser_p_p.h" -#include "qmlcontext_p.h" -#include "qmlcomponent_p.h" +#include <private/qmlcustomparser_p_p.h> +#include <private/qmlcontext_p.h> +#include <private/qmlcomponent_p.h> #include "parser/qmljsast_p.h" -#include "qmlvmemetaobject_p.h" -#include "qmlexpression_p.h" -#include "qmlmetaproperty_p.h" -#include "qmlrewrite_p.h" +#include <private/qmlvmemetaobject_p.h> +#include <private/qmlexpression_p.h> +#include <private/qmlmetaproperty_p.h> +#include <private/qmlrewrite_p.h> #include <qmlscriptstring.h> -#include "qmlglobal_p.h" +#include <private/qmlglobal_p.h> -#include "qmlscriptparser_p.h" +#include <private/qmlscriptparser_p.h> QT_BEGIN_NAMESPACE @@ -2307,7 +2307,7 @@ bool QmlCompiler::buildDynamicMeta(QmlParser::Object *obj, DynamicMetaMode mode) return true; } -#include "qmljsparser_p.h" +#include <private/qmljsparser_p.h> static QStringList astNodeToStringList(QmlJS::AST::Node *node) { if (node->kind == QmlJS::AST::Node::Kind_IdentifierExpression) { |