From ded7536c90023fdf5f643a180ced405643ba7ab5 Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Tue, 2 Apr 2019 11:42:23 +0200 Subject: Remove our last uses of Q_DECL_OVERRIDE and Q_NULLPTR MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I8806a3fb466006f14cf92f17510cdea8b50e8345 Reviewed-by: Jüri Valdmann --- tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp') diff --git a/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp b/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp index 3792b5522..f73469d83 100644 --- a/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp +++ b/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp @@ -1550,7 +1550,7 @@ public: JavaScriptCallback() { } JavaScriptCallback(const QVariant& _expected) : expected(_expected) { } - void check(const QVariant& result) Q_DECL_OVERRIDE + void check(const QVariant& result) override { QVERIFY(result.isValid()); QCOMPARE(result, expected); @@ -1563,7 +1563,7 @@ private: class JavaScriptCallbackNull : public JavaScriptCallbackBase { public: - void check(const QVariant& result) Q_DECL_OVERRIDE + void check(const QVariant& result) override { QVERIFY(result.isNull()); // FIXME: Returned null values are currently invalid QVariants. @@ -1574,7 +1574,7 @@ public: class JavaScriptCallbackUndefined : public JavaScriptCallbackBase { public: - void check(const QVariant& result) Q_DECL_OVERRIDE + void check(const QVariant& result) override { QVERIFY(result.isNull()); QVERIFY(!result.isValid()); -- cgit v1.2.3