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/compiler.pri | |
| 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/compiler.pri')
| -rw-r--r-- | src/qml/compiler/compiler.pri | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/qml/compiler/compiler.pri b/src/qml/compiler/compiler.pri index a19bf70a7a..51a7270598 100644 --- a/src/qml/compiler/compiler.pri +++ b/src/qml/compiler/compiler.pri @@ -4,6 +4,8 @@ INCLUDEPATH += $$PWD INCLUDEPATH += $$OUT_PWD HEADERS += \ + $$PWD/qv4compileddata_p.h \ + $$PWD/qv4compiler_p.h \ $$PWD/qv4codegen_p.h \ $$PWD/qv4isel_masm_p.h \ $$PWD/qv4isel_p.h \ @@ -15,6 +17,8 @@ HEADERS += \ $$PWD/qv4regalloc_p.h SOURCES += \ + $$PWD/qv4compileddata.cpp \ + $$PWD/qv4compiler.cpp \ $$PWD/qv4codegen.cpp \ $$PWD/qv4instr_moth.cpp \ $$PWD/qv4isel_masm.cpp \ |