diff options
| author | Eike Ziller <eike.ziller@digia.com> | 2012-10-04 12:23:39 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@digia.com> | 2012-10-04 12:23:39 +0200 |
| commit | db4311d5b5786277c78c8840b8e16b334500856b (patch) | |
| tree | fdd10b093d403acc72018efba4051506a832fc6c /src/plugins/debugger/qml/qmlv8debuggerclient.cpp | |
| parent | d2bf853ca13854cee1757583cd8789741e3b8e18 (diff) | |
| parent | ed86a7ca5860b7e48fd7de2a63f3983f37667c4b (diff) | |
| download | qt-creator-db4311d5b5786277c78c8840b8e16b334500856b.tar.gz | |
Merge remote-tracking branch 'origin/2.6'
Conflicts:
dist/gdb/Makefile.osx
src/libs/qmldebug/qmldebug.qbs
src/plugins/android/androidsettingswidget.cpp
Change-Id: I85627130b575f7d08f416dea52031fa72019b217
Diffstat (limited to 'src/plugins/debugger/qml/qmlv8debuggerclient.cpp')
| -rw-r--r-- | src/plugins/debugger/qml/qmlv8debuggerclient.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/plugins/debugger/qml/qmlv8debuggerclient.cpp b/src/plugins/debugger/qml/qmlv8debuggerclient.cpp index 1106cb78c9..fcf5b224b1 100644 --- a/src/plugins/debugger/qml/qmlv8debuggerclient.cpp +++ b/src/plugins/debugger/qml/qmlv8debuggerclient.cpp @@ -978,8 +978,6 @@ QmlV8DebuggerClient::~QmlV8DebuggerClient() void QmlV8DebuggerClient::startSession() { - //Supports v2.0 and above - QTC_ASSERT(serviceVersion() >= CURRENT_SUPPORTED_VERSION, return); flushSendBuffer(); d->connect(); //Query for the V8 version. This is @@ -1635,7 +1633,7 @@ StackFrame QmlV8DebuggerClient::extractStackFrame(const QVariant &bodyVal, const QmlV8ObjectData objectData = d->extractData(body.value(_("func")), refsVal); QString functionName = objectData.value.toString(); if (functionName.isEmpty()) - functionName = tr("anonymous function"); + functionName = tr("Anonymous Function"); stackFrame.function = functionName; objectData = d->extractData(body.value(_("script")), refsVal); |