Don't use deprecated QTest::qWaitForWindowShown()

Use QTest::qWaitForWindowExposed() instead. Also wrap it in QVERIFY, so that
failed waits fail immediately.

Change-Id: I658d2faa89c42bd190de4bf53179b26b8f5d1b6c
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>

24 files changed, 140 insertions, 140 deletions

diff --git a/tests/auto/qabstractaxis/tst_qabstractaxis.cpp b/tests/auto/qabstractaxis/tst_qabstractaxis.cpp
index 08122187..0201522c 100644
--- a/tests/auto/qabstractaxis/tst_qabstractaxis.cpp
+++ b/tests/auto/qabstractaxis/tst_qabstractaxis.cpp
@@ -146,7 +146,7 @@ void tst_QAbstractAxis::axisPen()
 
     m_chart->setAxisX(m_axis, m_series);
     m_view->show();
-    QTest::qWaitForWindowShown(m_view);
+    QVERIFY(QTest::qWaitForWindowExposed(m_view));
     //TODO QCOMPARE(m_axis->axisPen(), axisPen);
 }
 
@@ -205,7 +205,7 @@ void tst_QAbstractAxis::gridLinePen()
 
     m_chart->setAxisX(m_axis, m_series);
     m_view->show();
-    QTest::qWaitForWindowShown(m_view);
+    QVERIFY(QTest::qWaitForWindowExposed(m_view));
     //TODO QCOMPARE(m_axis->gridLinePen(), gridLinePen);
 }
 
@@ -255,7 +255,7 @@ void tst_QAbstractAxis::minorGridLinePen()
 
     m_chart->setAxisX(m_axis, m_series);
     m_view->show();
-    QTest::qWaitForWindowShown(m_view);
+    QVERIFY(QTest::qWaitForWindowExposed(m_view));
 
 }
 
@@ -303,7 +303,7 @@ void tst_QAbstractAxis::lineVisible()
 
     m_chart->setAxisX(m_axis, m_series);
     m_view->show();
-    QTest::qWaitForWindowShown(m_view);
+    QVERIFY(QTest::qWaitForWindowExposed(m_view));
     QCOMPARE(m_axis->isLineVisible(), lineVisible);
 }
 
@@ -347,7 +347,7 @@ void tst_QAbstractAxis::gridLineVisible()
 
     m_chart->setAxisX(m_axis, m_series);
     m_view->show();
-    QTest::qWaitForWindowShown(m_view);
+    QVERIFY(QTest::qWaitForWindowExposed(m_view));
     QCOMPARE(m_axis->isGridLineVisible(), gridLineVisible);
 
 }
@@ -396,7 +396,7 @@ void tst_QAbstractAxis::minorGridLineVisible()
 
     m_chart->setAxisX(m_axis, m_series);
     m_view->show();
-    QTest::qWaitForWindowShown(m_view);
+    QVERIFY(QTest::qWaitForWindowExposed(m_view));
     QCOMPARE(m_axis->isMinorGridLineVisible(), minorGridLineVisible);
 
 }
@@ -444,7 +444,7 @@ void tst_QAbstractAxis::gridLineColor()
 
     m_chart->setAxisX(m_axis, m_series);
     m_view->show();
-    QTest::qWaitForWindowShown(m_view);
+    QVERIFY(QTest::qWaitForWindowExposed(m_view));
 
 }
 
@@ -491,7 +491,7 @@ void tst_QAbstractAxis::minorGridLineColor()
 
     m_chart->setAxisX(m_axis, m_series);
     m_view->show();
-    QTest::qWaitForWindowShown(m_view);
+    QVERIFY(QTest::qWaitForWindowExposed(m_view));
 
 }
 
@@ -539,7 +539,7 @@ void tst_QAbstractAxis::visible()
 
     m_chart->setAxisX(m_axis, m_series);
     m_view->show();
-    QTest::qWaitForWindowShown(m_view);
+    QVERIFY(QTest::qWaitForWindowExposed(m_view));
     QCOMPARE(m_axis->isVisible(), visible);
 }
 
@@ -586,7 +586,7 @@ void tst_QAbstractAxis::labelsAngle()
 
     m_chart->setAxisX(m_axis, m_series);
     m_view->show();
-    QTest::qWaitForWindowShown(m_view);
+    QVERIFY(QTest::qWaitForWindowExposed(m_view));
     QCOMPARE(m_axis->labelsAngle(), labelsAngle);
 }
 
@@ -634,7 +634,7 @@ void tst_QAbstractAxis::labelsBrush()
     QCOMPARE(spy11.count(), 0);
 
     m_view->show();
-    QTest::qWaitForWindowShown(m_view);
+    QVERIFY(QTest::qWaitForWindowExposed(m_view));
     QCOMPARE(m_axis->labelsBrush(), labelsBrush);
 
 }
@@ -691,7 +691,7 @@ void tst_QAbstractAxis::labelsFont()
     QCOMPARE(spy11.count(), 0);
 
     m_view->show();
-    QTest::qWaitForWindowShown(m_view);
+    QVERIFY(QTest::qWaitForWindowExposed(m_view));
     QCOMPARE(m_axis->labelsFont(), labelsFont);
 
 }
@@ -740,7 +740,7 @@ void tst_QAbstractAxis::labelsVisible()
 
     m_chart->setAxisX(m_axis, m_series);
     m_view->show();
-    QTest::qWaitForWindowShown(m_view);
+    QVERIFY(QTest::qWaitForWindowExposed(m_view));
     QCOMPARE(m_axis->labelsVisible(), labelsVisible);
 }
 
@@ -789,7 +789,7 @@ void tst_QAbstractAxis::orientation()
     QCOMPARE(spy11.count(), 0);
 
     m_view->show();
-    QTest::qWaitForWindowShown(m_view);
+    QVERIFY(QTest::qWaitForWindowExposed(m_view));
     QCOMPARE(m_axis->orientation(), orientation);
 }
 
@@ -892,7 +892,7 @@ void tst_QAbstractAxis::shadesBrush()
     QCOMPARE(spy11.count(), 0);
 
     m_view->show();
-    QTest::qWaitForWindowShown(m_view);
+    QVERIFY(QTest::qWaitForWindowExposed(m_view));
     QCOMPARE(m_axis->shadesBrush(), shadesBrush);
 }
 
@@ -950,7 +950,7 @@ void tst_QAbstractAxis::shadesPen()
 
     m_chart->setAxisX(m_axis, m_series);
     m_view->show();
-    QTest::qWaitForWindowShown(m_view);
+    QVERIFY(QTest::qWaitForWindowExposed(m_view));
     QCOMPARE(m_axis->shadesPen(), shadesPen);
 }
 
@@ -998,7 +998,7 @@ void tst_QAbstractAxis::shadesVisible()
 
     m_chart->setAxisX(m_axis, m_series);
     m_view->show();
-    QTest::qWaitForWindowShown(m_view);
+    QVERIFY(QTest::qWaitForWindowExposed(m_view));
     QCOMPARE(m_axis->shadesVisible(), shadesVisible);
 }
 
diff --git a/tests/auto/qareaseries/tst_qareaseries.cpp b/tests/auto/qareaseries/tst_qareaseries.cpp
index 47494328..d2dc2a15 100644
--- a/tests/auto/qareaseries/tst_qareaseries.cpp
+++ b/tests/auto/qareaseries/tst_qareaseries.cpp
@@ -123,7 +123,7 @@ void tst_QAreaSeries::areaSeries()
     series->attachAxis(m_axisX);
     series->attachAxis(m_axisY);
     m_view->show();
-    QTest::qWaitForWindowShown(m_view);
+    QVERIFY(QTest::qWaitForWindowExposed(m_view));
 
     checkPixels(m_backgroundColor, m_brushColor, m_backgroundColor);
 }
@@ -137,7 +137,7 @@ void tst_QAreaSeries::dynamicEdgeSeriesChange()
     series->attachAxis(m_axisX);
     series->attachAxis(m_axisY);
     m_view->show();
