diff options
| author | Friedemann Kleint <Friedemann.Kleint@digia.com> | 2014-07-25 13:19:03 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@digia.com> | 2014-07-29 08:39:33 +0200 |
| commit | c67f7c0f0fc34887a4922a269815c460cbe3ccf8 (patch) | |
| tree | ca04418b4cc59548dfeb8133af948c5e583afc57 /src/plugins/platforms/windows/qwindowsfontdatabase_ft.h | |
| parent | 87242756d44b6c1b697290b583484550694a9695 (diff) | |
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 <oliver.wolff@digia.com>
Diffstat (limited to 'src/plugins/platforms/windows/qwindowsfontdatabase_ft.h')
| -rw-r--r-- | src/plugins/platforms/windows/qwindowsfontdatabase_ft.h | 4 |
1 files changed, 2 insertions, 2 deletions
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()); |