diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2014-10-29 09:35:42 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-10-29 10:55:33 +0100 |
| commit | 4b491334cf3739ab9df9278c27ac57cfe9bd655d (patch) | |
| tree | 8e208ecad8ece0a5d8ba7bea1936fbd0bb973c05 /src/plugins/platforms | |
| parent | 7ebc151bcfe71dc837ce9fb2d4c71b7cba7bb7f0 (diff) | |
| parent | 8613b64f535b0ce05adf6f4708ba0826f22a7eb4 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.3' into 5.4" into refs/staging/5.4
Diffstat (limited to 'src/plugins/platforms')
| -rw-r--r-- | src/plugins/platforms/windows/qwindowsfontdatabase.h | 4 | ||||
| -rw-r--r-- | src/plugins/platforms/windows/qwindowsfontenginedirectwrite.h | 14 |
2 files changed, 9 insertions, 9 deletions
diff --git a/src/plugins/platforms/windows/qwindowsfontdatabase.h b/src/plugins/platforms/windows/qwindowsfontdatabase.h index efef6f4ded..4abf2d703e 100644 --- a/src/plugins/platforms/windows/qwindowsfontdatabase.h +++ b/src/plugins/platforms/windows/qwindowsfontdatabase.h @@ -38,13 +38,13 @@ #include <QtCore/QSharedPointer> #include "qtwindows_additional.h" -QT_BEGIN_NAMESPACE - #if !defined(QT_NO_DIRECTWRITE) struct IDWriteFactory; struct IDWriteGdiInterop; #endif +QT_BEGIN_NAMESPACE + class QWindowsFontEngineData { Q_DISABLE_COPY(QWindowsFontEngineData) diff --git a/src/plugins/platforms/windows/qwindowsfontenginedirectwrite.h b/src/plugins/platforms/windows/qwindowsfontenginedirectwrite.h index 76c5790554..2addb90de3 100644 --- a/src/plugins/platforms/windows/qwindowsfontenginedirectwrite.h +++ b/src/plugins/platforms/windows/qwindowsfontenginedirectwrite.h @@ -41,16 +41,16 @@ #include <QtGui/private/qfontengine_p.h> #include <QtCore/QSharedPointer> -class QWindowsFontEngineData; - -struct IDWriteFont ; -struct IDWriteFontFace ; -struct IDWriteFactory ; -struct IDWriteBitmapRenderTarget ; -struct IDWriteGdiInterop ; +struct IDWriteFont; +struct IDWriteFontFace; +struct IDWriteFactory; +struct IDWriteBitmapRenderTarget; +struct IDWriteGdiInterop; QT_BEGIN_NAMESPACE +class QWindowsFontEngineData; + class QWindowsFontEngineDirectWrite : public QFontEngine { public: |