1 files changed, 91 insertions, 3 deletions
diff --git a/tests/auto/qobject/tst_qobject.cpp b/tests/auto/qobject/tst_qobject.cpp
index a08f620..65dc742 100644
--- a/tests/auto/qobject/tst_qobject.cpp
+++ b/tests/auto/qobject/tst_qobject.cpp
@@ -120,6 +120,7 @@ private slots:
     void uniqConnection();
     void interfaceIid();
     void deleteQObjectWhenDeletingEvent();
+    void overloads();
 protected:
 };
 
@@ -2903,11 +2904,11 @@ void tst_QObject::uniqConnection()
 
 void tst_QObject::interfaceIid()
 {
-    QCOMPARE(QByteArray(qobject_interface_iid<Foo::Bleh *>()), 
+    QCOMPARE(QByteArray(qobject_interface_iid<Foo::Bleh *>()),
              QByteArray(Bleh_iid));
-    QCOMPARE(QByteArray(qobject_interface_iid<Foo::Bar *>()), 
+    QCOMPARE(QByteArray(qobject_interface_iid<Foo::Bar *>()),
              QByteArray("com.qtest.foobar"));
-    QCOMPARE(QByteArray(qobject_interface_iid<FooObject *>()), 
+    QCOMPARE(QByteArray(qobject_interface_iid<FooObject *>()),
              QByteArray());
 }
 
@@ -2927,6 +2928,93 @@ void tst_QObject::deleteQObjectWhenDeletingEvent()
     QCoreApplication::removePostedEvents(&o); // here you would get a deadlock
 }
 
+class OverloadObject : public QObject
+{
+    friend class tst_QObject;
+    Q_OBJECT
+    signals:
+        void sig(int i, char c, qreal m = 12) const;
+        void sig(int i, int j = 12);
+        void sig(QObject *o, QObject *p, QObject *q = 0, QObject *r = 0) const;
+        void other(int a = 0);
+        void sig(QObject *o, OverloadObject *p = 0, QObject *q = 0, QObject *r = 0);
+        void sig(double r = 0.5);
+    public slots:
+        void slo(int i, int j = 43)
+        {
+            s_num += 1;
+            i1_num = i;
+            i2_num = j;
+        }
+        void slo(QObject *o, QObject *p = qApp, QObject *q = qApp, QObject *r = qApp)
+        {
+            s_num += 10;
+            o1_obj = o;
+            o2_obj = p;
+            o3_obj = q;
+            o4_obj = r;
+        }
+        void slo()
+        {
+            s_num += 100;
+        }
+
+    public:
+        int s_num;
+        int i1_num;
+        int i2_num;
+        QObject *o1_obj;
+        QObject *o2_obj;
+        QObject *o3_obj;
+        QObject *o4_obj;
+};
+
+void tst_QObject::overloads()
+{
+    OverloadObject obj1;
+    OverloadObject obj2;
+    QObject obj3;
+    obj1.s_num = 0;
+    obj2.s_num = 0;
+
+    connect (&obj1, SIGNAL(sig(int)) , &obj1, SLOT(slo(int)));
+    connect (&obj1, SIGNAL(sig(QObject *, QObject *, QObject *)) , &obj1, SLOT(slo(QObject * , QObject *, QObject *)));
+
+    connect (&obj1, SIGNAL(sig(QObject *, QObject *, QObject *, QObject *)) , &obj2, SLOT(slo(QObject * , QObject *, QObject *)));
+    connect (&obj1, SIGNAL(sig(QObject *)) , &obj2, SLOT(slo()));
+    connect (&obj1, SIGNAL(sig(int, int)) , &obj2, SLOT(slo(int, int)));
+
+    emit obj1.sig(0.5); //connected to nothing
+    emit obj1.sig(1, 'a'); //connected to nothing
+    QCOMPARE(obj1.s_num, 0);
+    QCOMPARE(obj2.s_num, 0);
+
+    emit obj1.sig(1); //this signal is connected
+    QCOMPARE(obj1.s_num, 1);
+    QCOMPARE(obj1.i1_num, 1);
+    QCOMPARE(obj1.i2_num, 43); //default argument of the slot
+
+    QCOMPARE(obj2.s_num, 1);
+    QCOMPARE(obj2.i1_num, 1);
+    QCOMPARE(obj2.i2_num, 12); //default argument of the signal
+
+
+    emit obj1.sig(&obj2); //this signal is conencted to obj2
+    QCOMPARE(obj1.s_num, 1);
+    QCOMPARE(obj2.s_num, 101);
+    emit obj1.sig(&obj2, &obj3); //this signal is connected
+    QCOMPARE(obj1.s_num, 11);
+    QCOMPARE(obj1.o1_obj, &obj2);
+    QCOMPARE(obj1.o2_obj, &obj3);
+    QCOMPARE(obj1.o3_obj, (QObject *)0); //default arg of the signal
+    QCOMPARE(obj1.o4_obj, qApp); //default arg of the slot
+
+    QCOMPARE(obj2.s_num, 111);
+    QCOMPARE(obj2.o1_obj, &obj2);
+    QCOMPARE(obj2.o2_obj, &obj3);
+    QCOMPARE(obj2.o3_obj, (QObject *)0); //default arg of the signal
+    QCOMPARE(obj2.o4_obj, qApp); //default arg of the slot
+}
 
 QTEST_MAIN(tst_QObject)
 #include "tst_qobject.moc"