diff options
| author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2009-08-21 15:56:57 +0300 |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2009-08-21 15:56:57 +0300 |
| commit | 34679dd23213881a9632e21e4858377ff90a9006 (patch) | |
| tree | deb9ebf681d4954b2d44858ca1a14d251c31e8eb /tests/auto/qscriptenginedebugger/tst_qscriptenginedebugger.cpp | |
| parent | 7669f91c33328505fbe52f4913bd3f8745b76d31 (diff) | |
| parent | 4aa6869877d4906fcfaac5388294748512cace25 (diff) | |
Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-public
Conflicts:
src/corelib/io/qfilesystemwatcher_symbian.cpp
src/corelib/io/qfilesystemwatcher_symbian_p.h
Diffstat (limited to 'tests/auto/qscriptenginedebugger/tst_qscriptenginedebugger.cpp')
| -rw-r--r-- | tests/auto/qscriptenginedebugger/tst_qscriptenginedebugger.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/auto/qscriptenginedebugger/tst_qscriptenginedebugger.cpp b/tests/auto/qscriptenginedebugger/tst_qscriptenginedebugger.cpp index 356e683d6..70a198d6e 100644 --- a/tests/auto/qscriptenginedebugger/tst_qscriptenginedebugger.cpp +++ b/tests/auto/qscriptenginedebugger/tst_qscriptenginedebugger.cpp @@ -479,7 +479,7 @@ void tst_QScriptEngineDebugger::consoleCommands() outputEdit->clear(); executeConsoleCommand(inputEdit, outputEdit, ".backtrace"); - QCOMPARE(outputEdit->toPlainText(), QString::fromLatin1("qsdb> .backtrace\n#0 <global>()@:-1")); + QCOMPARE(outputEdit->toPlainText(), QString::fromLatin1("qsdb> .backtrace\n#0 <global>() at -1")); outputEdit->clear(); executeConsoleCommand(inputEdit, outputEdit, ".down"); @@ -491,7 +491,7 @@ void tst_QScriptEngineDebugger::consoleCommands() outputEdit->clear(); executeConsoleCommand(inputEdit, outputEdit, ".frame"); - QCOMPARE(outputEdit->toPlainText(), QString::fromLatin1("qsdb> .frame\n#0 <global>()@:-1")); + QCOMPARE(outputEdit->toPlainText(), QString::fromLatin1("qsdb> .frame\n#0 <global>() at -1")); outputEdit->clear(); executeConsoleCommand(inputEdit, outputEdit, ".break foo.qs:789"); |