-    QTest::qWaitForWindowShown(m_view);
+    QVERIFY(QTest::qWaitForWindowExposed(m_view));
 
     checkPixels(m_backgroundColor, m_backgroundColor, m_backgroundColor);
 
diff --git a/tests/auto/qbarcategoryaxis/tst_qbarcategoryaxis.cpp b/tests/auto/qbarcategoryaxis/tst_qbarcategoryaxis.cpp
index e0d6db5e..343cdd98 100644
--- a/tests/auto/qbarcategoryaxis/tst_qbarcategoryaxis.cpp
+++ b/tests/auto/qbarcategoryaxis/tst_qbarcategoryaxis.cpp
@@ -196,7 +196,7 @@ void tst_QBarCategoriesAxis::append()
 
     m_chart->setAxisX(&axis, m_series);
     m_view->show();
-    QTest::qWaitForWindowShown(m_view);
+    QVERIFY(QTest::qWaitForWindowExposed(m_view));
     QCOMPARE(axis.categories(), categories);
 
     QCOMPARE(spy0.count(), 1);
@@ -235,7 +235,7 @@ void tst_QBarCategoriesAxis::append2()
 
     m_chart->setAxisX(&axis, m_series);
     m_view->show();
-    QTest::qWaitForWindowShown(m_view);
+    QVERIFY(QTest::qWaitForWindowExposed(m_view));
     QCOMPARE(axis.categories(), categories);
 
     QCOMPARE(spy0.count(), categories.count());
@@ -279,7 +279,7 @@ void tst_QBarCategoriesAxis::at()
 
     m_chart->setAxisX(&axis, m_series);
     m_view->show();
-    QTest::qWaitForWindowShown(m_view);
+    QVERIFY(QTest::qWaitForWindowExposed(m_view));
     QCOMPARE(axis.at(index), string);
 
     QCOMPARE(spy0.count(), 0);
@@ -317,7 +317,7 @@ void tst_QBarCategoriesAxis::categories()
 
     m_chart->setAxisX(&axis, m_series);
     m_view->show();
-    QTest::qWaitForWindowShown(m_view);
+    QVERIFY(QTest::qWaitForWindowExposed(m_view));
     QCOMPARE(axis.categories(), categories);
 
     QCOMPARE(spy0.count(), 1);
@@ -358,7 +358,7 @@ void tst_QBarCategoriesAxis::clear()
 
     m_chart->setAxisX(&axis, m_series);
     m_view->show();
-    QTest::qWaitForWindowShown(m_view);
+    QVERIFY(QTest::qWaitForWindowExposed(m_view));
 
     QCOMPARE(spy0.count(), 2);
     QCOMPARE(spy1.count(), 2);
@@ -406,7 +406,7 @@ void tst_QBarCategoriesAxis::count()
 
     m_chart->setAxisX(&axis, m_series);
     m_view->show();
-    QTest::qWaitForWindowShown(m_view);
+    QVERIFY(QTest::qWaitForWindowExposed(m_view));
     QCOMPARE(axis.count(), count);
 }
 
@@ -445,7 +445,7 @@ void tst_QBarCategoriesAxis::insert()
 
     m_chart->setAxisX(&axis, m_series);
     m_view->show();
-    QTest::qWaitForWindowShown(m_view);
+    QVERIFY(QTest::qWaitForWindowExposed(m_view));
 }
 
 void tst_QBarCategoriesAxis::remove_data()
@@ -524,7 +524,7 @@ void tst_QBarCategoriesAxis::max()
 {
     m_chart->setAxisX(m_baraxis, m_series);
     m_view->show();
-    QTest::qWaitForWindowShown(m_view);
+    QVERIFY(QTest::qWaitForWindowExposed(m_view));
     max_raw();
 }
 
@@ -578,7 +578,7 @@ void tst_QBarCategoriesAxis::min()
     min_raw();
     m_chart->setAxisX(m_baraxis, m_series);
     m_view->show();
-    QTest::qWaitForWindowShown(m_view);
+    QVERIFY(QTest::qWaitForWindowExposed(m_view));
 
 }
 
@@ -636,7 +636,7 @@ void tst_QBarCategoriesAxis::range()
     range_raw();
     m_chart->setAxisX(m_baraxis, m_series);
     m_view->show();
-    QTest::qWaitForWindowShown(m_view);
+    QVERIFY(QTest::qWaitForWindowExposed(m_view));
 
 }
 
@@ -680,7 +680,7 @@ void tst_QBarCategoriesAxis::noautoscale()
 
     m_chart->setAxisX(m_baraxis, m_series);
     m_view->show();
-    QTest::qWaitForWindowShown(m_view);
+    QVERIFY(QTest::qWaitForWindowExposed(m_view));
     QCOMPARE(m_baraxis->min(),min);
     QCOMPARE(m_baraxis->max(),max);
 }
@@ -708,7 +708,7 @@ void tst_QBarCategoriesAxis::autoscale()
     QCOMPARE(spy2.count(), 1);
 
     m_view->show();
-    QTest::qWaitForWindowShown(m_view);
+    QVERIFY(QTest::qWaitForWindowExposed(m_view));
     QCOMPARE(m_baraxis->min(),QString("1"));
     QCOMPARE(m_baraxis->max(),QString("6"));
 }
diff --git a/tests/auto/qbarseries/tst_qbarseries.cpp b/tests/auto/qbarseries/tst_qbarseries.cpp
index ef49b1ca..68c94934 100644
--- a/tests/auto/qbarseries/tst_qbarseries.cpp
+++ b/tests/auto/qbarseries/tst_qbarseries.cpp
@@ -491,7 +491,7 @@ void tst_QBarSeries::mouseclicked()
     view.resize(400,300);
     view.chart()->addSeries(series);
     view.show();
-    QTest::qWaitForWindowShown(&view);
+    QVERIFY(QTest::qWaitForWindowExposed(&view));
 
     // Calculate expected layout for bars
     QRectF plotArea = view.chart()->plotArea();
@@ -670,7 +670,7 @@ void tst_QBarSeries::mousehovered()
     view.resize(400,300);
     view.chart()->addSeries(series);
     view.show();
-    QTest::qWaitForWindowShown(&view);
+    QVERIFY(QTest::qWaitForWindowExposed(&view));
 
     //this is hack since view does not get events otherwise
     view.setMouseTracking(true);
@@ -1017,7 +1017,7 @@ void tst_QBarSeries::mousePressed()
     view.resize(400,300);
     view.chart()->addSeries(series);
     view.show();
-    QTest::qWaitForWindowShown(&view);
+    QVERIFY(QTest::qWaitForWindowExposed(&view));
 
     // Calculate expected layout for bars
     QRectF plotArea = view.chart()->plotArea();
@@ -1182,7 +1182,7 @@ void tst_QBarSeries::mouseReleased()
     view.resize(400,300);
     view.chart()->addSeries(series);
     view.show();
-    QTest::qWaitForWindowShown(&view);
+    QVERIFY(QTest::qWaitForWindowExposed(&view));
 
     // Calculate expected layout for bars
     QRectF plotArea = view.chart()->plotArea();
@@ -1347,7 +1347,7 @@ void tst_QBarSeries::mouseDoubleClicked()
     view.resize(400,300);
     view.chart()->addSeries(series);
     view.show();
-    QTest::qWaitForWindowShown(&view);
+    QVERIFY(QTest::qWaitForWindowExposed(&view));
 
     // Calculate expected layout for bars
     QRectF plotArea = view.chart()->plotArea();
diff --git a/tests/auto/qbarset/tst_qbarset.cpp b/tests/auto/qbarset/tst_qbarset.cpp
index 9e72a2c1..fe4d1589 100644
--- a/tests/auto/qbarset/tst_qbarset.cpp
+++ b/tests/auto/qbarset/tst_qbarset.cpp
@@ -447,7 +447,7 @@ void tst_QBarSet::customize()
     view.resize(200, 200);
     view.chart()->addSeries(series);
     view.show();
