diff options
| -rw-r--r-- | src/scripttools/debugging/qscriptdebugger.cpp | 3 | ||||
| -rw-r--r-- | src/scripttools/debugging/qscriptdebuggerconsole.cpp | 2 | ||||
| -rw-r--r-- | tests/auto/qscriptengine/tst_qscriptengine.cpp | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/src/scripttools/debugging/qscriptdebugger.cpp b/src/scripttools/debugging/qscriptdebugger.cpp index 47a428e..24de6b7 100644 --- a/src/scripttools/debugging/qscriptdebugger.cpp +++ b/src/scripttools/debugging/qscriptdebugger.cpp @@ -1021,7 +1021,7 @@ class SyncBreakpointsJob : public QScriptDebuggerCommandSchedulerJob public: SyncBreakpointsJob(QScriptDebuggerPrivate *debugger) : QScriptDebuggerCommandSchedulerJob(debugger), - m_debugger(debugger), m_index(-1) {} + m_debugger(debugger) {} void start() { QScriptDebuggerCommandSchedulerFrontend frontend(commandScheduler(), this); @@ -1044,7 +1044,6 @@ public: private: QScriptDebuggerPrivate *m_debugger; - int m_index; QList<QScriptContextInfo> m_infos; }; diff --git a/src/scripttools/debugging/qscriptdebuggerconsole.cpp b/src/scripttools/debugging/qscriptdebuggerconsole.cpp index 6baa0c9..c59b061 100644 --- a/src/scripttools/debugging/qscriptdebuggerconsole.cpp +++ b/src/scripttools/debugging/qscriptdebuggerconsole.cpp @@ -489,7 +489,7 @@ QScriptDebuggerConsoleCommandJob *QScriptDebuggerConsole::consumeInput( d->input += QLatin1Char('\n'); QScriptSyntaxCheckResult check = QScriptEngine::checkSyntax(d->input); if (check.state() == QScriptSyntaxCheckResult::Intermediate) - return false; + return 0; d->input.chop(1); // remove the last \n cmd = QString(); cmd.append(d->commandPrefix); diff --git a/tests/auto/qscriptengine/tst_qscriptengine.cpp b/tests/auto/qscriptengine/tst_qscriptengine.cpp index 1747b2e..c75f652 100644 --- a/tests/auto/qscriptengine/tst_qscriptengine.cpp +++ b/tests/auto/qscriptengine/tst_qscriptengine.cpp @@ -2653,6 +2653,7 @@ void tst_QScriptEngine::importExtension() QCoreApplication::instance()->setLibraryPaths(libPaths); } +#if 0 //The native C++ stack overflow before the JS stack static QScriptValue recurse(QScriptContext *ctx, QScriptEngine *eng) { Q_UNUSED(eng); @@ -2664,6 +2665,7 @@ static QScriptValue recurse2(QScriptContext *ctx, QScriptEngine *eng) Q_UNUSED(eng); return ctx->callee().construct(); } +#endif void tst_QScriptEngine::infiniteRecursion() { |