diff options
| author | Joerg Bornemann <joerg.bornemann@digia.com> | 2014-10-22 12:12:26 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2014-10-28 14:04:50 +0100 |
| commit | b0098056e565d936b0ce1072ea981bc416751701 (patch) | |
| tree | 83d87bf0b24e04dbd3c4f181793675aaf9027142 | |
| parent | 4d5f9df8abe77a8ec1a813b7527c60a422e61946 (diff) | |
fix namespaced DirectWrite build
Change-Id: Iec6d6ca121b2b04fc1eb4a97f1387ee630e6e1f5
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
| -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 a2324544d2..852ab1f8cf 100644 --- a/src/plugins/platforms/windows/qwindowsfontdatabase.h +++ b/src/plugins/platforms/windows/qwindowsfontdatabase.h @@ -46,13 +46,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 2da014ddc3..f033eb635a 100644 --- a/src/plugins/platforms/windows/qwindowsfontenginedirectwrite.h +++ b/src/plugins/platforms/windows/qwindowsfontenginedirectwrite.h @@ -49,16 +49,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: |