Fix deprecation errors from Qt5

3 files changed, 116 insertions, 103 deletions

diff --git a/tests/auto/inc/tst_definitions.h b/tests/auto/inc/tst_definitions.h
index 5adb93c3..08524db1 100644
--- a/tests/auto/inc/tst_definitions.h
+++ b/tests/auto/inc/tst_definitions.h
@@ -24,6 +24,17 @@
 #include <QtTest/QtTest>
 #include <QPushButton>
 
+#if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0))
+namespace QTest
+{
+    // This was deprecated in Qt5. This is a small hack for the sake of compatibility.
+    inline static bool qWaitForWindowShown(QWidget *window)
+    {
+        return QTest::qWaitForWindowExposed(window);
+    }
+}
+#endif
+
 #define TRY_COMPARE(actual, expected) { \
     do { \
         const int timeout(1000); \
diff --git a/tests/auto/qbarset/tst_qbarset.cpp b/tests/auto/qbarset/tst_qbarset.cpp
index 9e049a2c..f470df34 100644
--- a/tests/auto/qbarset/tst_qbarset.cpp
+++ b/tests/auto/qbarset/tst_qbarset.cpp
@@ -22,6 +22,7 @@
 #include <qbarset.h>
 #include <qbarseries.h>
 #include <qchartview.h>
+#include "tst_definitions.h"
 
 QTCOMMERCIALCHART_USE_NAMESPACE
 
diff --git a/tests/auto/qchart/tst_qchart.cpp b/tests/auto/qchart/tst_qchart.cpp
index 5d53fdeb..4c6f5bc6 100644
--- a/tests/auto/qchart/tst_qchart.cpp
+++ b/tests/auto/qchart/tst_qchart.cpp
@@ -31,6 +31,7 @@
 #include <qstackedbarseries.h>
 #include <qvalueaxis.h>
 #include <qbarcategoryaxis.h>
+#include "tst_definitions.h"
 
 QTCOMMERCIALCHART_USE_NAMESPACE
 
@@ -466,10 +467,10 @@ void tst_QChart::removeSeries()
 
 void tst_QChart::scroll_right_data()
 {
-	 QTest::addColumn<QAbstractSeries *>("series");
+     QTest::addColumn<QAbstractSeries *>("series");
 
-	 QLineSeries* series0 = new QLineSeries(this);
-	 *series0 << QPointF(0, 0) << QPointF(100, 100);
+     QLineSeries* series0 = new QLineSeries(this);
+     *series0 << QPointF(0, 0) << QPointF(100, 100);
 
      QTest::newRow("lineSeries") << (QAbstractSeries*) series0;
 
@@ -490,77 +491,77 @@ void tst_QChart::scroll_right()
     {
         case QAbstractAxis::AxisTypeValue:{
             QValueAxis* vaxis = qobject_cast<QValueAxis*>(axis);
-    		QVERIFY(vaxis!=0);
-    		qreal min = vaxis->min();
-    		qreal max = vaxis->max();
-    		QVERIFY(max>min);
-    		m_chart->scroll(50, 0);
-    		QVERIFY(min<vaxis->min());
-    		QVERIFY(max<vaxis->max());
-    		break;
-    	}
+            QVERIFY(vaxis!=0);
+            qreal min = vaxis->min();
+            qreal max = vaxis->max();
+            QVERIFY(max>min);
+            m_chart->scroll(50, 0);
+            QVERIFY(min<vaxis->min());
+            QVERIFY(max<vaxis->max());
+            break;
+        }
         case QAbstractAxis::AxisTypeBarCategory:{
             QBarCategoryAxis* caxis = qobject_cast<QBarCategoryAxis*>(axis);
-    	   	QVERIFY(caxis!=0);
-    	   	qreal min = caxis->min().toDouble();
-    	   	qreal max = caxis->max().toDouble();
-    	   	m_chart->scroll(50, 0);
-    	   	QVERIFY(min<caxis->min().toDouble());
-    	   	QVERIFY(max<caxis->max().toDouble());
-    		break;
-    	}
-    	default:
-    		qFatal("Unsupported type");
-    		break;
+            QVERIFY(caxis!=0);
+            qreal min = caxis->min().toDouble();
+            qreal max = caxis->max().toDouble();
+            m_chart->scroll(50, 0);
+            QVERIFY(min<caxis->min().toDouble());
+            QVERIFY(max<caxis->max().toDouble());
+            break;
+        }
+        default:
+            qFatal("Unsupported type");
+            break;
     }
 }
 
 void tst_QChart::scroll_left_data()
 {
-	scroll_right_data();
+    scroll_right_data();
 }
 
 void tst_QChart::scroll_left()
 {
-	 QFETCH(QAbstractSeries *, series);
-	 m_chart->addSeries(series);
-	 m_chart->createDefaultAxes();
-	 m_view->show();
-	 QTest::qWaitForWindowShown(m_view);
-	 QAbstractAxis * axis = m_chart->axisX();
-	 QVERIFY(axis!=0);
+     QFETCH(QAbstractSeries *, series);
+     m_chart->addSeries(series);
+     m_chart->createDefaultAxes();
+     m_view->show();
+     QTest::qWaitForWindowShown(m_view);
+     QAbstractAxis * axis = m_chart->axisX();
+     QVERIFY(axis!=0);
 
-	 switch(axis->type())
-	    {
+     switch(axis->type())
+        {
             case QAbstractAxis::AxisTypeValue:{
                 QValueAxis* vaxis = qobject_cast<QValueAxis*>(axis);
-	    		QVERIFY(vaxis!=0);
-	    		qreal min = vaxis->min();
-	    		qreal max = vaxis->max();
-	    		m_chart->scroll(-50, 0);
-	    		QVERIFY(min>vaxis->min());
-	    		QVERIFY(max>vaxis->max());
-	    		break;
-	    	}
+                QVERIFY(vaxis!=0);
+                qreal min = vaxis->min();
+                qreal max = vaxis->max();
+                m_chart->scroll(-50, 0);
+                QVERIFY(min>vaxis->min());
+                QVERIFY(max>vaxis->max());
+                break;
+            }
             case QAbstractAxis::AxisTypeBarCategory:{
                 QBarCategoryAxis* caxis = qobject_cast<QBarCategoryAxis*>(axis);
-	    	   	QVERIFY(caxis!=0);
-	    	   	qreal min = caxis->min().toDouble();
-	    	   	qreal max = caxis->max().toDouble();
-	    	   	m_chart->scroll(-50, 0);
-	    	   	QVERIFY(min>caxis->min().toDouble());
-	    	   	QVERIFY(max>caxis->max().toDouble());
-	    		break;
-	    	}
-	    	default:
-	    		qFatal("Unsupported type");
-	    		break;
-	    }
+                QVERIFY(caxis!=0);
+                qreal min = caxis->min().toDouble();
+                qreal max = caxis->max().toDouble();
+                m_chart->scroll(-50, 0);
+                QVERIFY(min>caxis->min().toDouble());
+                QVERIFY(max>caxis->max().toDouble());
+                break;
+            }
+            default:
+                qFatal("Unsupported type");
+                break;
+        }
 }
 
 void tst_QChart::scroll_up_data()
 {
-	scroll_right_data();
+    scroll_right_data();
 }
 
 void tst_QChart::scroll_up()
