From 44cd0c6c5fd1c025f4aae1247223277c48d031ae Mon Sep 17 00:00:00 2001 From: Yuhang Zhao <2546789017@qq.com> Date: Tue, 28 Dec 2021 14:22:16 +0800 Subject: QFontDatabase: remove outdated comments QtBase/2526df506bda99f9497e83a4e6820557a722660e has resolved what the comment said. As a drive-by, remove the unused QSystemLibrary include, which is forgotten in 2526df506bda99f9497e83a4e6820557a722660e. Amends commit 2526df506bda99f9497e83a4e6820557a722660e Pick-to: 6.3 Change-Id: Iab5c7d00e22d306be63d7588ea44bf73d377793d Reviewed-by: Volker Hilsheimer --- src/gui/text/windows/qwindowsfontdatabase.cpp | 5 ----- src/gui/text/windows/qwindowsfontdatabasebase.cpp | 1 - 2 files changed, 6 deletions(-) (limited to 'src/gui') diff --git a/src/gui/text/windows/qwindowsfontdatabase.cpp b/src/gui/text/windows/qwindowsfontdatabase.cpp index c89039ac58..f11c0920a7 100644 --- a/src/gui/text/windows/qwindowsfontdatabase.cpp +++ b/src/gui/text/windows/qwindowsfontdatabase.cpp @@ -52,7 +52,6 @@ #include #include #include -#include #include #include @@ -69,10 +68,6 @@ QT_BEGIN_NAMESPACE #if QT_CONFIG(directwrite) -// ### fixme: Consider direct linking of dwrite.dll once Windows Vista pre SP2 is dropped (QTBUG-49711) - -typedef HRESULT (WINAPI *DWriteCreateFactoryType)(DWRITE_FACTORY_TYPE, const IID &, IUnknown **); - static inline bool useDirectWrite(QFont::HintingPreference hintingPreference, const QString &familyName = QString(), bool isColorFont = false) diff --git a/src/gui/text/windows/qwindowsfontdatabasebase.cpp b/src/gui/text/windows/qwindowsfontdatabasebase.cpp index 47ef300cfa..4ee2c42b8a 100644 --- a/src/gui/text/windows/qwindowsfontdatabasebase.cpp +++ b/src/gui/text/windows/qwindowsfontdatabasebase.cpp @@ -40,7 +40,6 @@ #include "qwindowsfontdatabasebase_p.h" #include "qwindowsfontdatabase_p.h" -#include #include #include -- cgit v1.2.3