From 02c2c930f0874a8886cb0983606c38cb8b356cd7 Mon Sep 17 00:00:00 2001 From: Edward Welbourne 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 --- tests/manual/gestures/scrollarea/main.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tests/manual/gestures') diff --git a/tests/manual/gestures/scrollarea/main.cpp b/tests/manual/gestures/scrollarea/main.cpp index 83197a9c7f..517054eeb9 100644 --- a/tests/manual/gestures/scrollarea/main.cpp +++ b/tests/manual/gestures/scrollarea/main.cpp @@ -203,7 +203,7 @@ public: QWidget *w = new QWidget; w->setMinimumWidth(700); QVBoxLayout *l = new QVBoxLayout(w); - l->setMargin(20); + l->setContentsMargins(20, 20, 20, 20); for (int i = 0; i < 100; ++i) { QWidget *w = new QWidget; QHBoxLayout *ll = new QHBoxLayout(w); -- cgit v1.2.3