Merge remote-tracking branch 'origin/stable' into dev

Conflicts:
	qmake/doc/src/qmake-manual.qdoc
	src/plugins/platforms/xcb/qxcbconnection_xi2.cpp
	src/src.pro

Change-Id: I0a560826c420e46988da3776bd8f9160c365459a

1 files changed, 13 insertions, 8 deletions

diff --git a/src/platformsupport/linuxaccessibility/atspiadaptor.cpp b/src/platformsupport/linuxaccessibility/atspiadaptor.cpp
index 6efd5085ac..d42251d4dd 100644
--- a/src/platformsupport/linuxaccessibility/atspiadaptor.cpp
+++ b/src/platformsupport/linuxaccessibility/atspiadaptor.cpp
@@ -2230,16 +2230,21 @@ bool AtSpiAdaptor::tableInterface(QAccessibleInterface *interface, const QString
         int index = message.arguments().at(0).toInt();
         bool success = false;
 
-        int row, col, rowExtents, colExtents;
-        bool isSelected;
+        int row = -1;
+        int col = -1;
+        int rowExtents = -1;
+        int colExtents = -1;
+        bool isSelected = false;
 
         int cols = interface->tableInterface()->columnCount();
-        row = index/cols;
-        col = index%cols;
-        QAccessibleTableCellInterface *cell = interface->tableInterface()->cellAt(row, col)->tableCellInterface();
-        if (cell) {
-            cell->rowColumnExtents(&row, &col, &rowExtents, &colExtents, &isSelected);
-            success = true;
+        if (cols > 0) {
+            row = index / cols;
+            col = index % cols;
+            QAccessibleTableCellInterface *cell = interface->tableInterface()->cellAt(row, col)->tableCellInterface();
+            if (cell) {
+                cell->rowColumnExtents(&row, &col, &rowExtents, &colExtents, &isSelected);
+                success = true;
+            }
         }
 
         QVariantList list;