@@ -577,71 +578,71 @@ void tst_QChart::scroll_up()
     {
         case QAbstractAxis::AxisTypeValue:{
             QValueAxis* vaxis = qobject_cast<QValueAxis*>(axis);
-    		QVERIFY(vaxis!=0);
-    		qreal min = vaxis->min();
-    		qreal max = vaxis->max();
-    		m_chart->scroll(0, 50);
-    		QVERIFY(min<vaxis->min());
-    		QVERIFY(max<vaxis->max());
-    		break;
-    	}
+            QVERIFY(vaxis!=0);
+            qreal min = vaxis->min();
+            qreal max = vaxis->max();
+            m_chart->scroll(0, 50);
+            QVERIFY(min<vaxis->min());
+            QVERIFY(max<vaxis->max());
+            break;
+        }
         case QAbstractAxis::AxisTypeBarCategory:{
             QBarCategoryAxis* caxis = qobject_cast<QBarCategoryAxis*>(axis);
-    	   	QVERIFY(caxis!=0);
-    	   	qreal min = caxis->min().toDouble();
-    	   	qreal max = caxis->max().toDouble();
-    	   	m_chart->scroll(0, 50);
-    	   	QVERIFY(min<caxis->min().toDouble());
-    	   	QVERIFY(max<caxis->max().toDouble());
-    		break;
-    	}
-    	default:
-    		qFatal("Unsupported type");
-    		break;
+            QVERIFY(caxis!=0);
+            qreal min = caxis->min().toDouble();
+            qreal max = caxis->max().toDouble();
+            m_chart->scroll(0, 50);
+            QVERIFY(min<caxis->min().toDouble());
+            QVERIFY(max<caxis->max().toDouble());
+            break;
+        }
+        default:
+            qFatal("Unsupported type");
+            break;
     }
 }
 
 void tst_QChart::scroll_down_data()
 {
-	scroll_right_data();
+    scroll_right_data();
 }
 
 void tst_QChart::scroll_down()
 {
-	 QFETCH(QAbstractSeries *, series);
-	 m_chart->addSeries(series);
-	 m_chart->createDefaultAxes();
-	 m_view->show();
-	 QTest::qWaitForWindowShown(m_view);
-	 QAbstractAxis * axis = m_chart->axisY();
-	 QVERIFY(axis!=0);
+     QFETCH(QAbstractSeries *, series);
+     m_chart->addSeries(series);
+     m_chart->createDefaultAxes();
+     m_view->show();
+     QTest::qWaitForWindowShown(m_view);
+     QAbstractAxis * axis = m_chart->axisY();
+     QVERIFY(axis!=0);
 
-	 switch(axis->type())
-	    {
+     switch(axis->type())
+        {
             case QAbstractAxis::AxisTypeValue:{
                 QValueAxis* vaxis = qobject_cast<QValueAxis*>(axis);
-	    		QVERIFY(vaxis!=0);
-	    		qreal min = vaxis->min();
-	    		qreal max = vaxis->max();
-	    		m_chart->scroll(0, -50);
-	    		QVERIFY(min>vaxis->min());
-	    		QVERIFY(max>vaxis->max());
-	    		break;
-	    	}
+                QVERIFY(vaxis!=0);
+                qreal min = vaxis->min();
+                qreal max = vaxis->max();
+                m_chart->scroll(0, -50);
+                QVERIFY(min>vaxis->min());
+                QVERIFY(max>vaxis->max());
+                break;
+            }
             case QAbstractAxis::AxisTypeBarCategory:{
                 QBarCategoryAxis* caxis = qobject_cast<QBarCategoryAxis*>(axis);
-	    	   	QVERIFY(caxis!=0);
-	    	   	qreal min = caxis->min().toDouble();
-	    	   	qreal max = caxis->max().toDouble();
-	    	   	m_chart->scroll(0, -50);
-	    	   	QVERIFY(min>caxis->min().toDouble());
-	    	   	QVERIFY(max>caxis->max().toDouble());
-	    		break;
-	    	}
-	    	default:
-	    		qFatal("Unsupported type");
-	    		break;
-	    }
+                QVERIFY(caxis!=0);
+                qreal min = caxis->min().toDouble();
+                qreal max = caxis->max().toDouble();
+                m_chart->scroll(0, -50);
+                QVERIFY(min>caxis->min().toDouble());
+                QVERIFY(max>caxis->max().toDouble());
+                break;
+            }
+            default:
+                qFatal("Unsupported type");
+                break;
+        }
 }
 
 void tst_QChart::theme_data()