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

Conflicts:
	src/gui/accessible/qaccessiblecache_mac.mm
	src/gui/accessible/qaccessiblecache_p.h
	src/plugins/platforms/cocoa/qcocoaaccessibilityelement.h
	src/plugins/platforms/cocoa/qcocoawindow.h
	src/plugins/platforms/cocoa/qcocoawindow.mm
	src/widgets/kernel/qwidget_qpa.cpp

Manually moved change in qwidget_qpa.cpp to qwidget.cpp
    (cd07830e3b27da7e96a0a83f91ba08c168b45e62)

Change-Id: Ia51f471f9b53de2f3b07d77ea89db9303ac8961d

1 files changed, 3 insertions, 5 deletions

diff --git a/src/plugins/platforms/windows/accessible/iaccessible2.cpp b/src/plugins/platforms/windows/accessible/iaccessible2.cpp
index 9a17f807a9..082ddf625a 100644
--- a/src/plugins/platforms/windows/accessible/iaccessible2.cpp
+++ b/src/plugins/platforms/windows/accessible/iaccessible2.cpp
@@ -502,13 +502,11 @@ HRESULT STDMETHODCALLTYPE QWindowsIA2Accessible::get_indexInParent(long *indexIn
     if (!indexInParent)
       return E_INVALIDARG;
     QAccessibleInterface *par = accessible->parent();
-    if (!par) {
-        *indexInParent = -1;
+    *indexInParent = par ? par->indexOfChild(accessible) : -1;
+    if (*indexInParent < 0) {
+        qCWarning(lcQpaAccessibility) << "index in parent invalid:" << accessible << "parent:" << par;
         return S_FALSE;
     }
-    int indexOfChild = par->indexOfChild(accessible);
-    Q_ASSERT(indexOfChild >= 0);
-    *indexInParent = indexOfChild;
     return S_OK;
 }