Socket FD are now of type qintptr.

This should've been done together with the bulk of other changes in:
bdce61002255b5f8b3213e93175cefdfebfde2cc and
bf7f17060773803f332e8c729a70f47b94243890

Task-number: QTBUG-19004
Change-Id: I6d95a29140c1de5e6800812add9d7882511b909a
Reviewed-by: Shane Kearns <shane.kearns@accenture.com>

diff --git a/src/corelib/kernel/qsocketnotifier.cpp b/src/corelib/kernel/qsocketnotifier.cpp
index 22ede13..c108b96 100644 (file)
--- a/src/corelib/kernel/qsocketnotifier.cpp
+++ b/src/corelib/kernel/qsocketnotifier.cpp
@@ -221,7 +221,7 @@ QSocketNotifier::~QSocketNotifier()
 
     \sa type()
 */
-int QSocketNotifier::socket() const
+qintptr QSocketNotifier::socket() const
 {
     Q_D(const QSocketNotifier);
     return d->sockfd;

diff --git a/src/corelib/kernel/qsocketnotifier.h b/src/corelib/kernel/qsocketnotifier.h
index 65b7926..2463260 100644 (file)
--- a/src/corelib/kernel/qsocketnotifier.h
+++ b/src/corelib/kernel/qsocketnotifier.h
@@ -60,7 +60,7 @@ public:
     QSocketNotifier(qintptr socket, Type, QObject *parent = 0);
     ~QSocketNotifier();
 
-    int socket() const;
+    qintptr socket() const;
     Type type() const;
 
     bool isEnabled() const;