-    QTest::qWaitForWindowShown(&view);
+    QVERIFY(QTest::qWaitForWindowExposed(&view));
 
     // Test adding data to the sets
     *set1 << 1 << 2 << 1 << 3;
diff --git a/tests/auto/qcandlestickseries/tst_qcandlestickseries.cpp b/tests/auto/qcandlestickseries/tst_qcandlestickseries.cpp
index ac056314..d65a5a34 100644
--- a/tests/auto/qcandlestickseries/tst_qcandlestickseries.cpp
+++ b/tests/auto/qcandlestickseries/tst_qcandlestickseries.cpp
@@ -598,7 +598,7 @@ void tst_QCandlestickSeries::mouseClicked()
     view.chart()->addSeries(m_series);
     view.chart()->createDefaultAxes();
     view.show();
-    QTest::qWaitForWindowShown(&view);
+    QVERIFY(QTest::qWaitForWindowExposed(&view));
 
     // Calculate expected layout for candlesticks
     QRectF plotArea = view.chart()->plotArea();
@@ -662,7 +662,7 @@ void tst_QCandlestickSeries::mouseHovered()
     view.chart()->addSeries(m_series);
     view.chart()->createDefaultAxes();
     view.show();
-    QTest::qWaitForWindowShown(&view);
+    QVERIFY(QTest::qWaitForWindowExposed(&view));
 
     // This is hack since view does not get events otherwise
     view.setMouseTracking(true);
@@ -777,7 +777,7 @@ void tst_QCandlestickSeries::mousePressed()
     view.chart()->addSeries(m_series);
     view.chart()->createDefaultAxes();
     view.show();
-    QTest::qWaitForWindowShown(&view);
+    QVERIFY(QTest::qWaitForWindowExposed(&view));
 
     // Calculate expected layout for candlesticks
     QRectF plotArea = view.chart()->plotArea();
@@ -840,7 +840,7 @@ void tst_QCandlestickSeries::mouseReleased()
     view.chart()->addSeries(m_series);
     view.chart()->createDefaultAxes();
     view.show();
-    QTest::qWaitForWindowShown(&view);
+    QVERIFY(QTest::qWaitForWindowExposed(&view));
 
     // Calculate expected layout for candlesticks
     QRectF plotArea = view.chart()->plotArea();
@@ -903,7 +903,7 @@ void tst_QCandlestickSeries::mouseDoubleClicked()
     view.chart()->addSeries(m_series);
     view.chart()->createDefaultAxes();
     view.show();
-    QTest::qWaitForWindowShown(&view);
+    QVERIFY(QTest::qWaitForWindowExposed(&view));
 
     // Calculate expected layout for candlesticks
     QRectF plotArea = view.chart()->plotArea();
diff --git a/tests/auto/qcategoryaxis/tst_qcategoryaxis.cpp b/tests/auto/qcategoryaxis/tst_qcategoryaxis.cpp
index a9787eb7..5610914c 100644
--- a/tests/auto/qcategoryaxis/tst_qcategoryaxis.cpp
+++ b/tests/auto/qcategoryaxis/tst_qcategoryaxis.cpp
@@ -118,7 +118,7 @@ void tst_QCategoryAxis::qcategoryaxis()
 
     m_chart->setAxisX(m_categoryaxis, m_series);
     m_view->show();
-    QTest::qWaitForWindowShown(m_view);
+    QVERIFY(QTest::qWaitForWindowExposed(m_view));
 
     QVERIFY(!qFuzzyCompare(m_categoryaxis->max(), 0));
     QVERIFY(!qFuzzyCompare(m_categoryaxis->min(), 0));
@@ -159,7 +159,7 @@ void tst_QCategoryAxis::max()
 {
     m_chart->setAxisX(m_categoryaxis, m_series);
     m_view->show();
-    QTest::qWaitForWindowShown(m_view);
+    QVERIFY(QTest::qWaitForWindowExposed(m_view));
     max_raw();
 }
 
@@ -207,7 +207,7 @@ void tst_QCategoryAxis::min()
 {
     m_chart->setAxisX(m_categoryaxis, m_series);
     m_view->show();
-    QTest::qWaitForWindowShown(m_view);
+    QVERIFY(QTest::qWaitForWindowExposed(m_view));
     min_raw();
 }
 
@@ -261,7 +261,7 @@ void tst_QCategoryAxis::range()
 {
     m_chart->setAxisX(m_categoryaxis, m_series);
     m_view->show();
-    QTest::qWaitForWindowShown(m_view);
+    QVERIFY(QTest::qWaitForWindowExposed(m_view));
     range_raw();
 }
 
@@ -339,7 +339,7 @@ void tst_QCategoryAxis::reverse()
     QCOMPARE(spy.count(), 1);
 
     m_view->show();
-    QTest::qWaitForWindowShown(m_view);
+    QVERIFY(QTest::qWaitForWindowExposed(m_view));
     QCOMPARE(m_categoryaxis->isReverse(), true);
 }
 
diff --git a/tests/auto/qchart/tst_qchart.cpp b/tests/auto/qchart/tst_qchart.cpp
index 7347f16b..a4debfd7 100644
--- a/tests/auto/qchart/tst_qchart.cpp
+++ b/tests/auto/qchart/tst_qchart.cpp
@@ -164,7 +164,7 @@ void tst_QChart::createTestData()
      *series0 << QPointF(0, 0) << QPointF(100, 100);
      m_chart->addSeries(series0);
      m_view->show();
-     QTest::qWaitForWindowShown(m_view);
+     QVERIFY(QTest::qWaitForWindowExposed(m_view));
 }
 
 void tst_QChart::qchart_data()
