From 2cb0292aaa2aa60dbfdcc0391753774bf3823151 Mon Sep 17 00:00:00 2001 From: Paul Olav Tvete Date: Wed, 9 Sep 2009 10:38:23 +0200 Subject: Tweak the test Give it another spin through the event loop, to make sure that all the painting gets done. (This is not connected to the glib timer event test failure.) --- tests/auto/qwswindowsystem/tst_qwswindowsystem.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/auto/qwswindowsystem/tst_qwswindowsystem.cpp b/tests/auto/qwswindowsystem/tst_qwswindowsystem.cpp index 3a2e79b..014074a 100644 --- a/tests/auto/qwswindowsystem/tst_qwswindowsystem.cpp +++ b/tests/auto/qwswindowsystem/tst_qwswindowsystem.cpp @@ -239,6 +239,7 @@ void tst_QWSWindowSystem::windowOpacity() QColor(255, 255, 255, 0)); w2.setPalette(palette); QApplication::processEvents(); + QApplication::processEvents(); QCOMPARE(win1->allocatedRegion(), QRegion(rect)); QCOMPARE(win2->allocatedRegion(), QRegion(rect)); VERIFY_COLOR(rect, w1.color()); -- cgit v0.12 From bb6aee6989aadfa1bcf4b36f302540440b3acc93 Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Wed, 9 Sep 2009 10:37:57 +0200 Subject: Fix crash in QtScript with exceptions. When trying to determine if there is a handler for an exception, determine the returnPC for the call frame traversal frmo the corrent CallFrame object. Reviewed-by: Kent Hansen --- src/3rdparty/webkit/JavaScriptCore/interpreter/Interpreter.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/3rdparty/webkit/JavaScriptCore/interpreter/Interpreter.cpp b/src/3rdparty/webkit/JavaScriptCore/interpreter/Interpreter.cpp index 3af4a29..c538eb1 100644 --- a/src/3rdparty/webkit/JavaScriptCore/interpreter/Interpreter.cpp +++ b/src/3rdparty/webkit/JavaScriptCore/interpreter/Interpreter.cpp @@ -586,13 +586,14 @@ NEVER_INLINE HandlerInfo* Interpreter::throwException(CallFrame*& callFrame, JSV unsigned bytecodeOffsetTemp = bytecodeOffset; CodeBlock *codeBlockTemp = codeBlock; while (!(handler = codeBlockTemp->handlerForBytecodeOffset(bytecodeOffsetTemp))) { + void* returnPC = callFrameTemp->returnPC(); callFrameTemp = callFrameTemp->callerFrame(); if (callFrameTemp->hasHostCallFrameFlag()) { hasHandler = false; break; } else { codeBlockTemp = callFrameTemp->codeBlock(); - bytecodeOffsetTemp = bytecodeOffsetForPC(callFrameTemp, codeBlockTemp, callFrameTemp->returnPC()); + bytecodeOffsetTemp = bytecodeOffsetForPC(callFrameTemp, codeBlockTemp, returnPC); } } if (debugger) -- cgit v0.12 From 515828f43d1aeee3ad50f6da55a12afce43f1557 Mon Sep 17 00:00:00 2001 From: Olivier Goffart Date: Wed, 9 Sep 2009 11:19:29 +0200 Subject: More robust graphicsview test --- tests/auto/qgraphicsview/tst_qgraphicsview.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/tests/auto/qgraphicsview/tst_qgraphicsview.cpp b/tests/auto/qgraphicsview/tst_qgraphicsview.cpp index b52cb7d..bb0ea70 100644 --- a/tests/auto/qgraphicsview/tst_qgraphicsview.cpp +++ b/tests/auto/qgraphicsview/tst_qgraphicsview.cpp @@ -2173,14 +2173,12 @@ void tst_QGraphicsView::viewportUpdateMode() qt_x11_wait_for_window_manager(&view); #endif QTest::qWait(50); + QTRY_VERIFY(!view.lastUpdateRegions.isEmpty()); view.lastUpdateRegions.clear(); // Issue two scene updates. scene.update(QRectF(0, 0, 10, 10)); scene.update(QRectF(20, 0, 10, 10)); -#ifdef Q_WS_X11 - qt_x11_wait_for_window_manager(&view); -#endif QTest::qWait(50); // The view gets two updates for the update scene updates. -- cgit v0.12