Merge "Merge remote-tracking branch 'origin/stable' into dev" into refs/staging/dev

2 files changed, 6 insertions, 1 deletions

diff --git a/tests/auto/other/modeltest/modeltest.cpp b/tests/auto/other/modeltest/modeltest.cpp
index 2176e5a741..d356b26c54 100644
--- a/tests/auto/other/modeltest/modeltest.cpp
+++ b/tests/auto/other/modeltest/modeltest.cpp
@@ -255,7 +255,7 @@ void ModelTest::index()
 void ModelTest::parent()
 {
 //     qDebug() << "p";
-    // Make sure the model wont crash and will return an invalid QModelIndex
+    // Make sure the model won't crash and will return an invalid QModelIndex
     // when asked for the parent of an invalid index.
     QVERIFY( model->parent ( QModelIndex() ) == QModelIndex() );
 
diff --git a/tests/auto/other/qaccessibility/tst_qaccessibility.cpp b/tests/auto/other/qaccessibility/tst_qaccessibility.cpp
index 2276260016..202843f5a8 100644
--- a/tests/auto/other/qaccessibility/tst_qaccessibility.cpp
+++ b/tests/auto/other/qaccessibility/tst_qaccessibility.cpp
@@ -3211,6 +3211,11 @@ void tst_QAccessibility::bridgeTest()
 
     // **** Test accLocation ****
     long x, y, w, h;
+    // Do not crash on insane arguments.
+    varChild.lVal = 999;
+    hr = iaccButton->accLocation(&x, &y, &w, &h, varChild);
+    QCOMPARE(SUCCEEDED(hr), false);
+
     hr = iaccButton->accLocation(&x, &y, &w, &h, varSELF);
     QCOMPARE(buttonRect, QRect(x, y, w, h));