@@ -240,7 +240,7 @@ void tst_QChart::addSeries()
 {
     QFETCH(QAbstractSeries *, series);
     m_view->show();
-    QTest::qWaitForWindowShown(m_view);
+    QVERIFY(QTest::qWaitForWindowExposed(m_view));
     QVERIFY(!series->chart());
     QCOMPARE(m_chart->series().count(), 0);
     m_chart->addSeries(series);
@@ -337,7 +337,7 @@ void tst_QChart::axisX()
     QFETCH(QAbstractSeries*, series);
     QVERIFY(!m_chart->axisX());
     m_view->show();
-    QTest::qWaitForWindowShown(m_view);
+    QVERIFY(QTest::qWaitForWindowExposed(m_view));
     m_chart->addSeries(series);
     m_chart->setAxisX(axis,series);
     QVERIFY(m_chart->axisX(series)==axis);
@@ -355,7 +355,7 @@ void tst_QChart::axisY()
     QFETCH(QAbstractSeries*, series);
     QVERIFY(!m_chart->axisY());
     m_view->show();
-    QTest::qWaitForWindowShown(m_view);
+    QVERIFY(QTest::qWaitForWindowExposed(m_view));
     m_chart->addSeries(series);
     m_chart->setAxisY(axis,series);
     QVERIFY(m_chart->axisY(series)==axis);
@@ -541,7 +541,7 @@ void tst_QChart::removeAllSeries()
     m_chart->addSeries(series1);
     m_chart->addSeries(series2);
     m_view->show();
-    QTest::qWaitForWindowShown(m_view);
+    QVERIFY(QTest::qWaitForWindowExposed(m_view));
     m_chart->createDefaultAxes();
     QCOMPARE(m_chart->axes().count(), 2);
     QVERIFY(m_chart->axisY(series0)!=0);
@@ -568,7 +568,7 @@ void tst_QChart::removeSeries()
     QFETCH(QAbstractSeries *, series);
     QSignalSpy deleteSpy(series, SIGNAL(destroyed()));
     m_view->show();
-    QTest::qWaitForWindowShown(m_view);
+    QVERIFY(QTest::qWaitForWindowExposed(m_view));
     if(!axis) axis = m_chart->axisY();
     m_chart->addSeries(series);
     m_chart->setAxisY(axis,series);
@@ -599,7 +599,7 @@ void tst_QChart::scroll_right()
     m_chart->addSeries(series);
     m_chart->createDefaultAxes();
     m_view->show();
-    QTest::qWaitForWindowShown(m_view);
+    QVERIFY(QTest::qWaitForWindowExposed(m_view));
     QAbstractAxis * axis = m_chart->axisX();
     QVERIFY(axis!=0);
 
@@ -643,7 +643,7 @@ void tst_QChart::scroll_left()
      m_chart->addSeries(series);
      m_chart->createDefaultAxes();
      m_view->show();
-     QTest::qWaitForWindowShown(m_view);
+     QVERIFY(QTest::qWaitForWindowExposed(m_view));
      QAbstractAxis * axis = m_chart->axisX();
      QVERIFY(axis!=0);
 
@@ -686,7 +686,7 @@ void tst_QChart::scroll_up()
     m_chart->addSeries(series);
     m_chart->createDefaultAxes();
     m_view->show();
-    QTest::qWaitForWindowShown(m_view);
+    QVERIFY(QTest::qWaitForWindowExposed(m_view));
     QAbstractAxis * axis = m_chart->axisY();
     QVERIFY(axis!=0);
 
@@ -729,7 +729,7 @@ void tst_QChart::scroll_down()
      m_chart->addSeries(series);
      m_chart->createDefaultAxes();
      m_view->show();
-     QTest::qWaitForWindowShown(m_view);
+     QVERIFY(QTest::qWaitForWindowExposed(m_view));
      QAbstractAxis * axis = m_chart->axisY();
      QVERIFY(axis!=0);
 
diff --git a/tests/auto/qchartview/tst_qchartview.cpp b/tests/auto/qchartview/tst_qchartview.cpp
index 4f36dbc1..df403710 100644
--- a/tests/auto/qchartview/tst_qchartview.cpp
+++ b/tests/auto/qchartview/tst_qchartview.cpp
@@ -98,7 +98,7 @@ void tst_QChartView::qchartview()
     QVERIFY(m_view->chart());
     QCOMPARE(m_view->rubberBand(), QChartView::NoRubberBand);
     m_view->show();
-    QTest::qWaitForWindowShown(m_view);
+    QVERIFY(QTest::qWaitForWindowExposed(m_view));
 
     delete(new QChartView());
 
@@ -163,7 +163,7 @@ void tst_QChartView::rubberBand()
     m_view->chart()->addSeries(line);
     m_view->chart()->createDefaultAxes();
     m_view->show();
-    QTest::qWaitForWindowShown(m_view);
+    QVERIFY(QTest::qWaitForWindowExposed(m_view));
 
     QRectF plotArea = m_view->chart()->plotArea();
     //this is hack since view does not get events otherwise
@@ -223,7 +223,7 @@ void tst_QChartView::setChart()
 
     // show current chart
     m_view->show();
-    QTest::qWaitForWindowShown(m_view);
+    QVERIFY(QTest::qWaitForWindowExposed(m_view));
     QTest::qWait(1000);
 
     // set new chart
diff --git a/tests/auto/qdatetimeaxis/tst_qdatetimeaxis.cpp b/tests/auto/qdatetimeaxis/tst_qdatetimeaxis.cpp
index fa2f5447..5091d1df 100644
--- a/tests/auto/qdatetimeaxis/tst_qdatetimeaxis.cpp
+++ b/tests/auto/qdatetimeaxis/tst_qdatetimeaxis.cpp
@@ -122,7 +122,7 @@ void tst_QDateTimeAxis::qdatetimeaxis()
     QCOMPARE(m_dateTimeAxisX->type(), QAbstractAxis::AxisTypeDateTime);
 
     m_view->show();
-    QTest::qWaitForWindowShown(m_view);
+    QVERIFY(QTest::qWaitForWindowExposed(m_view));
 
     QVERIFY(m_dateTimeAxisX->max().toMSecsSinceEpoch() != 0);
     QVERIFY(m_dateTimeAxisX->min().toMSecsSinceEpoch() != 0);
@@ -175,7 +175,7 @@ void tst_QDateTimeAxis::max()
 {
 //    m_chart->setAxisX(m_dateTimeAxisX, m_series);
     m_view->show();
-    QTest::qWaitForWindowShown(m_view);
+    QVERIFY(QTest::qWaitForWindowExposed(m_view));
     max_raw();
 }
 
@@ -234,7 +234,7 @@ void tst_QDateTimeAxis::min()
 {
 //    m_chart->setAxisX(m_dateTimeAxisX, m_series);
     m_view->show();
-    QTest::qWaitForWindowShown(m_view);
+    QVERIFY(QTest::qWaitForWindowExposed(m_view));
     min_raw();
 }
 
@@ -308,7 +308,7 @@ void tst_QDateTimeAxis::range()
 {
 //    m_chart->setAxisX(m_dateTimeAxisX, m_series);
     m_view->show();
-    QTest::qWaitForWindowShown(m_view);
+    QVERIFY(QTest::qWaitForWindowExposed(m_view));
     range_raw();
 }
 
@@ -333,7 +333,7 @@ void tst_QDateTimeAxis::reverse()
     QCOMPARE(spy.count(), 1);
 
     m_view->show();
-    QTest::qWaitForWindowShown(m_view);
+    QVERIFY(QTest::qWaitForWindowExposed(m_view));
     QCOMPARE(m_dateTimeAxisX->isReverse(), true);
 }
 
diff --git a/tests/auto/qhorizontalbarseries/tst_qhorizontalbarseries.cpp b/tests/auto/qhorizontalbarseries/tst_qhorizontalbarseries.cpp
index d6e7976b..87f45816 100644
--- a/tests/auto/qhorizontalbarseries/tst_qhorizontalbarseries.cpp
+++ b/tests/auto/qhorizontalbarseries/tst_qhorizontalbarseries.cpp
@@ -424,7 +424,7 @@ void tst_QHorizontalBarSeries::mouseclicked()
     view.resize(400,300);
     view.chart()->addSeries(series);
     view.show();
-    QTest::qWaitForWindowShown(&view);
+    QVERIFY(QTest::qWaitForWindowExposed(&view));
 
     // Calculate expected layout for bars
     QRectF plotArea = view.chart()->plotArea();
@@ -596,7 +596,7 @@ void tst_QHorizontalBarSeries::mousehovered()
     view.resize(400,300);
     view.chart()->addSeries(series);
     view.show();
-    QTest::qWaitForWindowShown(&view);
+    QVERIFY(QTest::qWaitForWindowExposed(&view));
 
     //this is hack since view does not get events otherwise
     view.setMouseTracking(true);
@@ -909,7 +909,7 @@ void tst_QHorizontalBarSeries::mousePressed()
     view.resize(400,300);
     view.chart()->addSeries(series);
     view.show();
-    QTest::qWaitForWindowShown(&view);
+    QVERIFY(QTest::qWaitForWindowExposed(&view));
 
     // Calculate expected layout for bars
     QRectF plotArea = view.chart()->plotArea();
@@ -1074,7 +1074,7 @@ void tst_QHorizontalBarSeries::mouseReleased()
     view.resize(400,300);
     view.chart()->addSeries(series);
     view.show();
-    QTest::qWaitForWindowShown(&view);
+    QVERIFY(QTest::qWaitForWindowExposed(&view));
 
     // Calculate expected layout for bars
     QRectF plotArea = view.chart()->plotArea();
@@ -1239,7 +1239,7 @@ void tst_QHorizontalBarSeries::mouseDoubleClicked()
     view.resize(400,300);
     view.chart()->addSeries(series);
     view.show();
-    QTest::qWaitForWindowShown(&view);
+    QVERIFY(QTest::qWaitForWindowExposed(&view));
 
     // Calculate expected layout for bars
     QRectF plotArea = view.chart()->plotArea();
