From 50b9e30970effae249010338880f74641f188f76 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Mon, 24 Aug 2015 13:35:22 +0200 Subject: qtbase tests: Remove QT_DISABLE_DEPRECATED_BEFORE=0 for simple cases. Fix usage of API that is marked deprecated. Change-Id: Ie31b6ee029c5b5f015fe52fb9bcd8e94b22d6cd0 Reviewed-by: Liang Qi --- tests/benchmarks/gui/painting/qtbench/qtbench.pro | 2 -- tests/benchmarks/gui/painting/qtbench/tst_qtbench.cpp | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) (limited to 'tests/benchmarks/gui/painting') diff --git a/tests/benchmarks/gui/painting/qtbench/qtbench.pro b/tests/benchmarks/gui/painting/qtbench/qtbench.pro index 46c2f06984..a4c7273b47 100644 --- a/tests/benchmarks/gui/painting/qtbench/qtbench.pro +++ b/tests/benchmarks/gui/painting/qtbench/qtbench.pro @@ -4,5 +4,3 @@ TEMPLATE = app TARGET = tst_bench_qtbench SOURCES += tst_qtbench.cpp - -DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/benchmarks/gui/painting/qtbench/tst_qtbench.cpp b/tests/benchmarks/gui/painting/qtbench/tst_qtbench.cpp index c7ba7b82f6..cc9fe7e32e 100644 --- a/tests/benchmarks/gui/painting/qtbench/tst_qtbench.cpp +++ b/tests/benchmarks/gui/painting/qtbench/tst_qtbench.cpp @@ -229,7 +229,7 @@ void tst_QtBench::qtBench() BenchWidget widget(reinterpret_cast(benchmark)); widget.show(); - QTest::qWaitForWindowShown(&widget); + QTest::qWaitForWindowExposed(&widget); while (!widget.done()) { widget.update(); -- cgit v1.2.3