aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorVolker Hilsheimer <volker.hilsheimer@qt.io>2021-03-17 09:06:59 +0100
committerVolker Hilsheimer <volker.hilsheimer@qt.io>2021-03-17 10:22:01 +0100
commitbf67116a6f69462adad3edd2dd64aa05e00a41bd (patch)
tree967b73d875bef6dc7965d33f9d914c4ad8bfef82 /tests
parent7ba632f3fdab4ca86517c59876d77c1789bc3ba3 (diff)
Fix compiler warnings, add override
Change-Id: I547e94213f4b4d2c3ca3aeaa06330069e6311043 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Diffstat (limited to 'tests')
-rw-r--r--tests/auto/customization/tst_customization.cpp2
-rw-r--r--tests/auto/focus/tst_focus.cpp2
-rw-r--r--tests/auto/palette/tst_palette.cpp2
-rw-r--r--tests/auto/qquickcontrol/tst_qquickcontrol.cpp2
-rw-r--r--tests/auto/qquickdrawer/tst_qquickdrawer.cpp2
-rw-r--r--tests/auto/qquickiconimage/tst_qquickiconimage.cpp4
-rw-r--r--tests/auto/qquickpopup/tst_qquickpopup.cpp2
-rw-r--r--tests/auto/styleimports/tst_styleimports.cpp2
8 files changed, 9 insertions, 9 deletions
diff --git a/tests/auto/customization/tst_customization.cpp b/tests/auto/customization/tst_customization.cpp
index add48cc7..02c75978 100644
--- a/tests/auto/customization/tst_customization.cpp
+++ b/tests/auto/customization/tst_customization.cpp
@@ -113,7 +113,7 @@ class tst_customization : public QQmlDataTest
Q_OBJECT
private slots:
- void initTestCase();
+ void initTestCase() override;
void cleanupTestCase();
void init();
diff --git a/tests/auto/focus/tst_focus.cpp b/tests/auto/focus/tst_focus.cpp
index 06c57efe..92df4665 100644
--- a/tests/auto/focus/tst_focus.cpp
+++ b/tests/auto/focus/tst_focus.cpp
@@ -55,7 +55,7 @@ class tst_focus : public QQmlDataTest
Q_OBJECT
private slots:
- void initTestCase();
+ void initTestCase() override;
void navigation_data();
void navigation();
diff --git a/tests/auto/palette/tst_palette.cpp b/tests/auto/palette/tst_palette.cpp
index b69f03b4..d81625db 100644
--- a/tests/auto/palette/tst_palette.cpp
+++ b/tests/auto/palette/tst_palette.cpp
@@ -63,7 +63,7 @@ class tst_palette : public QQmlDataTest
Q_OBJECT
private slots:
- void initTestCase();
+ void initTestCase() override;
void palette_data();
void palette();
diff --git a/tests/auto/qquickcontrol/tst_qquickcontrol.cpp b/tests/auto/qquickcontrol/tst_qquickcontrol.cpp
index 6acb192f..8b38bf7b 100644
--- a/tests/auto/qquickcontrol/tst_qquickcontrol.cpp
+++ b/tests/auto/qquickcontrol/tst_qquickcontrol.cpp
@@ -49,7 +49,7 @@ class tst_QQuickControl : public QQmlDataTest
Q_OBJECT
private slots:
- void initTestCase();
+ void initTestCase() override;
void flickable();
private:
diff --git a/tests/auto/qquickdrawer/tst_qquickdrawer.cpp b/tests/auto/qquickdrawer/tst_qquickdrawer.cpp
index c96b156c..043ddc5a 100644
--- a/tests/auto/qquickdrawer/tst_qquickdrawer.cpp
+++ b/tests/auto/qquickdrawer/tst_qquickdrawer.cpp
@@ -60,7 +60,7 @@ class tst_QQuickDrawer : public QQmlDataTest
Q_OBJECT
private slots:
- void initTestCase();
+ void initTestCase() override;
void defaults();
void invalidEdge();
diff --git a/tests/auto/qquickiconimage/tst_qquickiconimage.cpp b/tests/auto/qquickiconimage/tst_qquickiconimage.cpp
index 370d2ef4..475981a2 100644
--- a/tests/auto/qquickiconimage/tst_qquickiconimage.cpp
+++ b/tests/auto/qquickiconimage/tst_qquickiconimage.cpp
@@ -53,7 +53,7 @@ public:
tst_qquickiconimage();
private slots:
- void initTestCase();
+ void initTestCase() override;
void defaults();
void nameBindingSourceSize();
void nameBindingSourceSizeWidthHeight();
@@ -496,7 +496,7 @@ class TestImageProvider : public QQuickImageProvider
public:
TestImageProvider() : QQuickImageProvider(QQuickImageProvider::Pixmap) { }
- QPixmap requestPixmap(const QString &id, QSize *size, const QSize &requestedSize)
+ QPixmap requestPixmap(const QString &id, QSize *size, const QSize &requestedSize) override
{
QSize defaultSize(32, 32);
if (size)
diff --git a/tests/auto/qquickpopup/tst_qquickpopup.cpp b/tests/auto/qquickpopup/tst_qquickpopup.cpp
index 442b99fa..a0dc1d88 100644
--- a/tests/auto/qquickpopup/tst_qquickpopup.cpp
+++ b/tests/auto/qquickpopup/tst_qquickpopup.cpp
@@ -62,7 +62,7 @@ class tst_QQuickPopup : public QQmlDataTest
Q_OBJECT
private slots:
- void initTestCase();
+ void initTestCase() override;
void visible_data();
void visible();
void state();
diff --git a/tests/auto/styleimports/tst_styleimports.cpp b/tests/auto/styleimports/tst_styleimports.cpp
index 56275d9e..fe5148ed 100644
--- a/tests/auto/styleimports/tst_styleimports.cpp
+++ b/tests/auto/styleimports/tst_styleimports.cpp
@@ -52,7 +52,7 @@ class tst_StyleImports : public QQmlDataTest
Q_OBJECT
private slots:
- void initTestCase();
+ void initTestCase() override;
void cleanup();