From 83ee168cbbc9ece4c7a1876df15e08a4c54d8ed9 Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@digia.com>
Date: Thu, 18 Jul 2013 15:51:51 +0200
Subject: Fix compilation of the tst_qnetworkreply benchmark test with
 QT_NO_SSL.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

preConnectEncrypted_data() is called by preConnect_data().

Change-Id: I9a3fad294d88e4cb4d2f6132cf7a87945373bb7d
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
Reviewed-by: Sérgio Martins <sergio.martins.qnx@kdab.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
---
 .../access/qnetworkreply/tst_qnetworkreply.cpp       | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

(limited to 'tests/benchmarks')

diff --git a/tests/benchmarks/network/access/qnetworkreply/tst_qnetworkreply.cpp b/tests/benchmarks/network/access/qnetworkreply/tst_qnetworkreply.cpp
index abc8b82134..55376d5a79 100644
--- a/tests/benchmarks/network/access/qnetworkreply/tst_qnetworkreply.cpp
+++ b/tests/benchmarks/network/access/qnetworkreply/tst_qnetworkreply.cpp
@@ -463,9 +463,9 @@ private slots:
 #ifndef QT_NO_SSL
     void echoPerformance_data();
     void echoPerformance();
-    void preConnectEncrypted_data();
     void preConnectEncrypted();
-#endif
+#endif // !QT_NO_SSL
+    void preConnectEncrypted_data();
 
     void downloadPerformance();
     void uploadPerformance();
@@ -550,13 +550,6 @@ void tst_qnetworkreply::echoPerformance()
     }
 }
 
-void tst_qnetworkreply::preConnectEncrypted_data()
-{
-    QTest::addColumn<int>("sleepTime");
-    QTest::newRow("2secs") << 2000; // to start a new request after preconnecting is done
-    QTest::newRow("100ms") << 100; // to start a new request while preconnecting is in-flight
-}
-
 void tst_qnetworkreply::preConnectEncrypted()
 {
     QString hostName = QLatin1String("www.google.com");
@@ -602,7 +595,14 @@ void tst_qnetworkreply::preConnectEncrypted()
              << "ms, pre-connect request:" << preConnectElapsed << "ms, difference:"
              << (normalElapsed - preConnectElapsed) << "ms";
 }
-#endif
+#endif // !QT_NO_SSL
+
+void tst_qnetworkreply::preConnectEncrypted_data()
+{
+    QTest::addColumn<int>("sleepTime");
+    QTest::newRow("2secs") << 2000; // to start a new request after preconnecting is done
+    QTest::newRow("100ms") << 100; // to start a new request while preconnecting is in-flight
+}
 
 void tst_qnetworkreply::downloadPerformance()
 {
-- 
cgit v1.2.3