diff --git a/tests/auto/qhorizontalpercentbarseries/tst_qhorizontalpercentbarseries.cpp b/tests/auto/qhorizontalpercentbarseries/tst_qhorizontalpercentbarseries.cpp
index c01cb58f..b7d760de 100644
--- a/tests/auto/qhorizontalpercentbarseries/tst_qhorizontalpercentbarseries.cpp
+++ b/tests/auto/qhorizontalpercentbarseries/tst_qhorizontalpercentbarseries.cpp
@@ -207,7 +207,7 @@ void tst_QHorizontalPercentBarSeries::mouseclicked()
     view.resize(400,300);
     view.chart()->addSeries(series);
     view.show();
-    QTest::qWaitForWindowShown(&view);
+    QVERIFY(QTest::qWaitForWindowExposed(&view));
 
     // Calculate expected layout for bars
     QRectF plotArea = view.chart()->plotArea();
@@ -343,7 +343,7 @@ void tst_QHorizontalPercentBarSeries::mousehovered()
     view.resize(400,300);
     view.chart()->addSeries(series);
     view.show();
-    QTest::qWaitForWindowShown(&view);
+    QVERIFY(QTest::qWaitForWindowExposed(&view));
 
     //this is hack since view does not get events otherwise
     view.setMouseTracking(true);
@@ -629,7 +629,7 @@ void tst_QHorizontalPercentBarSeries::zeroValuesInSeries()
     view.chart()->createDefaultAxes();
     view.show();
 
-    QTest::qWaitForWindowShown(&view);
+    QVERIFY(QTest::qWaitForWindowExposed(&view));
 }
 
 
@@ -656,7 +656,7 @@ void tst_QHorizontalPercentBarSeries::mousePressed()
     view.resize(400,300);
     view.chart()->addSeries(series);
     view.show();
-    QTest::qWaitForWindowShown(&view);
+    QVERIFY(QTest::qWaitForWindowExposed(&view));
 
     // Calculate expected layout for bars
     QRectF plotArea = view.chart()->plotArea();
@@ -821,7 +821,7 @@ void tst_QHorizontalPercentBarSeries::mouseReleased()
     view.resize(400,300);
     view.chart()->addSeries(series);
     view.show();
-    QTest::qWaitForWindowShown(&view);
+    QVERIFY(QTest::qWaitForWindowExposed(&view));
 
     // Calculate expected layout for bars
     QRectF plotArea = view.chart()->plotArea();
@@ -986,7 +986,7 @@ void tst_QHorizontalPercentBarSeries::mouseDoubleClicked()
     view.resize(400,300);
     view.chart()->addSeries(series);
     view.show();
-    QTest::qWaitForWindowShown(&view);
+    QVERIFY(QTest::qWaitForWindowExposed(&view));
 
     // Calculate expected layout for bars
     QRectF plotArea = view.chart()->plotArea();
diff --git a/tests/auto/qhorizontalstackedbarseries/tst_qhorizontalstackedbarseries.cpp b/tests/auto/qhorizontalstackedbarseries/tst_qhorizontalstackedbarseries.cpp
index 8e5ad06c..caacea4e 100644
--- a/tests/auto/qhorizontalstackedbarseries/tst_qhorizontalstackedbarseries.cpp
+++ b/tests/auto/qhorizontalstackedbarseries/tst_qhorizontalstackedbarseries.cpp
@@ -206,7 +206,7 @@ void tst_QHorizontalStackedBarSeries::mouseclicked()
     view.resize(400,300);
     view.chart()->addSeries(series);
     view.show();
-    QTest::qWaitForWindowShown(&view);
+    QVERIFY(QTest::qWaitForWindowExposed(&view));
 
     // Calculate expected layout for bars
     QRectF plotArea = view.chart()->plotArea();
@@ -347,7 +347,7 @@ void tst_QHorizontalStackedBarSeries::mousehovered()
     view.resize(400,300);
     view.chart()->addSeries(series);
     view.show();
-    QTest::qWaitForWindowShown(&view);
+    QVERIFY(QTest::qWaitForWindowExposed(&view));
 
     //this is hack since view does not get events otherwise
     view.setMouseTracking(true);
@@ -644,7 +644,7 @@ void tst_QHorizontalStackedBarSeries::mousePressed()
     view.resize(400,300);
     view.chart()->addSeries(series);
     view.show();
-    QTest::qWaitForWindowShown(&view);
+    QVERIFY(QTest::qWaitForWindowExposed(&view));
 
     // Calculate expected layout for bars
     QRectF plotArea = view.chart()->plotArea();
@@ -814,7 +814,7 @@ void tst_QHorizontalStackedBarSeries::mouseReleased()
     view.resize(400,300);
     view.chart()->addSeries(series);
     view.show();
-    QTest::qWaitForWindowShown(&view);
+    QVERIFY(QTest::qWaitForWindowExposed(&view));
 
     // Calculate expected layout for bars
     QRectF plotArea = view.chart()->plotArea();
@@ -984,7 +984,7 @@ void tst_QHorizontalStackedBarSeries::mouseDoubleClicked()
     view.resize(400,300);
     view.chart()->addSeries(series);
     view.show();
-    QTest::qWaitForWindowShown(&view);
+    QVERIFY(QTest::qWaitForWindowExposed(&view));
 
     // Calculate expected layout for bars
     QRectF plotArea = view.chart()->plotArea();
diff --git a/tests/auto/qlegend/tst_qlegend.cpp b/tests/auto/qlegend/tst_qlegend.cpp
index 605de863..8d7ead2c 100644
--- a/tests/auto/qlegend/tst_qlegend.cpp
+++ b/tests/auto/qlegend/tst_qlegend.cpp
@@ -557,7 +557,7 @@ void tst_QLegend::markerSignals()
     QChartView view(chart);
     view.resize(400, 400);
     view.show();
-    QTest::qWaitForWindowShown(&view);
+    QVERIFY(QTest::qWaitForWindowExposed(&view));
 
     // Sweep mouse over all legend items
     for (int i = 0; i < 400; i++)
diff --git a/tests/auto/qlineseries/tst_qlineseries.cpp b/tests/auto/qlineseries/tst_qlineseries.cpp
index 995abc04..394b192f 100644
--- a/tests/auto/qlineseries/tst_qlineseries.cpp
+++ b/tests/auto/qlineseries/tst_qlineseries.cpp
@@ -114,7 +114,7 @@ void tst_QLineSeries::qlineseries()
 
     m_chart->addSeries(&series);
     m_view->show();
-    QTest::qWaitForWindowShown(m_view);
+    QVERIFY(QTest::qWaitForWindowExposed(m_view));
 }
 
 void tst_QLineSeries::pressedSignal()
@@ -132,7 +132,7 @@ void tst_QLineSeries::pressedSignal()
     view.chart()->legend()->setVisible(false);
     view.chart()->addSeries(lineSeries);
     view.show();
-    QTest::qWaitForWindowShown(&view);
+    QVERIFY(QTest::qWaitForWindowExposed(&view));
 
     QSignalSpy seriesSpy(lineSeries, SIGNAL(pressed(QPointF)));
 
@@ -164,7 +164,7 @@ void tst_QLineSeries::releasedSignal()
     view.chart()->legend()->setVisible(false);
     view.chart()->addSeries(lineSeries);
     view.show();
-    QTest::qWaitForWindowShown(&view);
+    QVERIFY(QTest::qWaitForWindowExposed(&view));
 
     QSignalSpy seriesSpy(lineSeries, SIGNAL(released(QPointF)));
 
@@ -218,7 +218,7 @@ void tst_QLineSeries::doubleClickedSignal()
     view.chart()->legend()->setVisible(false);
     view.chart()->addSeries(lineSeries);
     view.show();
-    QTest::qWaitForWindowShown(&view);
+    QVERIFY(QTest::qWaitForWindowExposed(&view));
 
     QSignalSpy seriesSpy(lineSeries, SIGNAL(doubleClicked(QPointF)));
 
