From 02c2c930f0874a8886cb0983606c38cb8b356cd7 Mon Sep 17 00:00:00 2001
From: Edward Welbourne <edward.welbourne@qt.io>
Date: Thu, 23 Jul 2020 13:54:47 +0200
Subject: Fix some compiler errors caused by bit-rot in manual tests

Two methods that have gone away or been renamed,
an enum that now doesn't support being assigned from int.
QTime should no longer be used as a timer.
Removed a test of deprecated code that's gone away.

Task-number: QTBUG-85700
Change-Id: Idc6d59542625d22b9937084411b54b0d8aa87f00
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
---
 tests/manual/qnetworkreply/main.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'tests/manual/qnetworkreply/main.cpp')

diff --git a/tests/manual/qnetworkreply/main.cpp b/tests/manual/qnetworkreply/main.cpp
index 0ba8a19913..8cf725dbd3 100644
--- a/tests/manual/qnetworkreply/main.cpp
+++ b/tests/manual/qnetworkreply/main.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2020 The Qt Company Ltd.
 ** Copyright (C) 2014 BlackBerry Limited. All rights reserved.
 ** Contact: https://www.qt.io/licensing/
 **
@@ -37,6 +37,7 @@
 #include <QtNetwork/qsslconfiguration.h>
 #include <QtNetwork/qhttpmultipart.h>
 #include <QtNetwork/qauthenticator.h>
+#include <QtCore/QElapsedTimer>
 #include <QtCore/QJsonDocument>
 #include "../../auto/network-settings.h"
 
@@ -99,7 +100,7 @@ class HttpReceiver : public QObject
     }
 protected:
     QTimer *timer;
-    QTime stopwatch;
+    QElapsedTimer stopwatch;
 };
 
 void tst_qnetworkreply::initTestCase()
-- 
cgit v1.2.3