diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2013-08-20 16:54:29 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2013-08-20 16:54:29 +0200 |
| commit | 461892e492e0bef399714557498380703b3e029b (patch) | |
| tree | ad82e1ae8286bbe650b2ee19ad393a4ab8996bb1 /src/qml/compiler/qv4codegen_p.h | |
| parent | a71e35a95c9f352db91fb82d8a564d01ba961341 (diff) | |
| parent | 90aaff37be419ca1f1da40df64424c0d88bfaf19 (diff) | |
Merge branch 'wip/v4' of ssh://codereview.qt-project.org/qt/qtdeclarative into dev
Conflicts:
src/qml/compiler/qv4codegen.cpp
src/qml/compiler/qv4codegen_p.h
src/qml/compiler/qv4isel_moth.cpp
src/qml/jsruntime/qv4context_p.h
src/qml/jsruntime/qv4functionobject.cpp
src/qml/jsruntime/qv4runtime.cpp
src/qml/jsruntime/qv4runtime_p.h
src/qml/jsruntime/qv4script.cpp
sync.profile
Change-Id: I1d785e2134bffac9553a1c16eed12816cbd1ad2c
Diffstat (limited to 'src/qml/compiler/qv4codegen_p.h')
| -rw-r--r-- | src/qml/compiler/qv4codegen_p.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/qml/compiler/qv4codegen_p.h b/src/qml/compiler/qv4codegen_p.h index c55a45b107..85c38d8d8c 100644 --- a/src/qml/compiler/qv4codegen_p.h +++ b/src/qml/compiler/qv4codegen_p.h @@ -413,7 +413,6 @@ protected: QList<QQmlError> errors(); protected: - QString _fileName; Result _expr; QString _property; UiMember _uiMember; |