diff --git a/tests/auto/qlogvalueaxis/tst_qlogvalueaxis.cpp b/tests/auto/qlogvalueaxis/tst_qlogvalueaxis.cpp
index 26523b4b..427008f8 100644
--- a/tests/auto/qlogvalueaxis/tst_qlogvalueaxis.cpp
+++ b/tests/auto/qlogvalueaxis/tst_qlogvalueaxis.cpp
@@ -119,7 +119,7 @@ void tst_QLogValueAxis::qlogvalueaxis()
 
     m_chart->setAxisX(m_logvaluesaxis, m_series);
     m_view->show();
-    QTest::qWaitForWindowShown(m_view);
+    QVERIFY(QTest::qWaitForWindowExposed(m_view));
 
     QCOMPARE(m_logvaluesaxis->max(), (qreal)100);
     QCOMPARE(m_logvaluesaxis->min(), (qreal)1);
@@ -172,7 +172,7 @@ void tst_QLogValueAxis::max()
 {
     m_chart->setAxisX(m_logvaluesaxis, m_series);
     m_view->show();
-    QTest::qWaitForWindowShown(m_view);
+    QVERIFY(QTest::qWaitForWindowExposed(m_view));
     max_raw();
 }
 
@@ -227,7 +227,7 @@ void tst_QLogValueAxis::min()
 {
     m_chart->setAxisX(m_logvaluesaxis, m_series);
     m_view->show();
-    QTest::qWaitForWindowShown(m_view);
+    QVERIFY(QTest::qWaitForWindowExposed(m_view));
     min_raw();
 }
 
@@ -291,7 +291,7 @@ void tst_QLogValueAxis::range()
 {
     m_chart->setAxisX(m_logvaluesaxis, m_series);
     m_view->show();
-    QTest::qWaitForWindowShown(m_view);
+    QVERIFY(QTest::qWaitForWindowExposed(m_view));
     range_raw();
 }
 
@@ -306,7 +306,7 @@ void tst_QLogValueAxis::range_before_show()
 
     m_chart->setAxisX(m_logvaluesaxis, m_series);
     m_view->show();
-    QTest::qWaitForWindowShown(m_view);
+    QVERIFY(QTest::qWaitForWindowExposed(m_view));
 }
 
 void tst_QLogValueAxis::range_animation_data()
@@ -345,7 +345,7 @@ void tst_QLogValueAxis::noautoscale()
     QCOMPARE(spy1.count(), 1);
     QCOMPARE(spy2.count(), 1);
     m_view->show();
-    QTest::qWaitForWindowShown(m_view);
+    QVERIFY(QTest::qWaitForWindowExposed(m_view));
     QCOMPARE(m_logvaluesaxis->min(), min);
     QCOMPARE(m_logvaluesaxis->max(), max);
 }
@@ -370,7 +370,7 @@ void tst_QLogValueAxis::autoscale()
     QCOMPARE(spy2.count(), 1);
 
     m_view->show();
-    QTest::qWaitForWindowShown(m_view);
+    QVERIFY(QTest::qWaitForWindowExposed(m_view));
     QCOMPARE(m_logvaluesaxis->min(), (qreal)1);
     QCOMPARE(m_logvaluesaxis->max(), (qreal)100);
 }
@@ -379,7 +379,7 @@ void tst_QLogValueAxis::zoom()
 {
     m_chart->setAxisX(m_logvaluesaxis, m_series);
     m_view->show();
-    QTest::qWaitForWindowShown(m_view);
+    QVERIFY(QTest::qWaitForWindowExposed(m_view));
     m_logvaluesaxis->setBase(2);
     m_logvaluesaxis->setRange(0.5, 2);
 
@@ -420,7 +420,7 @@ void tst_QLogValueAxis::reverse()
     QCOMPARE(spy.count(), 1);
 
     m_view->show();
-    QTest::qWaitForWindowShown(m_view);
+    QVERIFY(QTest::qWaitForWindowExposed(m_view));
     QCOMPARE(m_logvaluesaxis->isReverse(), true);
 }
 
diff --git a/tests/auto/qpercentbarseries/tst_qpercentbarseries.cpp b/tests/auto/qpercentbarseries/tst_qpercentbarseries.cpp
index cd16c7e9..f5dc3548 100644
--- a/tests/auto/qpercentbarseries/tst_qpercentbarseries.cpp
+++ b/tests/auto/qpercentbarseries/tst_qpercentbarseries.cpp
@@ -207,7 +207,7 @@ void tst_QPercentBarSeries::mouseclicked()
     view.resize(400,300);
     view.chart()->addSeries(series);
     view.show();
-    QTest::qWaitForWindowShown(&view);
+    QVERIFY(QTest::qWaitForWindowExposed(&view));
 
     // Calculate expected layout for bars
     QRectF plotArea = view.chart()->plotArea();
@@ -345,7 +345,7 @@ void tst_QPercentBarSeries::mousehovered()
     view.resize(400,300);
     view.chart()->addSeries(series);
     view.show();
-    QTest::qWaitForWindowShown(&view);
+    QVERIFY(QTest::qWaitForWindowExposed(&view));
 
     //this is hack since view does not get events otherwise
     view.setMouseTracking(true);
@@ -633,7 +633,7 @@ void tst_QPercentBarSeries::zeroValuesInSeries()
     view.chart()->createDefaultAxes();
     view.show();
 
-    QTest::qWaitForWindowShown(&view);
+    QVERIFY(QTest::qWaitForWindowExposed(&view));
 }
 
 void tst_QPercentBarSeries::mousePressed()
@@ -659,7 +659,7 @@ void tst_QPercentBarSeries::mousePressed()
     view.resize(400,300);
     view.chart()->addSeries(series);
     view.show();
-    QTest::qWaitForWindowShown(&view);
+    QVERIFY(QTest::qWaitForWindowExposed(&view));
 
     // Calculate expected layout for bars
     QRectF plotArea = view.chart()->plotArea();
@@ -826,7 +826,7 @@ void tst_QPercentBarSeries::mouseReleased()
     view.resize(400,300);
     view.chart()->addSeries(series);
     view.show();
-    QTest::qWaitForWindowShown(&view);
+    QVERIFY(QTest::qWaitForWindowExposed(&view));
 
     // Calculate expected layout for bars
     QRectF plotArea = view.chart()->plotArea();
@@ -993,7 +993,7 @@ void tst_QPercentBarSeries::mouseDoubleClicked()
     view.resize(400,300);
     view.chart()->addSeries(series);
     view.show();
-    QTest::qWaitForWindowShown(&view);
+    QVERIFY(QTest::qWaitForWindowExposed(&view));
 
     // Calculate expected layout for bars
     QRectF plotArea = view.chart()->plotArea();
diff --git a/tests/auto/qpieseries/tst_qpieseries.cpp b/tests/auto/qpieseries/tst_qpieseries.cpp
index 022aa5b7..64b871fe 100644
--- a/tests/auto/qpieseries/tst_qpieseries.cpp
+++ b/tests/auto/qpieseries/tst_qpieseries.cpp
@@ -96,7 +96,7 @@ void tst_qpieseries::init()
     m_view->resize(200, 200);
     m_series = new QPieSeries(m_view);
     m_view->show();
-    QTest::qWaitForWindowShown(m_view);
+    QVERIFY(QTest::qWaitForWindowExposed(m_view));
 
 }
 
@@ -523,7 +523,7 @@ void tst_qpieseries::clickedSignal()
     m_view->chart()->legend()->setVisible(false);
     m_view->chart()->addSeries(m_series);
     m_view->show();
-    QTest::qWaitForWindowShown(m_view);
+    QVERIFY(QTest::qWaitForWindowExposed(m_view));
 
     // test maximum size
     m_series->setPieSize(1.0);
@@ -576,7 +576,7 @@ void tst_qpieseries::hoverSignal()
     m_view->chart()->legend()->setVisible(false);
     m_view->chart()->addSeries(m_series);
     m_view->show();
-    QTest::qWaitForWindowShown(m_view);
+    QVERIFY(QTest::qWaitForWindowExposed(m_view));
 
     // move inside the slices
     m_series->setPieSize(1.0);
@@ -678,7 +678,7 @@ void tst_qpieseries::pressedSignal()
     m_view->chart()->legend()->setVisible(false);
     m_view->chart()->addSeries(m_series);
     m_view->show();
