diff options
Diffstat (limited to 'tests/auto/gui/image')
4 files changed, 11 insertions, 10 deletions
diff --git a/tests/auto/gui/image/qicoimageformat/tst_qicoimageformat.cpp b/tests/auto/gui/image/qicoimageformat/tst_qicoimageformat.cpp index fe12175081..1716570046 100644 --- a/tests/auto/gui/image/qicoimageformat/tst_qicoimageformat.cpp +++ b/tests/auto/gui/image/qicoimageformat/tst_qicoimageformat.cpp @@ -115,7 +115,8 @@ public: virtual ~QSequentialFile() {} - virtual bool isSequential() const { + virtual bool isSequential() const override + { return true; } diff --git a/tests/auto/gui/image/qimageiohandler/tst_qimageiohandler.cpp b/tests/auto/gui/image/qimageiohandler/tst_qimageiohandler.cpp index e24ba4fa81..9da4d1a1f1 100644 --- a/tests/auto/gui/image/qimageiohandler/tst_qimageiohandler.cpp +++ b/tests/auto/gui/image/qimageiohandler/tst_qimageiohandler.cpp @@ -50,8 +50,8 @@ class MyImageIOHandler : public QImageIOHandler { public: MyImageIOHandler() : QImageIOHandler() { } - bool canRead() const { return true; } - bool read(QImage *) { return true; } + bool canRead() const override { return true; } + bool read(QImage *) override { return true; } }; tst_QImageIOHandler::tst_QImageIOHandler() diff --git a/tests/auto/gui/image/qpicture/tst_qpicture.cpp b/tests/auto/gui/image/qpicture/tst_qpicture.cpp index 6287960457..c55a96d697 100644 --- a/tests/auto/gui/image/qpicture/tst_qpicture.cpp +++ b/tests/auto/gui/image/qpicture/tst_qpicture.cpp @@ -152,11 +152,11 @@ class PaintEngine : public QPaintEngine { public: PaintEngine() : QPaintEngine() {} - bool begin(QPaintDevice *) { return true; } - bool end() { return true; } - void updateState(const QPaintEngineState &) {} - void drawPixmap(const QRectF &, const QPixmap &, const QRectF &) {} - Type type() const { return Raster; } + bool begin(QPaintDevice *) override { return true; } + bool end() override { return true; } + void updateState(const QPaintEngineState &) override {} + void drawPixmap(const QRectF &, const QPixmap &, const QRectF &) override {} + Type type() const override { return Raster; } QFont font() { return state->font(); } }; @@ -165,7 +165,7 @@ class Picture : public QPicture { public: Picture() : QPicture() {} - QPaintEngine *paintEngine() const { return (QPaintEngine*)&mPaintEngine; } + QPaintEngine *paintEngine() const override { return (QPaintEngine*)&mPaintEngine; } private: PaintEngine mPaintEngine; }; diff --git a/tests/auto/gui/image/qpixmap/tst_qpixmap.cpp b/tests/auto/gui/image/qpixmap/tst_qpixmap.cpp index 24f10e559c..33e8671671 100644 --- a/tests/auto/gui/image/qpixmap/tst_qpixmap.cpp +++ b/tests/auto/gui/image/qpixmap/tst_qpixmap.cpp @@ -1063,7 +1063,7 @@ void tst_QPixmap::onlyNullPixmapsOutsideGuiThread() class Thread : public QThread { public: - void run() + void run() override { QTest::ignoreMessage(QtWarningMsg, "QPixmap: It is not safe to use pixmaps outside the GUI thread"); |