diff options
| author | Simon Hausmann <[email protected]> | 2014-01-16 21:52:48 +0100 |
|---|---|---|
| committer | Simon Hausmann <[email protected]> | 2014-01-16 21:53:57 +0100 |
| commit | 7030adff1869e850a7b983e88d7a773d5d594886 (patch) | |
| tree | a3e8ef3ba29c9ea34ee00038595aaa1fe00afe2c /src/qml/jsruntime/qv4functionobject.cpp | |
| parent | 5ba070d305572a7e427a62042967d737bd4791ac (diff) | |
| parent | 6ccb9f8f04ea257520e518b25999907c6a8421e1 (diff) | |
Merge remote-tracking branch 'origin/release' into stable
Change-Id: Id18709cb0a4d85ffdadffa28aef98323367292d4
Diffstat (limited to 'src/qml/jsruntime/qv4functionobject.cpp')
| -rw-r--r-- | src/qml/jsruntime/qv4functionobject.cpp | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/src/qml/jsruntime/qv4functionobject.cpp b/src/qml/jsruntime/qv4functionobject.cpp index 6e5c137e0b..ce81282aa3 100644 --- a/src/qml/jsruntime/qv4functionobject.cpp +++ b/src/qml/jsruntime/qv4functionobject.cpp @@ -133,9 +133,6 @@ void FunctionObject::init(const StringRef n, bool createProto) type = Type_FunctionObject; needsActivation = true; strictMode = false; -#ifndef QT_NO_DEBUG - assert(scope->next != (ExecutionContext *)0x1); -#endif if (createProto) { Scoped<Object> proto(s, scope->engine->newObject(scope->engine->protoClass)); |