1 files changed, 5 insertions, 3 deletions
diff --git a/src/platformsupport/fontdatabases/windows/qwindowsfontdatabase_p.h b/src/platformsupport/fontdatabases/windows/qwindowsfontdatabase_p.h
index 30f5beefdf..ab6d6307c7 100644
--- a/src/platformsupport/fontdatabases/windows/qwindowsfontdatabase_p.h
+++ b/src/platformsupport/fontdatabases/windows/qwindowsfontdatabase_p.h
@@ -85,6 +85,7 @@ public:
 
 class QWindowsFontDatabase : public QPlatformFontDatabase
 {
+    Q_DISABLE_COPY(QWindowsFontDatabase)
 public:
     enum FontOptions {
         // Relevant bits from QWindowsIntegration::Options
@@ -93,7 +94,7 @@ public:
     };
 
     QWindowsFontDatabase();
-    ~QWindowsFontDatabase();
+    ~QWindowsFontDatabase() override;
 
     void populateFontDatabase() override;
     void populateFamily(const QString &familyName) override;
@@ -168,7 +169,8 @@ inline quint16 qt_getUShort(const unsigned char *p)
     return val;
 }
 
-struct FontNames {
+struct QFontNames
+{
     QString name;   // e.g. "DejaVu Sans Condensed"
     QString style;  // e.g. "Italic"
     QString preferredName;  // e.g. "DejaVu Sans"
@@ -177,7 +179,7 @@ struct FontNames {
 
 bool qt_localizedName(const QString &name);
 QString qt_getEnglishName(const QString &familyName, bool includeStyle = false);
-FontNames qt_getCanonicalFontNames(const LOGFONT &lf);
+QFontNames qt_getCanonicalFontNames(const LOGFONT &lf);
 
 QT_END_NAMESPACE