Changeset 846 for trunk/src/network/socket/qhttpsocketengine.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/qhttpsocketengine.cpp (modified) (4 diffs)

trunk/src/network/socket/qhttpsocketengine.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])
@@ -43 +43 @@
 #include "qtcpsocket.h"
 #include "qhostaddress.h"
-#include "qdatetime.h"
 #include "qurl.h"
 #include "qhttp.h"
+
 
 #if !defined(QT_NO_NETWORKPROXY) && !defined(QT_NO_HTTP)
@@ -320 +320 @@
         return false;
 
-    QTime stopWatch;
+    Q stopWatch;
     stopWatch.start();
 
@@ -367 +367 @@
     }
 
-    QTime stopWatch;
+    Q stopWatch;
     stopWatch.start();