1 files changed, 10 insertions, 28 deletions

diff --git a/src/testlib/qsignalspy.h b/src/testlib/qsignalspy.h
index f4c322ae71..b8df2a4deb 100644
--- a/src/testlib/qsignalspy.h
+++ b/src/testlib/qsignalspy.h
@@ -6,24 +6,26 @@
 
 #include <QtCore/qbytearray.h>
 #include <QtCore/qlist.h>
-#include <QtCore/qobject.h>
 #include <QtCore/qmetaobject.h>
 #include <QtTest/qtesteventloop.h>
 #include <QtCore/qvariant.h>
 #include <QtCore/qmutex.h>
 
+#include <memory>
+
 QT_BEGIN_NAMESPACE
 
 
 class QVariant;
-
-class QSignalSpy: public QObject, public QList<QList<QVariant> >
+class QSignalSpyPrivate;
+class QSignalSpy : public QList<QList<QVariant> >
 {
     struct ObjectSignal {
         const QObject *obj;
         QMetaMethod sig;
     };
-
+    friend class QSignalSpyPrivate;
+    std::unique_ptr<QSignalSpyPrivate> d_ptr;
 public:
     explicit QSignalSpy(const QObject *obj, const char *aSignal)
         : QSignalSpy(verify(obj, aSignal)) {}
@@ -37,8 +39,9 @@ public:
 #endif // Q_QDOC
     QSignalSpy(const QObject *obj, QMetaMethod signal)
         : QSignalSpy(verify(obj, signal)) {}
+    Q_TESTLIB_EXPORT ~QSignalSpy();
 
-    inline bool isValid() const { return !sig.isEmpty(); }
+    bool isValid() const noexcept { return d_ptr != nullptr; }
     inline QByteArray signal() const { return sig; }
 
     bool wait(int timeout)
@@ -46,37 +49,16 @@ public:
 
     Q_TESTLIB_EXPORT bool wait(std::chrono::milliseconds timeout = std::chrono::seconds{5});
 
-    int qt_metacall(QMetaObject::Call call, int methodId, void **a) override
-    {
-        methodId = QObject::qt_metacall(call, methodId, a);
-        if (methodId < 0)
-            return methodId;
-
-        if (call == QMetaObject::InvokeMetaMethod) {
-            if (methodId == 0) {
-                appendArgs(a);
-            }
-            --methodId;
-        }
-        return methodId;
-    }
-
 private:
-    explicit QSignalSpy(ObjectSignal os)
-        : args(os.obj ? makeArgs(os.sig, os.obj) : QList<int>{})
-    {
-        init(os);
-    }
-    Q_TESTLIB_EXPORT void init(ObjectSignal os);
+    Q_TESTLIB_EXPORT explicit QSignalSpy(ObjectSignal os);
 
     Q_TESTLIB_EXPORT static ObjectSignal verify(const QObject *obj, QMetaMethod signal);
     Q_TESTLIB_EXPORT static ObjectSignal verify(const QObject *obj, const char *aSignal);
 
-    Q_TESTLIB_EXPORT static QList<int> makeArgs(const QMetaMethod &member, const QObject *obj);
     Q_TESTLIB_EXPORT void appendArgs(void **a);
 
     // the full, normalized signal name
-    QByteArray sig;
+    const QByteArray sig;
     // holds the QMetaType types for the argument list of the signal
     const QList<int> args;