1 files changed, 61 insertions, 0 deletions
diff --git a/src/corelib/kernel/qsocketnotifier.h b/src/corelib/kernel/qsocketnotifier.h
index 38e5f27247..528f58a1e1 100644
--- a/src/corelib/kernel/qsocketnotifier.h
+++ b/src/corelib/kernel/qsocketnotifier.h
@@ -44,6 +44,7 @@
 
 QT_BEGIN_NAMESPACE
 
+class QSocketDescriptor;
 class QSocketNotifierPrivate;
 class Q_CORE_EXPORT QSocketNotifier : public QObject
 {
@@ -65,7 +66,23 @@ public Q_SLOTS:
     void setEnabled(bool);
 
 Q_SIGNALS:
+#if defined(Q_MOC_RUN)
+    // Add default arguments during Q_MOC_RUN which makes moc generate "signals" which takes less
+    // parameters, but we won't actually allow emitting without all 3. This lets users use the
+    // string-based connect without specifying QSocketNotifier::Type as one of the parameters.
+    void activated(QSocketDescriptor socket, QSocketNotifier::Type activationEvent = Read,
+                   QPrivateSignal = {});
+#else
+    void activated(QSocketDescriptor socket, QSocketNotifier::Type activationEvent, QPrivateSignal);
+#endif
+
+    // ### Qt7: consider removing it.
+    // The old signal is compiled internally, but hidden outside of this class.
+    // This means the PMF-based connect(..) will automatically, on recompile, pick up the new
+    // version while the old-style connect(..) can query the metaobject system for this version.
+#if defined(Q_MOC_RUN) || defined(BUILDING_QSOCKETNOTIFIER) || defined(Q_QDOC)
     void activated(int socket, QPrivateSignal);
+#endif
 
 protected:
     bool event(QEvent *) override;
@@ -74,6 +91,50 @@ private:
     Q_DISABLE_COPY(QSocketNotifier)
 };
 
+class QSocketDescriptor
+{
+public:
+#if defined(Q_OS_WIN) || defined(Q_QDOC)
+    using DescriptorType = Qt::HANDLE;
+#define Q_DECL_CONSTEXPR_NOT_WIN
+#else
+    using DescriptorType = int;
+#define Q_DECL_CONSTEXPR_NOT_WIN Q_DECL_CONSTEXPR
+#endif
+
+    /* implicit */ Q_DECL_CONSTEXPR_NOT_WIN
+    QSocketDescriptor(DescriptorType descriptor = DescriptorType(-1)) noexcept : sockfd(descriptor)
+    {
+    }
+
+#if defined(Q_OS_WIN) || defined(Q_QDOC)
+    /* implicit */ QSocketDescriptor(qintptr desc) noexcept : sockfd(DescriptorType(desc)) {}
+    operator qintptr() const noexcept { return qintptr(sockfd); }
+    Q_DECL_CONSTEXPR Qt::HANDLE winHandle() const noexcept { return sockfd; }
+#endif
+    Q_DECL_CONSTEXPR operator DescriptorType() const noexcept { return sockfd; }
+
+    Q_DECL_CONSTEXPR_NOT_WIN bool isValid() const noexcept { return *this != QSocketDescriptor(); }
+
+    friend Q_DECL_CONSTEXPR_NOT_WIN bool operator==(QSocketDescriptor lhs,
+                                                    QSocketDescriptor rhs) noexcept
+    {
+        return lhs.sockfd == rhs.sockfd;
+    }
+    friend Q_DECL_CONSTEXPR_NOT_WIN bool operator!=(QSocketDescriptor lhs,
+                                                    QSocketDescriptor rhs) noexcept
+    {
+        return lhs.sockfd != rhs.sockfd;
+    }
+
+#undef Q_DECL_CONSTEXPR_NOT_WIN
+
+private:
+    DescriptorType sockfd;
+};
+
 QT_END_NAMESPACE
+Q_DECLARE_METATYPE(QSocketNotifier::Type)
+Q_DECLARE_METATYPE(QSocketDescriptor)
 
 #endif // QSOCKETNOTIFIER_H