1 files changed, 4 insertions, 3 deletions
diff --git a/src/plugins/platforms/windows/qwindowsfontdatabase.cpp b/src/plugins/platforms/windows/qwindowsfontdatabase.cpp
index 8a2fbe1f6d..8d1bbc75a6 100644
--- a/src/plugins/platforms/windows/qwindowsfontdatabase.cpp
+++ b/src/plugins/platforms/windows/qwindowsfontdatabase.cpp
@@ -44,6 +44,7 @@
 
 #include <QtCore/qmath.h>
 #include <QtCore/QDebug>
+#include <QtCore/QFile>
 #include <QtCore/QtEndian>
 #include <QtCore/QThreadStorage>
 #include <QtCore/private/qsystemlibrary_p.h>
@@ -1062,7 +1063,7 @@ QSharedPointer<QWindowsFontEngineData> sharedFontData()
 {
     FontEngineThreadLocalData *data = fontEngineThreadLocalData();
     if (!data->hasLocalData())
-        data->setLocalData(QSharedPointer<QWindowsFontEngineData>(new QWindowsFontEngineData));
+        data->setLocalData(QSharedPointer<QWindowsFontEngineData>::create());
     return data->localData();
 }
 #else // !QT_NO_THREAD
@@ -1072,7 +1073,7 @@ QWindowsFontEngineDataPtr sharedFontData()
 {
     QWindowsFontEngineDataPtr *data = fontEngineData();
     if (data->isNull())
-        *data = QWindowsFontEngineDataPtr(new QWindowsFontEngineData);
+        *data = QWindowsFontEngineDataPtr::create();
     return *data;
 }
 #endif // QT_NO_THREAD
@@ -1605,7 +1606,7 @@ LOGFONT QWindowsFontDatabase::fontDefToLOGFONT(const QFontDef &request)
     lf.lfPitchAndFamily = DEFAULT_PITCH | hint;
 
     QString fam = request.family;
-    if (fam.size() >= LF_FACESIZE) {
+    if (Q_UNLIKELY(fam.size() >= LF_FACESIZE)) {
         qCritical("%s: Family name '%s' is too long.", __FUNCTION__, qPrintable(fam));
         fam.truncate(LF_FACESIZE - 1);
     }