Merge 5.5 into 5.5.1

Change-Id: I3a78e7228aa21b7c83cf7f07dc6e1c8ad0d0ebff

1 files changed, 10 insertions, 1 deletions

diff --git a/src/corelib/kernel/qeventdispatcher_win_p.h b/src/corelib/kernel/qeventdispatcher_win_p.h
index e59e29f1ff..8578110ee4 100644
--- a/src/corelib/kernel/qeventdispatcher_win_p.h
+++ b/src/corelib/kernel/qeventdispatcher_win_p.h
@@ -115,6 +115,14 @@ struct QSockNot {
 };
 typedef QHash<int, QSockNot *> QSNDict;
 
+struct QSockFd {
+    long event;
+    bool selected;
+
+    explicit inline QSockFd(long ev = 0) : event(ev), selected(false) { }
+};
+typedef QHash<int, QSockFd> QSFDict;
+
 struct WinTimerInfo {                           // internal timer info
     QObject *dispatcher;
     int timerId;
@@ -169,7 +177,8 @@ public:
     QSNDict sn_read;
     QSNDict sn_write;
     QSNDict sn_except;
-    void doWsaAsyncSelect(int socket);
+    QSFDict active_fd;
+    void doWsaAsyncSelect(int socket, long event);
 
     QList<QWinEventNotifier *> winEventNotifierList;
     void activateEventNotifier(QWinEventNotifier * wen);