diff options
| author | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2015-03-17 09:32:34 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2015-03-17 09:52:19 +0100 |
| commit | fb0cb17cb55c9ed44b7fcbc92efcc244e96c9b36 (patch) | |
| tree | 2ba609d4c6416036d3cb5f345a6c1125e0f105d6 /src/qml/qml/v8/qqmlbuiltinfunctions.cpp | |
| parent | 4dc68ba888c7dbb7bd16455991f6d5814df13cba (diff) | |
| parent | 84155a8e1a6250d3e4b0949a42464eee5dfef537 (diff) | |
Merge remote-tracking branch 'origin/5.5' into dev
Change-Id: I6033aba359ac551f450ad517d20a0986bf4655f6
Diffstat (limited to 'src/qml/qml/v8/qqmlbuiltinfunctions.cpp')
| -rw-r--r-- | src/qml/qml/v8/qqmlbuiltinfunctions.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/qml/qml/v8/qqmlbuiltinfunctions.cpp b/src/qml/qml/v8/qqmlbuiltinfunctions.cpp index 8e5cbb8e96..0522e4c0ed 100644 --- a/src/qml/qml/v8/qqmlbuiltinfunctions.cpp +++ b/src/qml/qml/v8/qqmlbuiltinfunctions.cpp @@ -1483,7 +1483,7 @@ QV4::ReturnedValue ConsoleObject::method_time(CallContext *ctx) QV4::ReturnedValue ConsoleObject::method_timeEnd(CallContext *ctx) { if (ctx->argc() != 1) - V4THROW_ERROR("console.time(): Invalid arguments"); + V4THROW_ERROR("console.timeEnd(): Invalid arguments"); QV8Engine *v8engine = ctx->d()->engine->v8Engine; |