From b0098056e565d936b0ce1072ea981bc416751701 Mon Sep 17 00:00:00 2001
From: Joerg Bornemann <joerg.bornemann@digia.com>
Date: Wed, 22 Oct 2014 12:12:26 +0200
Subject: [PATCH] fix namespaced DirectWrite build
Change-Id: Iec6d6ca121b2b04fc1eb4a97f1387ee630e6e1f5
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
---
.../platforms/windows/qwindowsfontdatabase.h | 4 ++--
.../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 a2324544d23..852ab1f8cf4 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 2da014ddc35..f033eb635ae 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:
--
GitLab