Merge remote-tracking branch 'gerrit/master' into newdocs

Change-Id: If7f46d56cf0b0b79f7fc8955a01964121b900d07

2 files changed, 16 insertions, 0 deletions

diff --git a/src/testlib/qtestaccessible.h b/src/testlib/qtestaccessible.h
index 88a554dcea..2642ee206a 100644
--- a/src/testlib/qtestaccessible.h
+++ b/src/testlib/qtestaccessible.h
@@ -218,6 +218,14 @@ private:
             ev = upd;
         } else if (event->type() == QAccessible::ValueChanged) {
             ev = new QAccessibleValueChangeEvent(event->object(), static_cast<QAccessibleValueChangeEvent*>(event)->value());
+        } else if (event->type() == QAccessible::TableModelChanged) {
+            QAccessibleTableModelChangeEvent *oldEvent = static_cast<QAccessibleTableModelChangeEvent*>(event);
+            QAccessibleTableModelChangeEvent *newEvent = new QAccessibleTableModelChangeEvent(event->object(), oldEvent->modelChangeType());
+            newEvent->setFirstRow(oldEvent->firstRow());
+            newEvent->setFirstColumn(oldEvent->firstColumn());
+            newEvent->setLastRow(oldEvent->lastRow());
+            newEvent->setLastColumn(oldEvent->lastColumn());
+            ev = newEvent;
         } else {
             ev = new QAccessibleEvent(event->object(), event->type());
         }
diff --git a/src/testlib/qtestlog.cpp b/src/testlib/qtestlog.cpp
index 7cd83c857d..c56a00237b 100644
--- a/src/testlib/qtestlog.cpp
+++ b/src/testlib/qtestlog.cpp
@@ -76,6 +76,14 @@ static void saveCoverageTool(const char * appname, bool testfailed, bool install
 #endif
 }
 
+//
+// declare deprecated API from qlogging.h locally
+// (we can't use qInstallMessageHandler because it would break
+// tests that (still) rely on qInstallMsgHandler.)
+//
+typedef void (*QtMsgHandler)(QtMsgType, const char *);
+Q_CORE_EXPORT QtMsgHandler qInstallMsgHandler(QtMsgHandler);
+
 namespace QTest {
 
     int fails = 0;