-    QTest::qWaitForWindowShown(m_view);
+    QVERIFY(QTest::qWaitForWindowExposed(m_view));
 
     // test maximum size
     m_series->setPieSize(1.0);
@@ -731,7 +731,7 @@ void tst_qpieseries::releasedSignal()
     m_view->chart()->legend()->setVisible(false);
     m_view->chart()->addSeries(m_series);
     m_view->show();
-    QTest::qWaitForWindowShown(m_view);
+    QVERIFY(QTest::qWaitForWindowExposed(m_view));
 
     // test maximum size
     m_series->setPieSize(1.0);
@@ -781,7 +781,7 @@ void tst_qpieseries::doubleClickedSignal()
     m_view->chart()->legend()->setVisible(false);
     m_view->chart()->addSeries(m_series);
     m_view->show();
-    QTest::qWaitForWindowShown(m_view);
+    QVERIFY(QTest::qWaitForWindowExposed(m_view));
 
     // test maximum size
     m_series->setPieSize(1.0);
diff --git a/tests/auto/qpieslice/tst_qpieslice.cpp b/tests/auto/qpieslice/tst_qpieslice.cpp
index bc68ddd5..19d838f5 100644
--- a/tests/auto/qpieslice/tst_qpieslice.cpp
+++ b/tests/auto/qpieslice/tst_qpieslice.cpp
@@ -193,7 +193,7 @@ void tst_qpieslice::customize()
     view.resize(200, 200);
     view.chart()->addSeries(series);
     view.show();
-    QTest::qWaitForWindowShown(&view);
+    QVERIFY(QTest::qWaitForWindowExposed(&view));
     //QTest::qWait(1000);
 
     // check that customizations persist
@@ -257,7 +257,7 @@ void tst_qpieslice::clickedSignal()
     view.chart()->legend()->setVisible(false);
     view.chart()->addSeries(series);
     view.show();
-    QTest::qWaitForWindowShown(&view);
+    QVERIFY(QTest::qWaitForWindowExposed(&view));
 
     // simulate clicks
     series->setPieSize(1.0);
@@ -295,7 +295,7 @@ void tst_qpieslice::hoverSignal()
     view.chart()->legend()->setVisible(false);
     view.chart()->addSeries(series);
     view.show();
-    QTest::qWaitForWindowShown(&view);
+    QVERIFY(QTest::qWaitForWindowExposed(&view));
 
     // try to ensure focus
     QApplication::setActiveWindow(&view);
@@ -375,7 +375,7 @@ void tst_qpieslice::pressedSignal()
     view.chart()->legend()->setVisible(false);
     view.chart()->addSeries(series);
     view.show();
-    QTest::qWaitForWindowShown(&view);
+    QVERIFY(QTest::qWaitForWindowExposed(&view));
 
     // simulate clicks
     series->setPieSize(1.0);
@@ -416,7 +416,7 @@ void tst_qpieslice::releasedSignal()
     view.chart()->legend()->setVisible(false);
     view.chart()->addSeries(series);
     view.show();
-    QTest::qWaitForWindowShown(&view);
+    QVERIFY(QTest::qWaitForWindowExposed(&view));
 
     // simulate clicks
     series->setPieSize(1.0);
@@ -451,7 +451,7 @@ void tst_qpieslice::doubleClickedSignal()
     view.chart()->legend()->setVisible(false);
     view.chart()->addSeries(series);
     view.show();
-    QTest::qWaitForWindowShown(&view);
+    QVERIFY(QTest::qWaitForWindowExposed(&view));
 
     // simulate clicks
     series->setPieSize(1.0);
diff --git a/tests/auto/qscatterseries/tst_qscatterseries.cpp b/tests/auto/qscatterseries/tst_qscatterseries.cpp
index fdd91198..8b156851 100644
--- a/tests/auto/qscatterseries/tst_qscatterseries.cpp
+++ b/tests/auto/qscatterseries/tst_qscatterseries.cpp
@@ -108,7 +108,7 @@ void tst_QScatterSeries::qscatterseries()
 
     m_chart->addSeries(&series);
     m_view->show();
-    QTest::qWaitForWindowShown(m_view);
+    QVERIFY(QTest::qWaitForWindowExposed(m_view));
 }
 
 void tst_QScatterSeries::scatterChangedSignals()
@@ -155,7 +155,7 @@ void tst_QScatterSeries::pressedSignal()
     view.chart()->legend()->setVisible(false);
     view.chart()->addSeries(scatterSeries);
     view.show();
-    QTest::qWaitForWindowShown(&view);
+    QVERIFY(QTest::qWaitForWindowExposed(&view));
 
     QSignalSpy seriesSpy(scatterSeries, SIGNAL(pressed(QPointF)));
 
@@ -187,7 +187,7 @@ void tst_QScatterSeries::releasedSignal()
     view.chart()->legend()->setVisible(false);
     view.chart()->addSeries(scatterSeries);
     view.show();
-    QTest::qWaitForWindowShown(&view);
+    QVERIFY(QTest::qWaitForWindowExposed(&view));
 
     QSignalSpy seriesSpy(scatterSeries, SIGNAL(released(QPointF)));
 
@@ -219,7 +219,7 @@ void tst_QScatterSeries::doubleClickedSignal()
     view.chart()->legend()->setVisible(false);
     view.chart()->addSeries(scatterSeries);
     view.show();
-    QTest::qWaitForWindowShown(&view);
+    QVERIFY(QTest::qWaitForWindowExposed(&view));
 
     QSignalSpy seriesSpy(scatterSeries, SIGNAL(doubleClicked(QPointF)));
 
diff --git a/tests/auto/qsplineseries/tst_qsplineseries.cpp b/tests/auto/qsplineseries/tst_qsplineseries.cpp
index 0b979658..18e554c8 100644
--- a/tests/auto/qsplineseries/tst_qsplineseries.cpp
+++ b/tests/auto/qsplineseries/tst_qsplineseries.cpp
@@ -106,7 +106,7 @@ void tst_QSplineSeries::qsplineseries()
 
     m_chart->addSeries(&series);
     m_view->show();
-    QTest::qWaitForWindowShown(m_view);
+    QVERIFY(QTest::qWaitForWindowExposed(m_view));
 }
 
 void tst_QSplineSeries::pressedSignal()
@@ -124,7 +124,7 @@ void tst_QSplineSeries::pressedSignal()
     view.chart()->legend()->setVisible(false);
     view.chart()->addSeries(splineSeries);
     view.show();
-    QTest::qWaitForWindowShown(&view);
+    QVERIFY(QTest::qWaitForWindowExposed(&view));
 
     QSignalSpy seriesSpy(splineSeries, SIGNAL(pressed(QPointF)));
 
@@ -156,7 +156,7 @@ void tst_QSplineSeries::releasedSignal()
     view.chart()->legend()->setVisible(false);
     view.chart()->addSeries(splineSeries);
     view.show();
-    QTest::qWaitForWindowShown(&view);
+    QVERIFY(QTest::qWaitForWindowExposed(&view));
 
     QSignalSpy seriesSpy(splineSeries, SIGNAL(released(QPointF)));
 
@@ -188,7 +188,7 @@ void tst_QSplineSeries::doubleClickedSignal()
     view.chart()->legend()->setVisible(false);
     view.chart()->addSeries(splineSeries);
     view.show();
-    QTest::qWaitForWindowShown(&view);
+    QVERIFY(QTest::qWaitForWindowExposed(&view));
 
     QSignalSpy seriesSpy(splineSeries, SIGNAL(doubleClicked(QPointF)));
 
diff --git a/tests/auto/qstackedbarseries/tst_qstackedbarseries.cpp b/tests/auto/qstackedbarseries/tst_qstackedbarseries.cpp
index 287106cd..5fca334c 100644
--- a/tests/auto/qstackedbarseries/tst_qstackedbarseries.cpp
+++ b/tests/auto/qstackedbarseries/tst_qstackedbarseries.cpp
@@ -206,7 +206,7 @@ void tst_QStackedBarSeries::mouseclicked()
     view.resize(400,300);
     view.chart()->addSeries(series);
     view.show();
