diff options
| author | Yuhang Zhao <2546789017@qq.com> | 2021-12-28 14:22:16 +0800 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2022-01-07 04:25:18 +0000 |
| commit | ad81d85d4c11e0537cb30d697a3efe0e8f3f1fd2 (patch) | |
| tree | 2627d713722eb7cfbe56569c62a310721572d146 /src/gui/text | |
| parent | 67fd5901748fb1d92abde1f9a3fd2a9531109efb (diff) | |
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
Change-Id: Iab5c7d00e22d306be63d7588ea44bf73d377793d
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
(cherry picked from commit 44cd0c6c5fd1c025f4aae1247223277c48d031ae)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'src/gui/text')
| -rw-r--r-- | src/gui/text/windows/qwindowsfontdatabase.cpp | 5 | ||||
| -rw-r--r-- | src/gui/text/windows/qwindowsfontdatabasebase.cpp | 1 |
2 files changed, 0 insertions, 6 deletions
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 <QtCore/QFile> #include <QtCore/QtEndian> #include <QtCore/private/qduplicatetracker_p.h> -#include <QtCore/private/qsystemlibrary_p.h> #include <QtCore/private/qwinregistry_p.h> #include <wchar.h> @@ -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 <QtCore/private/qsystemlibrary_p.h> #include <QtCore/QThreadStorage> #include <QtCore/QtEndian> |