diff options
author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-07-15 10:36:58 +0200 |
---|---|---|
committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-07-15 10:36:59 +0200 |
commit | 1190863fc0855ef25e7239e35da3978f317638bd (patch) | |
tree | 92c408f7c53f194639d2a10b82f5c90a85704776 /tests/benchmarks/network | |
parent | 02afd94ef4c1913735bd650ca93279cfb00dc534 (diff) | |
parent | e4484bb15b29b01dba07cbc31c150153f537606a (diff) |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: I0218a1f08b89f2d56757ab35eec06799d2a1492f
Diffstat (limited to 'tests/benchmarks/network')
-rw-r--r-- | tests/benchmarks/network/access/qnetworkreply/tst_qnetworkreply.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/tests/benchmarks/network/access/qnetworkreply/tst_qnetworkreply.cpp b/tests/benchmarks/network/access/qnetworkreply/tst_qnetworkreply.cpp index a99fd17a64..abc8b82134 100644 --- a/tests/benchmarks/network/access/qnetworkreply/tst_qnetworkreply.cpp +++ b/tests/benchmarks/network/access/qnetworkreply/tst_qnetworkreply.cpp @@ -873,7 +873,6 @@ void tst_qnetworkreply::httpsRequestChain() int count = 10; QNetworkRequest request(QUrl("https://" + QtNetworkSettings::serverName() + "/fluke.gif")); - //QNetworkRequest request(QUrl("https://www.nokia.com/robots.txt")); // Disable keep-alive so we have the full re-connecting of TCP. request.setRawHeader("Connection", "close"); @@ -883,7 +882,6 @@ void tst_qnetworkreply::httpsRequestChain() // Warm up DNS cache and then immediately start HTTP QHostInfo::lookupHost(QtNetworkSettings::serverName(), &helper, SLOT(doNextRequest())); - //QHostInfo::lookupHost("www.nokia.com", &helper, SLOT(doNextRequest())); // we can use QBENCHMARK_ONCE when we find out how to make it really run once. // there is still a warmup-run :( |