Fix infinite loop in method overload resolution

When resolving overloaded slots in a situation without property cache, then we
need to detect that we've reached the end of the overload lists and exit from
RelatedMethod with zero.

Task-number: QTBUG-37157
Change-Id: Ifaab8cc1b377725c99c1bb89bb9bb74d5a0af1b8
Reviewed-by: Michael Brasser <michael.brasser@live.com>

1 files changed, 20 insertions, 0 deletions

diff --git a/tests/auto/qml/qjsengine/tst_qjsengine.cpp b/tests/auto/qml/qjsengine/tst_qjsengine.cpp
index ed6b5a9d42..3357aa7643 100644
--- a/tests/auto/qml/qjsengine/tst_qjsengine.cpp
+++ b/tests/auto/qml/qjsengine/tst_qjsengine.cpp
@@ -163,6 +163,9 @@ tst_QJSEngine::~tst_QJSEngine()
 {
 }
 
+Q_DECLARE_METATYPE(Qt::KeyboardModifier)
+Q_DECLARE_METATYPE(Qt::KeyboardModifiers)
+
 class OverloadedSlots : public QObject
 {
     Q_OBJECT
@@ -175,6 +178,7 @@ signals:
     void slotWithoutArgCalled();
     void slotWithSingleArgCalled(const QString &arg);
     void slotWithArgumentsCalled(const QString &arg1, const QString &arg2, const QString &arg3);
+    void slotWithOverloadedArgumentsCalled(const QString &arg, Qt::KeyboardModifier modifier, Qt::KeyboardModifiers moreModifiers);
 
 public slots:
     void slotToCall() { emit slotWithoutArgCalled(); }
@@ -183,6 +187,10 @@ public slots:
     {
         slotWithArgumentsCalled(arg, arg2, arg3);
     }
+    void slotToCall(const QString &arg, Qt::KeyboardModifier modifier, Qt::KeyboardModifiers blah = Qt::ShiftModifier)
+    {
+        emit slotWithOverloadedArgumentsCalled(arg, modifier, blah);
+    }
 };
 
 void tst_QJSEngine::callQObjectSlot()
@@ -228,6 +236,18 @@ void tst_QJSEngine::callQObjectSlot()
         QCOMPARE(arguments.at(1).toString(), QString("arg2"));
         QCOMPARE(arguments.at(2).toString(), QString("arg3"));
     }
+
+    {
+        QSignalSpy spy(&dummy, SIGNAL(slotWithOverloadedArgumentsCalled(QString, Qt::KeyboardModifier, Qt::KeyboardModifiers)));
+        eng.evaluate(QStringLiteral("dummy.slotToCall('arg', %1);").arg(QString::number(Qt::ControlModifier)));
+        QCOMPARE(spy.count(), 1);
+
+        const QList<QVariant> arguments = spy.first();
+        QCOMPARE(arguments.at(0).toString(), QString("arg"));
+        QCOMPARE(arguments.at(1).toInt(), int(Qt::ControlModifier));
+        QCOMPARE(int(qvariant_cast<Qt::KeyboardModifiers>(arguments.at(2))), int(Qt::ShiftModifier));
+
+    }
 }
 
 void tst_QJSEngine::constructWithParent()