diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-11-23 10:49:37 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-11-23 10:49:37 +0100 |
| commit | 5d4cbf4094c9b290626aab89e4bd92edd29ce49f (patch) | |
| tree | eac893652c724f057fba493688b16e212fd844dd /src/qml/compiler/qv4ssa.cpp | |
| parent | 13cf5f02ce788f19a73e5d5c3da76e57291761a5 (diff) | |
| parent | 07cde200e55ee03bf9e2f9af89c20f91072deccc (diff) | |
Merge remote-tracking branch 'origin/5.8' into dev
Conflicts:
src/qml/jsruntime/qv4object_p.h
Change-Id: Iff4d3aba7710a999b8befdc493cbe959e1ce02f9
Diffstat (limited to 'src/qml/compiler/qv4ssa.cpp')
| -rw-r--r-- | src/qml/compiler/qv4ssa.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/qml/compiler/qv4ssa.cpp b/src/qml/compiler/qv4ssa.cpp index 4fa0cf421b..46de24c264 100644 --- a/src/qml/compiler/qv4ssa.cpp +++ b/src/qml/compiler/qv4ssa.cpp @@ -2692,6 +2692,7 @@ void convertConst(Const *c, Type targetType) case UndefinedType: c->value = qt_qnan(); c->type = targetType; + break; default: Q_UNIMPLEMENTED(); Q_ASSERT(!"Unimplemented!"); |