1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix namespaced DirectWrite build

Browse Source 
Change-Id: Iec6d6ca121b2b04fc1eb4a97f1387ee630e6e1f5
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
This commit is contained in:
Joerg Bornemann 2014-10-22 12:12:26 +02:00 committed by Oswald Buddenhagen
parent 4d5f9df8ab
commit b0098056e5
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/platforms/windows/qwindowsfontdatabase.h
View File

@ -46,13 +46,13 @@
#include <QtCore/QSharedPointer> #include <QtCore/QSharedPointer>
#include "qtwindows_additional.h" #include "qtwindows_additional.h"
QT_BEGIN_NAMESPACE
#if !defined(QT_NO_DIRECTWRITE) #if !defined(QT_NO_DIRECTWRITE)
struct IDWriteFactory; struct IDWriteFactory;
struct IDWriteGdiInterop; struct IDWriteGdiInterop;
#endif #endif
QT_BEGIN_NAMESPACE
class QWindowsFontEngineData class QWindowsFontEngineData
{ {
Q_DISABLE_COPY(QWindowsFontEngineData) Q_DISABLE_COPY(QWindowsFontEngineData)

14
src/plugins/platforms/windows/qwindowsfontenginedirectwrite.h
View File

@ -49,16 +49,16 @@
#include <QtGui/private/qfontengine_p.h> #include <QtGui/private/qfontengine_p.h>
#include <QtCore/QSharedPointer> #include <QtCore/QSharedPointer>
class QWindowsFontEngineData; struct IDWriteFont;
struct IDWriteFontFace;
struct IDWriteFont ; struct IDWriteFactory;
struct IDWriteFontFace ; struct IDWriteBitmapRenderTarget;
struct IDWriteFactory ; struct IDWriteGdiInterop;
struct IDWriteBitmapRenderTarget ;
struct IDWriteGdiInterop ;
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
class QWindowsFontEngineData;
class QWindowsFontEngineDirectWrite : public QFontEngine class QWindowsFontEngineDirectWrite : public QFontEngine
{ {
public: public: