diff options
| author | Gunnar Sletta <gunnar.sletta@nokia.com> | 2011-08-31 08:55:16 +0200 |
|---|---|---|
| committer | Gunnar Sletta <gunnar.sletta@nokia.com> | 2011-08-31 08:55:16 +0200 |
| commit | 71478352376022faa9be6d79f2a760c289945ff5 (patch) | |
| tree | 0f8ff4a88c1b033367337a93d23a329d145ee903 /src/declarative/qml/v4/qdeclarativev4compiler_p.h | |
| parent | c38efcb67cf93ba3e91e184c3b891efef4ef75a3 (diff) | |
| parent | 05daa9bfe1a03ffe1cc580b6cfd88e093e2493c0 (diff) | |
Merge branch 'master' into refactor
Conflicts:
src/3rdparty/v8
src/declarative/declarative.pro
src/declarative/items/qsgcanvas.cpp
src/declarative/items/qsgshadereffectsource_p.h
src/declarative/items/qsgview.cpp
src/declarative/particles/qsgcustomparticle.cpp
src/imports/gestures/gestures.pro
src/imports/particles/particles.pro
src/plugins/qmltooling/qmldbg_inspector/qmldbg_inspector.pro
src/qtquick1/qtquick1.pro
tests/auto/declarative/examples/examples.pro
tests/auto/declarative/qsglistview/qsglistview.pro
tests/auto/qtquick1/qdeclarativeviewer/qdeclarativeviewer.pro
Change-Id: I423344f83e1835116cad531b877fde6e68a8849a
Diffstat (limited to 'src/declarative/qml/v4/qdeclarativev4compiler_p.h')
| -rw-r--r-- | src/declarative/qml/v4/qdeclarativev4compiler_p.h | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/src/declarative/qml/v4/qdeclarativev4compiler_p.h b/src/declarative/qml/v4/qdeclarativev4compiler_p.h index cc93f4dbf2..0ed78bfdfc 100644 --- a/src/declarative/qml/v4/qdeclarativev4compiler_p.h +++ b/src/declarative/qml/v4/qdeclarativev4compiler_p.h @@ -53,8 +53,9 @@ // We mean it. // -#include "private/qdeclarativeexpression_p.h" -#include "private/qdeclarativebinding_p.h" +#include <private/qdeclarativeexpression_p.h> +#include <private/qdeclarativebinding_p.h> +#include <private/qdeclarativecompiler_p.h> QT_BEGIN_HEADER @@ -73,11 +74,12 @@ public: struct Expression { - QDeclarativeParser::Object *component; - QDeclarativeParser::Object *context; - QDeclarativeParser::Property *property; - QDeclarativeParser::Variant expression; - QHash<QString, QDeclarativeParser::Object *> ids; + Expression(const QDeclarativeImports &imp) : imports(imp) {} + QDeclarativeScript::Object *component; + QDeclarativeScript::Object *context; + QDeclarativeScript::Property *property; + QDeclarativeScript::Variant expression; + QDeclarativeCompilerTypes::IdList *ids; QDeclarativeTypeNameCache *importCache; QDeclarativeImports imports; }; |