From c67f7c0f0fc34887a4922a269815c460cbe3ccf8 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Fri, 25 Jul 2014 13:19:03 +0200 Subject: Windows/Direct2D platform plugins: Add Q_DECL_OVERRIDE. Replace old virtual declarations by Q_DECL_OVERRIDE where applicable. Errors discovered: QWindowsScreen::primaryOrientation() did not overwrite any method, changed to orientation(). Task-number: QTBUG-38858 Task-number: QTBUG-38993 Change-Id: Ie85d5235f3cd35c7a24cac3c1c7693c6508b1009 Reviewed-by: Oliver Wolff --- src/plugins/platforms/windows/qwindowsfontdatabase_ft.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/plugins/platforms/windows/qwindowsfontdatabase_ft.h') diff --git a/src/plugins/platforms/windows/qwindowsfontdatabase_ft.h b/src/plugins/platforms/windows/qwindowsfontdatabase_ft.h index bad6c54bf4..cf6108d87a 100644 --- a/src/plugins/platforms/windows/qwindowsfontdatabase_ft.h +++ b/src/plugins/platforms/windows/qwindowsfontdatabase_ft.h @@ -57,8 +57,8 @@ public: QStringList fallbacksForFamily(const QString &family, QFont::Style style, QFont::StyleHint styleHint, QChar::Script script) const; - virtual QString fontDir() const; - virtual QFont defaultFont() const; + QString fontDir() const Q_DECL_OVERRIDE; + QFont defaultFont() const Q_DECL_OVERRIDE; private: void populate(const QString &family = QString()); -- cgit v1.2.3