diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2013-09-20 08:21:42 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2013-09-20 08:29:17 +0200 |
| commit | bbb78a92a910d32b2886af62c218db87325eb6ce (patch) | |
| tree | 0e4b55352bb9f083826d0e80747982823f2894ed /src/qml/compiler/qv4codegen.cpp | |
| parent | 4b5a7b15fc6d3650c8e9b7bf619804a0a953eeba (diff) | |
| parent | 8ed38c70fd29680f7981d9d23581d46cf32139d0 (diff) | |
Merge branch 'dev' of ssh://codereview.qt-project.org/qt/qtdeclarative into HEAD
Conflicts:
src/qml/compiler/qv4isel_masm.cpp
src/qml/jsruntime/qv4script.cpp
src/qml/qml/qml.pri
src/qml/qml/qqmltypeloader_p.h
Change-Id: Ia784d855a2131e3289454f12d841ca2c65be15c1
Diffstat (limited to 'src/qml/compiler/qv4codegen.cpp')
| -rw-r--r-- | src/qml/compiler/qv4codegen.cpp | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/src/qml/compiler/qv4codegen.cpp b/src/qml/compiler/qv4codegen.cpp index 52875ce41a..bd4b1f2c9d 100644 --- a/src/qml/compiler/qv4codegen.cpp +++ b/src/qml/compiler/qv4codegen.cpp @@ -61,9 +61,6 @@ #undef CONST #endif -#define QV4_NO_LIVENESS -#undef SHOW_SSA - using namespace QQmlJS; using namespace AST; |