summaryrefslogtreecommitdiff
path: root/tests/auto
diff options
context:
space:
mode:
authorSergio Ahumada <sergio.ahumada@digia.com>2013-03-19 10:04:45 +0100
committerSergio Ahumada <sergio.ahumada@digia.com>2013-03-19 10:05:18 +0100
commit73376eb43ccc692727fbff4c90a7b62d06c36cb7 (patch)
tree5b8f7652af9db9058d805100e3f8a4d67830d834 /tests/auto
parent488532c4ecb099efd1807b1dd5f237609f2299e8 (diff)
parent0659af7ee80a6fc4ebfc75f97f61333dfde6abfb (diff)
downloadqtscript-73376eb43ccc692727fbff4c90a7b62d06c36cb7.tar.gz
Merge branch 'dev' into stable
This starts Qt 5.1 release cycle Change-Id: Ie8a79e8c58e45eab13391377dd33750ff2d98c08
Diffstat (limited to 'tests/auto')
-rw-r--r--tests/auto/qscriptengine/tst_qscriptengine.cpp2
1 files changed, 2 insertions, 0 deletions
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()
{