diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-04-02 11:42:23 +0200 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-04-03 08:27:50 +0000 |
commit | ded7536c90023fdf5f643a180ced405643ba7ab5 (patch) | |
tree | 9f854dc596a583bf8ae11818109bf6784314083f /tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp | |
parent | 0828a05dfbc3babb8719b984145027f677ce9686 (diff) |
Remove our last uses of Q_DECL_OVERRIDE and Q_NULLPTR
Change-Id: I8806a3fb466006f14cf92f17510cdea8b50e8345
Reviewed-by: Jüri Valdmann <juri.valdmann@qt.io>
Diffstat (limited to 'tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp')
-rw-r--r-- | tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
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()); |