Add QObject::objectNameChanged(const QString &objectName) signal

This is sent when the object's name changes.

tst_moc must be updated since the method count of QObject has changed.
The test assumed that there were 4 invokable methods in QObject. The
new signal is the 5th, which breaks the test's assumptions. Fix this
as well.

tst_QObject must be updated since the
QObjectPrivate::isSignalConnected() method only supports the first 64
signals. With the addition of this new signal, sig61() in the test
becomes the 65th signal, and will always appear connected now.

Task-number: QTBUG-13999 (related)
Change-Id: Ie87893c71a231fafa7ccf2f16102238a7be8327a
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>

1 files changed, 14 insertions, 14 deletions

diff --git a/tests/auto/tools/moc/tst_moc.cpp b/tests/auto/tools/moc/tst_moc.cpp
index 6d3ee2611e..95d7d2ce00 100644
--- a/tests/auto/tools/moc/tst_moc.cpp
+++ b/tests/auto/tools/moc/tst_moc.cpp
@@ -1091,15 +1091,15 @@ void tst_Moc::invokable()
 {
     {
         const QMetaObject &mobj = InvokableBeforeReturnType::staticMetaObject;
-        QCOMPARE(mobj.methodCount(), 5);
-        QVERIFY(mobj.method(4).signature() == QByteArray("foo()"));
+        QCOMPARE(mobj.methodCount(), 6);
+        QVERIFY(mobj.method(5).signature() == QByteArray("foo()"));
     }
 
     {
         const QMetaObject &mobj = InvokableBeforeInline::staticMetaObject;
-        QCOMPARE(mobj.methodCount(), 6);
-        QVERIFY(mobj.method(4).signature() == QByteArray("foo()"));
-        QVERIFY(mobj.method(5).signature() == QByteArray("bar()"));
+        QCOMPARE(mobj.methodCount(), 7);
+        QVERIFY(mobj.method(5).signature() == QByteArray("foo()"));
+        QVERIFY(mobj.method(6).signature() == QByteArray("bar()"));
     }
 }
 
@@ -1107,23 +1107,23 @@ void tst_Moc::singleFunctionKeywordSignalAndSlot()
 {
     {
         const QMetaObject &mobj = SingleFunctionKeywordBeforeReturnType::staticMetaObject;
-        QCOMPARE(mobj.methodCount(), 6);
-        QVERIFY(mobj.method(4).signature() == QByteArray("mySignal()"));
-        QVERIFY(mobj.method(5).signature() == QByteArray("mySlot()"));
+        QCOMPARE(mobj.methodCount(), 7);
+        QVERIFY(mobj.method(5).signature() == QByteArray("mySignal()"));
+        QVERIFY(mobj.method(6).signature() == QByteArray("mySlot()"));
     }
 
     {
         const QMetaObject &mobj = SingleFunctionKeywordBeforeInline::staticMetaObject;
-        QCOMPARE(mobj.methodCount(), 6);
-        QVERIFY(mobj.method(4).signature() == QByteArray("mySignal()"));
-        QVERIFY(mobj.method(5).signature() == QByteArray("mySlot()"));
+        QCOMPARE(mobj.methodCount(), 7);
+        QVERIFY(mobj.method(5).signature() == QByteArray("mySignal()"));
+        QVERIFY(mobj.method(6).signature() == QByteArray("mySlot()"));
     }
 
     {
         const QMetaObject &mobj = SingleFunctionKeywordAfterInline::staticMetaObject;
-        QCOMPARE(mobj.methodCount(), 6);
-        QVERIFY(mobj.method(4).signature() == QByteArray("mySignal()"));
-        QVERIFY(mobj.method(5).signature() == QByteArray("mySlot()"));
+        QCOMPARE(mobj.methodCount(), 7);
+        QVERIFY(mobj.method(5).signature() == QByteArray("mySignal()"));
+        QVERIFY(mobj.method(6).signature() == QByteArray("mySlot()"));
     }
 }