Changeset 846 for trunk/src/network/socket/qtcpserver.cpp

Timestamp:

May 5, 2011, 5:36:53 AM (14 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.7.2 sources from branches/vendor/nokia/qt.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/network/socket/qtcpserver.cpp (modified) (3 diffs)

trunk/src/network/socket/qtcpserver.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])
@@ -563 +563 @@
     use its setSocketDescriptor() method.
 
-    \sa newConnection(), nextPendingConnection()
+    \sa newConnection(), nextPendingConnection()
 */
 void QTcpServer::incomingConnection(int socketDescriptor)
@@ -573 +573 @@
     QTcpSocket *socket = new QTcpSocket(this);
     socket->setSocketDescriptor(socketDescriptor);
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
     d_func()->pendingConnections.append(socket);
 }