-    QTest::qWaitForWindowShown(&view);
+    QVERIFY(QTest::qWaitForWindowExposed(&view));
 
     // Calculate expected layout for bars
     QRectF plotArea = view.chart()->plotArea();
@@ -347,7 +347,7 @@ void tst_QStackedBarSeries::mousehovered()
     view.resize(400,300);
     view.chart()->addSeries(series);
     view.show();
-    QTest::qWaitForWindowShown(&view);
+    QVERIFY(QTest::qWaitForWindowExposed(&view));
 
     //this is hack since view does not get events otherwise
     view.setMouseTracking(true);
@@ -645,7 +645,7 @@ void tst_QStackedBarSeries::mousePressed()
     view.resize(400,300);
     view.chart()->addSeries(series);
     view.show();
-    QTest::qWaitForWindowShown(&view);
+    QVERIFY(QTest::qWaitForWindowExposed(&view));
 
     // Calculate expected layout for bars
     QRectF plotArea = view.chart()->plotArea();
@@ -815,7 +815,7 @@ void tst_QStackedBarSeries::mouseReleased()
     view.resize(400,300);
     view.chart()->addSeries(series);
     view.show();
-    QTest::qWaitForWindowShown(&view);
+    QVERIFY(QTest::qWaitForWindowExposed(&view));
 
     // Calculate expected layout for bars
     QRectF plotArea = view.chart()->plotArea();
@@ -985,7 +985,7 @@ void tst_QStackedBarSeries::mouseDoubleClicked()
     view.resize(400,300);
     view.chart()->addSeries(series);
     view.show();
-    QTest::qWaitForWindowShown(&view);
+    QVERIFY(QTest::qWaitForWindowExposed(&view));
 
     // Calculate expected layout for bars
     QRectF plotArea = view.chart()->plotArea();
diff --git a/tests/auto/qvalueaxis/tst_qvalueaxis.cpp b/tests/auto/qvalueaxis/tst_qvalueaxis.cpp
index 1527cb2b..57c78911 100644
--- a/tests/auto/qvalueaxis/tst_qvalueaxis.cpp
+++ b/tests/auto/qvalueaxis/tst_qvalueaxis.cpp
@@ -121,7 +121,7 @@ void tst_QValueAxis::qvalueaxis()
 
     m_chart->setAxisX(m_valuesaxis, m_series);
     m_view->show();
-    QTest::qWaitForWindowShown(m_view);
+    QVERIFY(QTest::qWaitForWindowExposed(m_view));
 
     QVERIFY(!qFuzzyCompare(m_valuesaxis->max(), 0));
     QVERIFY(!qFuzzyCompare(m_valuesaxis->min(), 0));
@@ -164,7 +164,7 @@ void tst_QValueAxis::max()
 {
     m_chart->setAxisX(m_valuesaxis, m_series);
     m_view->show();
-    QTest::qWaitForWindowShown(m_view);
+    QVERIFY(QTest::qWaitForWindowExposed(m_view));
     max_raw();
 }
 
@@ -212,7 +212,7 @@ void tst_QValueAxis::min()
 {
     m_chart->setAxisX(m_valuesaxis, m_series);
     m_view->show();
-    QTest::qWaitForWindowShown(m_view);
+    QVERIFY(QTest::qWaitForWindowExposed(m_view));
     min_raw();
 }
 
@@ -316,7 +316,7 @@ void tst_QValueAxis::range()
 {
     m_chart->setAxisX(m_valuesaxis, m_series);
     m_view->show();
-    QTest::qWaitForWindowShown(m_view);
+    QVERIFY(QTest::qWaitForWindowExposed(m_view));
     range_raw();
 }
 
@@ -359,7 +359,7 @@ void tst_QValueAxis::ticksCount()
 
     m_chart->setAxisX(m_valuesaxis, m_series);
     m_view->show();
-    QTest::qWaitForWindowShown(m_view);
+    QVERIFY(QTest::qWaitForWindowExposed(m_view));
 
     QCOMPARE(m_valuesaxis->tickCount(), ticksCount);
 }
@@ -392,7 +392,7 @@ void tst_QValueAxis::noautoscale()
 
     m_chart->setAxisX(m_valuesaxis, m_series);
     m_view->show();
-    QTest::qWaitForWindowShown(m_view);
+    QVERIFY(QTest::qWaitForWindowExposed(m_view));
     QVERIFY2(qFuzzyCompare(m_valuesaxis->min(), min), "Min not equal");
     QVERIFY2(qFuzzyCompare(m_valuesaxis->max(), max), "Max not equal");
 }
@@ -417,7 +417,7 @@ void tst_QValueAxis::autoscale()
     QCOMPARE(spy2.count(), 1);
 
     m_view->show();
-    QTest::qWaitForWindowShown(m_view);
+    QVERIFY(QTest::qWaitForWindowExposed(m_view));
     QVERIFY2(qFuzzyCompare(m_valuesaxis->min(), -100), "Min not equal");
     QVERIFY2(qFuzzyCompare(m_valuesaxis->max(), 100), "Max not equal");
 }
@@ -434,7 +434,7 @@ void tst_QValueAxis::reverse()
     QCOMPARE(spy.count(), 1);
 
     m_view->show();
-    QTest::qWaitForWindowShown(m_view);
+    QVERIFY(QTest::qWaitForWindowExposed(m_view));
     QCOMPARE(m_valuesaxis->isReverse(), true);
 }
 
@@ -443,7 +443,7 @@ void tst_QValueAxis::labels()
     m_chart->setAxisX(m_valuesaxis, m_series);
     m_view->resize(300, 300);
     m_view->show();
-    QTest::qWaitForWindowShown(m_view);
+    QVERIFY(QTest::qWaitForWindowExposed(m_view));
 
     QList<QGraphicsItem *> childItems = m_chart->scene()->items();
     QList<QGraphicsTextItem *> textItems;
diff --git a/tests/auto/qxyseries/tst_qxyseries.cpp b/tests/auto/qxyseries/tst_qxyseries.cpp
index de878679..07808989 100644
--- a/tests/auto/qxyseries/tst_qxyseries.cpp
+++ b/tests/auto/qxyseries/tst_qxyseries.cpp
@@ -229,7 +229,7 @@ void tst_QXYSeries::chart_append()
     append_raw();
     m_chart->addSeries(m_series);
     m_view->show();
-    QTest::qWaitForWindowShown(m_view);
+    QVERIFY(QTest::qWaitForWindowExposed(m_view));
 }
 
 void tst_QXYSeries::append_chart_data()
@@ -241,7 +241,7 @@ void tst_QXYSeries::append_chart()
 {
     m_view->show();
     m_chart->addSeries(m_series);
-    QTest::qWaitForWindowShown(m_view);
+    QVERIFY(QTest::qWaitForWindowExposed(m_view));
     append_raw();
 
 }
@@ -368,7 +368,7 @@ void tst_QXYSeries::remove_chart()
 {
     m_view->show();
     m_chart->addSeries(m_series);
-    QTest::qWaitForWindowShown(m_view);
+    QVERIFY(QTest::qWaitForWindowExposed(m_view));
     remove_raw();
 }
 
@@ -412,7 +412,7 @@ void tst_QXYSeries::clear_chart()
 {
     m_view->show();
     m_chart->addSeries(m_series);
-    QTest::qWaitForWindowShown(m_view);
+    QVERIFY(QTest::qWaitForWindowExposed(m_view));
     clear_raw();
 }
 
@@ -513,7 +513,7 @@ void tst_QXYSeries::replace_chart()
 {
     m_view->show();
     m_chart->addSeries(m_series);
-    QTest::qWaitForWindowShown(m_view);
+    QVERIFY(QTest::qWaitForWindowExposed(m_view));
     replace_raw();
 }