Merge remote-tracking branch 'origin/5.8' into 5.9

Conflicts:
	src/qml/compiler/qv4ssa.cpp
	src/quick/accessible/qaccessiblequickview_p.h
	src/quick/items/qquickmousearea.cpp
	src/quick/util/qquickanimatorjob.cpp
	tools/qmlplugindump/main.cpp

Change-Id: I84474cf39895b9b757403971d2e9196e8c9d1809

1 files changed, 7 insertions, 3 deletions

diff --git a/src/quick/items/qquickopenglshadereffect.cpp b/src/quick/items/qquickopenglshadereffect.cpp
index 42fcee3c0d..4f4c403483 100644
--- a/src/quick/items/qquickopenglshadereffect.cpp
+++ b/src/quick/items/qquickopenglshadereffect.cpp
@@ -256,10 +256,14 @@ void QQuickOpenGLShaderEffectCommon::connectPropertySignals(QQuickItem *item,
                 qWarning("QQuickOpenGLShaderEffect: property '%s' does not have notification method!", d.name.constData());
             } else {
                 auto *mapper = signalMappers[shaderType].at(i);
-                mapper->setSignalIndex(pd->notifyIndex());
+                mapper->setSignalIndex(itemMetaObject->property(d.propertyIndex).notifySignal().methodIndex());
                 Q_ASSERT(item->metaObject() == itemMetaObject);
-                QObjectPrivate::connectImpl(item, mapper->signalIndex(), item, nullptr, mapper,
-                                            Qt::AutoConnection, nullptr, itemMetaObject);
+                bool ok = QObjectPrivate::connectImpl(item, pd->notifyIndex(), item, nullptr, mapper,
+                                                      Qt::AutoConnection, nullptr, itemMetaObject);
+                if (!ok)
+                    qWarning() << "Failed to connect to property" << itemMetaObject->property(d.propertyIndex).name()
+                               << "(" << d.propertyIndex << ", signal index" << pd->notifyIndex()
+                               << ") of item" << item;
             }
         } else {
             // If the source is set via a dynamic property, like the layer is, then we need this