1 files changed, 7 insertions, 17 deletions
diff --git a/tests/auto/widgets/widgets/qtextedit/tst_qtextedit.cpp b/tests/auto/widgets/widgets/qtextedit/tst_qtextedit.cpp
index 55ef44f4e0..f383d430d6 100644
--- a/tests/auto/widgets/widgets/qtextedit/tst_qtextedit.cpp
+++ b/tests/auto/widgets/widgets/qtextedit/tst_qtextedit.cpp
@@ -2507,7 +2507,7 @@ void tst_QTextEdit::highlightLongLine()
     };
     NumHighlighter nh(edit.document());
     edit.show();
-    QTest::qWaitForWindowActive(edit.windowHandle());
+    QVERIFY(QTest::qWaitForWindowActive(edit.windowHandle()));
     QCoreApplication::processEvents();
     //If there is a quadratic behaviour, this would take forever.
     QVERIFY(true);
@@ -2604,30 +2604,20 @@ namespace {
     class MyPaintEngine : public QPaintEngine
     {
     public:
-        bool begin(QPaintDevice *)
-        {
-            return true;
-        }
+        bool begin(QPaintDevice *) override { return true; }
 
-        bool end()
-        {
-            return true;
-        }
+        bool end() override { return true; }
 
-        void updateState(const QPaintEngineState &)
-        {
-        }
+        void updateState(const QPaintEngineState &) override  { }
 
-        void drawPixmap(const QRectF &, const QPixmap &, const QRectF &)
-        {
-        }
+        void drawPixmap(const QRectF &, const QPixmap &, const QRectF &) override { }
 
-        void drawTextItem(const QPointF &, const QTextItem &textItem) Q_DECL_OVERRIDE
+        void drawTextItem(const QPointF &, const QTextItem &textItem) override
         {
             itemFonts.append(qMakePair(textItem.text(), textItem.font()));
         }
 
-        Type type() const { return User; }
+        Type type() const override { return User; }
 
 
         QList<QPair<QString, QFont> > itemFonts;