Remove platform specific DirectWrite font engine from QtGui

This has moved into the platform plugin, but it was still lying
around in QtGui and hindering it from compiling.

Change-Id: I47fa730453cbd8aa230ccc4651afd2e774023db6
Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com>

4 files changed, 0 insertions, 843 deletions

diff --git a/src/gui/gui.pro b/src/gui/gui.pro
index 3512e7bc79..bdd70012a7 100644
--- a/src/gui/gui.pro
+++ b/src/gui/gui.pro
@@ -32,10 +32,6 @@ include(itemmodels/itemmodels.pri)
 
 QMAKE_LIBS += $$QMAKE_LIBS_GUI
 
-win32:!contains(QT_CONFIG, directwrite) {
-    DEFINES += QT_NO_DIRECTWRITE
-}
-
 *-g++*|linux-icc*|*-clang*|*-qcc* {
         sse2 {
             sse2_compiler.commands = $$QMAKE_CXX -c $(CXXFLAGS)
diff --git a/src/gui/text/qfontenginedirectwrite.cpp b/src/gui/text/qfontenginedirectwrite.cpp
deleted file mode 100644
index 0608368e0f..0000000000
--- a/src/gui/text/qfontenginedirectwrite.cpp
+++ /dev/null
@@ -1,698 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
-**
-** This file is part of the QtGui module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** GNU Lesser General Public License Usage
-** This file may be used under the terms of the GNU Lesser General Public
-** License version 2.1 as published by the Free Software Foundation and
-** appearing in the file LICENSE.LGPL included in the packaging of this
-** file. Please review the following information to ensure the GNU Lesser
-** General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QT_NO_DIRECTWRITE
-
-#include "qfontenginedirectwrite_p.h"
-
-#include <qendian.h>
-#include <dwrite.h>
-#include <private/qnativeimage_p.h>
-
-#include <d2d1.h>
-
-QT_BEGIN_NAMESPACE
-
-// Convert from design units to logical pixels
-#define DESIGN_TO_LOGICAL(DESIGN_UNIT_VALUE) \
-    QFixed::fromReal((qreal(DESIGN_UNIT_VALUE) / qreal(m_unitsPerEm)) * fontDef.pixelSize)
-
-namespace {
-
-    class GeometrySink: public IDWriteGeometrySink
-    {
-    public:
-        GeometrySink(QPainterPath *path) : m_path(path), m_refCount(0)
-        {
-            Q_ASSERT(m_path != 0);
-        }
-
-        IFACEMETHOD_(void, AddBeziers)(const D2D1_BEZIER_SEGMENT *beziers, UINT bezierCount);
-        IFACEMETHOD_(void, AddLines)(const D2D1_POINT_2F *points, UINT pointCount);
-        IFACEMETHOD_(void, BeginFigure)(D2D1_POINT_2F startPoint, D2D1_FIGURE_BEGIN figureBegin);
-        IFACEMETHOD(Close)();
-        IFACEMETHOD_(void, EndFigure)(D2D1_FIGURE_END figureEnd);
-        IFACEMETHOD_(void, SetFillMode)(D2D1_FILL_MODE fillMode);
-        IFACEMETHOD_(void, SetSegmentFlags)(D2D1_PATH_SEGMENT vertexFlags);
-
-        IFACEMETHOD_(unsigned long, AddRef)();
-        IFACEMETHOD_(unsigned long, Release)();
-        IFACEMETHOD(QueryInterface)(IID const &riid, void **ppvObject);
-
-    private:
-        inline static QPointF fromD2D1_POINT_2F(const D2D1_POINT_2F &inp)
-        {
-            return QPointF(inp.x, inp.y);
-        }
-
-        unsigned long m_refCount;
-        QPointF m_startPoint;
-        QPainterPath *m_path;
-    };
-
-    void GeometrySink::AddBeziers(const D2D1_BEZIER_SEGMENT *beziers,
-                                  UINT bezierCount)
-    {
-        for (uint i=0; i<bezierCount; ++i) {
-            QPointF c1 = fromD2D1_POINT_2F(beziers[i].point1);
-            QPointF c2 = fromD2D1_POINT_2F(beziers[i].point2);
-            QPointF p2 = fromD2D1_POINT_2F(beziers[i].point3);
-
-            m_path->cubicTo(c1, c2, p2);
-        }
-    }
-
-    void GeometrySink::AddLines(const D2D1_POINT_2F *points, UINT pointsCount)
-    {
-        for (uint i=0; i<pointsCount; ++i)
-            m_path->lineTo(fromD2D1_POINT_2F(points[i]));
-    }
-
-    void GeometrySink::BeginFigure(D2D1_POINT_2F startPoint,
-                                   D2D1_FIGURE_BEGIN /*figureBegin*/)
-    {
-        m_startPoint = fromD2D1_POINT_2F(startPoint);
-        m_path->moveTo(m_startPoint);
-    }
-
-    IFACEMETHODIMP GeometrySink::Close()
-    {
-        return E_NOTIMPL;
-    }
-
-    void GeometrySink::EndFigure(D2D1_FIGURE_END figureEnd)
-    {
-        if (figureEnd == D2D1_FIGURE_END_CLOSED)
-            m_path->closeSubpath();
-    }
-
-    void GeometrySink::SetFillMode(D2D1_FILL_MODE fillMode)
-    {
-        m_path->setFillRule(fillMode == D2D1_FILL_MODE_ALTERNATE
-                            ? Qt::OddEvenFill
-                            : Qt::WindingFill);
-    }
-
-    void GeometrySink::SetSegmentFlags(D2D1_PATH_SEGMENT /*vertexFlags*/)
-    {
-        /* Not implemented */
-    }
-
-    IFACEMETHODIMP_(unsigned long) GeometrySink::AddRef()
-    {
-        return InterlockedIncrement(&m_refCount);
-    }
-
-    IFACEMETHODIMP_(unsigned long) GeometrySink::Release()
-    {
-        unsigned long newCount = InterlockedDecrement(&m_refCount);
-        if (newCount == 0)
-        {
-            delete this;
-            return 0;
-        }
-
-        return newCount;
-    }
-
-    IFACEMETHODIMP GeometrySink::QueryInterface(IID const &riid, void **ppvObject)
-    {
-        if (__uuidof(IDWriteGeometrySink) == riid) {
-            *ppvObject = this;
-        } else if (__uuidof(IUnknown) == riid) {
-            *ppvObject = this;
-        } else {
-            *ppvObject = NULL;
-            return E_FAIL;
-        }
-
-        AddRef();
-        return S_OK;
-    }
-
-}
-
-QFontEngineDirectWrite::QFontEngineDirectWrite(IDWriteFactory *directWriteFactory,
-                                               IDWriteFontFace *directWriteFontFace,
-                                               qreal pixelSize)
-    : m_directWriteFontFace(directWriteFontFace)
-    , m_directWriteFactory(directWriteFactory)
-    , m_directWriteBitmapRenderTarget(0)
-    , m_lineThickness(-1)
-    , m_unitsPerEm(-1)
-    , m_ascent(-1)
-    , m_descent(-1)
-    , m_xHeight(-1)
-    , m_lineGap(-1)
-{
-    m_directWriteFactory->AddRef();
-    m_directWriteFontFace->AddRef();
-
-    fontDef.pixelSize = pixelSize;
-    collectMetrics();
-}
-
-QFontEngineDirectWrite::~QFontEngineDirectWrite()
-{
-    m_directWriteFactory->Release();
-    m_directWriteFontFace->Release();
-
-    if (m_directWriteBitmapRenderTarget != 0)
-        m_directWriteBitmapRenderTarget->Release();
-}
-
-void QFontEngineDirectWrite::collectMetrics()
-{
-    if (m_directWriteFontFace != 0) {
-        DWRITE_FONT_METRICS metrics;
-
-        m_directWriteFontFace->GetMetrics(&metrics);
-        m_unitsPerEm = metrics.designUnitsPerEm;
-
-        m_lineThickness = DESIGN_TO_LOGICAL(metrics.underlineThickness);
-        m_ascent = DESIGN_TO_LOGICAL(metrics.ascent);
-        m_descent = DESIGN_TO_LOGICAL(metrics.descent);
-        m_xHeight = DESIGN_TO_LOGICAL(metrics.xHeight);
-        m_lineGap = DESIGN_TO_LOGICAL(metrics.lineGap);
-    }
-}
-
-QFixed QFontEngineDirectWrite::lineThickness() const
-{
-    if (m_lineThickness > 0)
-        return m_lineThickness;
-    else
-        return QFontEngine::lineThickness();
-}
-
-bool QFontEngineDirectWrite::getSfntTableData(uint tag, uchar *buffer, uint *length) const
-{
-    bool ret = false;
-
-    if (m_directWriteFontFace) {
-        DWORD t = qbswap<quint32>(tag);
-
-        const void *tableData = 0;
-        void *tableContext = 0;
-        UINT32 tableSize;
-        BOOL exists;
-        HRESULT hr = m_directWriteFontFace->TryGetFontTable(
-                    t, &tableData, &tableSize, &tableContext, &exists
-                    );
-
-        if (SUCCEEDED(hr)) {
-            if (exists) {
-                if (!buffer) {
-                    *length = tableSize;
-                    ret = true;
-                } else if (*length >= tableSize) {
-                    memcpy(buffer, tableData, tableSize);
-                    ret = true;
-                }
-            }
-            m_directWriteFontFace->ReleaseFontTable(tableContext);
-        } else {
-            qErrnoWarning("QFontEngineDirectWrite::getSfntTableData: TryGetFontTable failed");
-        }
-    }
-
-    return ret;
-}
-
-QFixed QFontEngineDirectWrite::emSquareSize() const
-{
-    if (m_unitsPerEm > 0)
-        return m_unitsPerEm;
-    else
-        return QFontEngine::emSquareSize();
-}
-
-inline unsigned int getChar(const QChar *str, int &i, const int len)
-{
-    uint ucs4 = str[i].unicode();
-    if (str[i].isHighSurrogate() && i < len-1 && str[i+1].isLowSurrogate()) {
-        ++i;
-        ucs4 = QChar::surrogateToUcs4( ucs4, str[i].unicode());
-    }
-    return ucs4;
-}
-
-bool QFontEngineDirectWrite::stringToCMap(const QChar *str, int len, QGlyphLayout *glyphs,
-                                          int *nglyphs, QTextEngine::ShaperFlags flags) const
-{
-    if (m_directWriteFontFace != 0) {
-        QVarLengthArray<UINT32> codePoints(len);
-        for (int i=0; i<len; ++i) {
-            codePoints[i] = getChar(str, i, len);
-            if (flags & QTextEngine::RightToLeft)
-                codePoints[i] = QChar::mirroredChar(codePoints[i]);
-        }
-
-        QVarLengthArray<UINT16> glyphIndices(len);
-        HRESULT hr = m_directWriteFontFace->GetGlyphIndicesW(codePoints.data(),
-                                                             len,
-                                                             glyphIndices.data());
-
-        if (SUCCEEDED(hr)) {
-            for (int i=0; i<len; ++i)
-                glyphs->glyphs[i] = glyphIndices[i];
-
-            *nglyphs = len;
-
-            if (!(flags & QTextEngine::GlyphIndicesOnly))
-                recalcAdvances(glyphs, 0);
-
-            return true;
-        } else {
-            qErrnoWarning("QFontEngineDirectWrite::stringToCMap: GetGlyphIndicesW failed");
-        }
-    }
-
-    return false;
-}
-
-void QFontEngineDirectWrite::recalcAdvances(QGlyphLayout *glyphs, QTextEngine::ShaperFlags) const
-{
-    if (m_directWriteFontFace == 0)
-        return;
-
-    QVarLengthArray<UINT16> glyphIndices(glyphs->numGlyphs);
-
-    // ### Caching?
-    for(int i=0; i<glyphs->numGlyphs; i++)
-        glyphIndices[i] = UINT16(glyphs->glyphs[i]);
-
-    QVarLengthArray<DWRITE_GLYPH_METRICS> glyphMetrics(glyphIndices.size());
-    HRESULT hr = m_directWriteFontFace->GetDesignGlyphMetrics(glyphIndices.data(),
-                                                              glyphIndices.size(),
-                                                              glyphMetrics.data());
-    if (SUCCEEDED(hr)) {
-        for (int i=0; i<glyphs->numGlyphs; ++i) {
-            glyphs->advances_x[i] = DESIGN_TO_LOGICAL(glyphMetrics[i].advanceWidth);
-            if (fontDef.styleStrategy & QFont::ForceIntegerMetrics)
-                glyphs->advances_x[i] = glyphs->advances_x[i].round();
-            glyphs->advances_y[i] = 0;
-        }
-    } else {
-        qErrnoWarning("QFontEngineDirectWrite::recalcAdvances: GetDesignGlyphMetrics failed");
-    }
-}
-
-void QFontEngineDirectWrite::addGlyphsToPath(glyph_t *glyphs, QFixedPoint *positions, int nglyphs,
-                                             QPainterPath *path, QTextItem::RenderFlags flags)
-{
-    if (m_directWriteFontFace == 0)
-        return;
-
-    QVarLengthArray<UINT16> glyphIndices(nglyphs);
-    QVarLengthArray<DWRITE_GLYPH_OFFSET> glyphOffsets(nglyphs);
-    QVarLengthArray<FLOAT> glyphAdvances(nglyphs);
-
-    for (int i=0; i<nglyphs; ++i) {
-        glyphIndices[i] = glyphs[i];
-        glyphOffsets[i].advanceOffset  = positions[i].x.toReal();
-        glyphOffsets[i].ascenderOffset = -positions[i].y.toReal();
-        glyphAdvances[i] = 0.0;
-    }
-
-    GeometrySink geometrySink(path);
-    HRESULT hr = m_directWriteFontFace->GetGlyphRunOutline(
-                fontDef.pixelSize,
-                glyphIndices.data(),
-                glyphAdvances.data(),
-                glyphOffsets.data(),
-                nglyphs,
-                false,
-                flags & QTextItem::RightToLeft,
-                &geometrySink
-                );
-
-    if (FAILED(hr))
-        qErrnoWarning("QFontEngineDirectWrite::addGlyphsToPath: GetGlyphRunOutline failed");
-}
-
-glyph_metrics_t QFontEngineDirectWrite::boundingBox(const QGlyphLayout &glyphs)
-{
-    if (glyphs.numGlyphs == 0)
-        return glyph_metrics_t();
-
-    bool round = fontDef.styleStrategy & QFont::ForceIntegerMetrics;
-
-    QFixed w = 0;
-    for (int i = 0; i < glyphs.numGlyphs; ++i) {
-        w += round ? glyphs.effectiveAdvance(i).round() : glyphs.effectiveAdvance(i);
-
-    }
-
-    return glyph_metrics_t(0, -m_ascent, w - lastRightBearing(glyphs), m_ascent + m_descent, w, 0);
-}
-
-glyph_metrics_t QFontEngineDirectWrite::alphaMapBoundingBox(glyph_t glyph, QFixed subPixelPosition,
-                                                            const QTransform &matrix,
-                                                            GlyphFormat /*format*/)
-{
-    glyph_metrics_t bbox = QFontEngine::boundingBox(glyph, matrix); // To get transformed advance
-
-    UINT16 glyphIndex = glyph;
-    FLOAT glyphAdvance = 0;
-
-    DWRITE_GLYPH_OFFSET glyphOffset;
-    glyphOffset.advanceOffset = 0;
-    glyphOffset.ascenderOffset = 0;
-
-    DWRITE_GLYPH_RUN glyphRun;
-    glyphRun.fontFace = m_directWriteFontFace;
-    glyphRun.fontEmSize = fontDef.pixelSize;
-    glyphRun.glyphCount = 1;
-    glyphRun.glyphIndices = &glyphIndex;
-    glyphRun.glyphAdvances = &glyphAdvance;
-    glyphRun.isSideways = false;
-    glyphRun.bidiLevel = 0;
-    glyphRun.glyphOffsets = &glyphOffset;
-
-    DWRITE_MATRIX transform;
-    transform.dx = subPixelPosition.toReal();
-    transform.dy = 0;
-    transform.m11 = matrix.m11();
-    transform.m12 = matrix.m12();
-    transform.m21 = matrix.m21();
-    transform.m22 = matrix.m22();
-
-    IDWriteGlyphRunAnalysis *glyphAnalysis = NULL;
-    HRESULT hr = m_directWriteFactory->CreateGlyphRunAnalysis(
-                &glyphRun,
-                1.0f,
-                &transform,
-                DWRITE_RENDERING_MODE_CLEARTYPE_NATURAL_SYMMETRIC,
-                DWRITE_MEASURING_MODE_NATURAL,
-                0.0, 0.0,
-                &glyphAnalysis
-                );
-
-    if (SUCCEEDED(hr)) {
-        RECT rect;
-        glyphAnalysis->GetAlphaTextureBounds(DWRITE_TEXTURE_CLEARTYPE_3x1, &rect);
-        glyphAnalysis->Release();
-
-        return glyph_metrics_t(rect.left, rect.top, rect.right - rect.left, rect.bottom - rect.top,
-                               bbox.xoff, bbox.yoff);
-    } else {
-        return glyph_metrics_t();
-    }
-}
-
-glyph_metrics_t QFontEngineDirectWrite::boundingBox(glyph_t g)
-{
-    if (m_directWriteFontFace == 0)
-        return glyph_metrics_t();
-
-    UINT16 glyphIndex = g;
-
-    DWRITE_GLYPH_METRICS glyphMetrics;
-    HRESULT hr = m_directWriteFontFace->GetDesignGlyphMetrics(&glyphIndex, 1, &glyphMetrics);
-    if (SUCCEEDED(hr)) {
-        QFixed advanceWidth = DESIGN_TO_LOGICAL(glyphMetrics.advanceWidth);
-        QFixed leftSideBearing = DESIGN_TO_LOGICAL(glyphMetrics.leftSideBearing);
-        QFixed rightSideBearing = DESIGN_TO_LOGICAL(glyphMetrics.rightSideBearing);
-        QFixed advanceHeight = DESIGN_TO_LOGICAL(glyphMetrics.advanceHeight);
-        QFixed verticalOriginY = DESIGN_TO_LOGICAL(glyphMetrics.verticalOriginY);
-
-        if (fontDef.styleStrategy & QFont::ForceIntegerMetrics) {
-            advanceWidth = advanceWidth.round();
-            advanceHeight = advanceHeight.round();
-        }
-
-        QFixed width = advanceWidth - leftSideBearing - rightSideBearing;
-
-        return glyph_metrics_t(-leftSideBearing, -verticalOriginY,
-                               width, m_ascent + m_descent,
-                               advanceWidth, advanceHeight);
-    } else {
-        qErrnoWarning("QFontEngineDirectWrite::boundingBox: GetDesignGlyphMetrics failed");
-    }
-
-    return glyph_metrics_t();
-}
-
-QFixed QFontEngineDirectWrite::ascent() const
-{
-    return fontDef.styleStrategy & QFont::ForceIntegerMetrics
-            ? m_ascent.round()
-            : m_ascent;
-}
-
-QFixed QFontEngineDirectWrite::descent() const
-{
-    return fontDef.styleStrategy & QFont::ForceIntegerMetrics
-           ? (m_descent).round()
-           : (m_descent);
-}
-
-QFixed QFontEngineDirectWrite::leading() const
-{
-    return fontDef.styleStrategy & QFont::ForceIntegerMetrics
-           ? m_lineGap.round()
-           : m_lineGap;
-}
-
-QFixed QFontEngineDirectWrite::xHeight() const
-{
-    return fontDef.styleStrategy & QFont::ForceIntegerMetrics
-           ? m_xHeight.round()
-           : m_xHeight;
-}
-
-qreal QFontEngineDirectWrite::maxCharWidth() const
-{
-    // ###
-    return 0;
-}
-
-extern const uint *qt_pow_gamma();
-
-QImage QFontEngineDirectWrite::alphaMapForGlyph(glyph_t glyph, QFixed subPixelPosition,
-                                                const QTransform &xform)
-{
-    QImage im = imageForGlyph(glyph, subPixelPosition, 0, xform);
-
-    QImage indexed(im.width(), im.height(), QImage::Format_Indexed8);
-    QVector<QRgb> colors(256);
-    for (int i=0; i<256; ++i)
-        colors[i] = qRgba(0, 0, 0, i);
-    indexed.setColorTable(colors);
-
-    uint *gamma = qt_pow_gamma();
-    for (int y=0; y<im.height(); ++y) {
-        uint *src = (uint*) im.scanLine(y);
-        uchar *dst = indexed.scanLine(y);
-        for (int x=0; x<im.width(); ++x) {
-            uint gray = qGray(0xffffffff - *src);
-            *dst = 255 - (gamma ? gamma[gray] * 255. / 2047. : gray);
-            ++dst;
-            ++src;
-        }
-    }
-
-    return indexed;
-}
-
-bool QFontEngineDirectWrite::supportsSubPixelPositions() const
-{
-    return true;
-}
-
-QImage QFontEngineDirectWrite::imageForGlyph(glyph_t t,
-                                             QFixed subPixelPosition,
-                                             int margin,
-                                             const QTransform &xform)
-{
-    UINT16 glyphIndex = t;
-    FLOAT glyphAdvance = 0;
-
-    DWRITE_GLYPH_OFFSET glyphOffset;
-    glyphOffset.advanceOffset = 0;
-    glyphOffset.ascenderOffset = 0;
-
-    DWRITE_GLYPH_RUN glyphRun;
-    glyphRun.fontFace = m_directWriteFontFace;
-    glyphRun.fontEmSize = fontDef.pixelSize;
-    glyphRun.glyphCount = 1;
-    glyphRun.glyphIndices = &glyphIndex;
-    glyphRun.glyphAdvances = &glyphAdvance;
-    glyphRun.isSideways = false;
-    glyphRun.bidiLevel = 0;
-    glyphRun.glyphOffsets = &glyphOffset;
-
-    DWRITE_MATRIX transform;
-    transform.dx = subPixelPosition.toReal();
-    transform.dy = 0;
-    transform.m11 = xform.m11();
-    transform.m12 = xform.m12();
-    transform.m21 = xform.m21();
-    transform.m22 = xform.m22();
-
-    IDWriteGlyphRunAnalysis *glyphAnalysis = NULL;
-    HRESULT hr = m_directWriteFactory->CreateGlyphRunAnalysis(
-                &glyphRun,
-                1.0f,
-                &transform,
-                DWRITE_RENDERING_MODE_CLEARTYPE_NATURAL_SYMMETRIC,
-                DWRITE_MEASURING_MODE_NATURAL,
-                0.0, 0.0,
-                &glyphAnalysis
-                );
-
-    if (SUCCEEDED(hr)) {
-        RECT rect;
-        glyphAnalysis->GetAlphaTextureBounds(DWRITE_TEXTURE_CLEARTYPE_3x1, &rect);
-
-        rect.left -= margin;
-        rect.top -= margin;
-        rect.right += margin;
-        rect.bottom += margin;
-
-        int width = rect.right - rect.left;
-        int height = rect.bottom - rect.top;
-
-        int size = width * height * 3;
-        if (size > 0) {
-            BYTE *alphaValues = new BYTE[size];
-            memset(alphaValues, size, 0);
-
-            hr = glyphAnalysis->CreateAlphaTexture(DWRITE_TEXTURE_CLEARTYPE_3x1,
-                                                   &rect,
-                                                   alphaValues,
-                                                   size);
-
-            if (SUCCEEDED(hr)) {
-                QImage img(width, height, QImage::Format_RGB32);
-                img.fill(0xffffffff);
-
-                for (int y=0; y<height; ++y) {
-                    uint *dest = reinterpret_cast<uint *>(img.scanLine(y));
-                    BYTE *src = alphaValues + width * 3 * y;
-
-                    for (int x=0; x<width; ++x) {
-                        dest[x] = *(src) << 16
-                                | *(src + 1) << 8
-                                | *(src + 2);
-
-                        src += 3;
-                    }
-                }
-
-                delete[] alphaValues;
-                glyphAnalysis->Release();
-
-                return img;
-            } else {
-                delete[] alphaValues;
-                glyphAnalysis->Release();
-
-                qErrnoWarning("QFontEngineDirectWrite::imageForGlyph: CreateAlphaTexture failed");
-            }
-        }
-    } else {
-        qErrnoWarning("QFontEngineDirectWrite::imageForGlyph: CreateGlyphRunAnalysis failed");
-    }
-
-    return QImage();
-}
-
-QImage QFontEngineDirectWrite::alphaRGBMapForGlyph(glyph_t t,
-                                                   QFixed subPixelPosition,
-                                                   const QTransform &xform)
-{
-    QImage mask = imageForGlyph(t, subPixelPosition,
-                                glyphMargin(QFontEngineGlyphCache::Raster_RGBMask),
-                                xform);
-    return mask.depth() == 32
-           ? mask
-           : mask.convertToFormat(QImage::Format_RGB32);
-}
-
-const char *QFontEngineDirectWrite::name() const
-{
-    return 0;
-}
-
-bool QFontEngineDirectWrite::canRender(const QChar *string, int len)
-{
-    QVarLengthArray<UINT32> codePoints(len);
-    int actualLength = 0;
-    for (int i=0; i<len; ++i, actualLength++)
-        codePoints[actualLength] = getChar(string, i, len);
-
-    QVarLengthArray<UINT16> glyphIndices(actualLength);
-    HRESULT hr = m_directWriteFontFace->GetGlyphIndices(codePoints.data(), actualLength,
-                                                        glyphIndices.data());
-    if (FAILED(hr)) {
-        qErrnoWarning(hr, "QFontEngineDirectWrite::canRender: GetGlyphIndices failed");
-        return false;
-    } else {
-        for (int i=0; i<glyphIndices.size(); ++i) {
-            if (glyphIndices.at(i) == 0)
-                return false;
-        }
-
-        return true;
-    }
-}
-
-QFontEngine::Type QFontEngineDirectWrite::type() const
-{
-    return QFontEngine::DirectWrite;
-}
-
-QFontEngine *QFontEngineDirectWrite::cloneWithSize(qreal pixelSize) const
-{
-    QFontEngine *fontEngine = new QFontEngineDirectWrite(m_directWriteFactory, m_directWriteFontFace,
-                                                         pixelSize);
-
-    fontEngine->fontDef = fontDef;
-    fontEngine->fontDef.pixelSize = pixelSize;
-
-    return fontEngine;
-}
-
-QT_END_NAMESPACE
-
-#endif // QT_NO_DIRECTWRITE
diff --git a/src/gui/text/qfontenginedirectwrite_p.h b/src/gui/text/qfontenginedirectwrite_p.h
deleted file mode 100644
index ecbbf4fb37..0000000000
--- a/src/gui/text/qfontenginedirectwrite_p.h
+++ /dev/null
@@ -1,135 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
-**
-** This file is part of the QtGui module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** GNU Lesser General Public License Usage
-** This file may be used under the terms of the GNU Lesser General Public
-** License version 2.1 as published by the Free Software Foundation and
-** appearing in the file LICENSE.LGPL included in the packaging of this
-** file. Please review the following information to ensure the GNU Lesser
-** General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QFONTENGINEDIRECTWRITE_H
-#define QFONTENGINEDIRECTWRITE_H
-
-#ifndef QT_NO_DIRECTWRITE
-
-//
-//  W A R N I N G
-//  -------------
-//
-// This file is not part of the Qt API.  It exists purely as an
-// implementation detail.  This header file may change from version to
-// version without notice, or even be removed.
-//
-// We mean it.
-//
-
-#include "private/qfontengine_p.h"
-
-struct IDWriteFont ;
-struct IDWriteFontFace ;
-struct IDWriteFactory ;
-struct IDWriteBitmapRenderTarget ;
-struct IDWriteGdiInterop ;
-
-QT_BEGIN_NAMESPACE
-
-class QFontEngineDirectWrite : public QFontEngine
-{
-    Q_OBJECT
-public:
-    explicit QFontEngineDirectWrite(IDWriteFactory *directWriteFactory,
-                                    IDWriteFontFace *directWriteFontFace,
-                                    qreal pixelSize);
-    ~QFontEngineDirectWrite();
-
-    QFixed lineThickness() const;
-    bool getSfntTableData(uint tag, uchar *buffer, uint *length) const;
-    QFixed emSquareSize() const;
-
-    bool stringToCMap(const QChar *str, int len, QGlyphLayout *glyphs, int *nglyphs, QTextEngine::ShaperFlags flags) const;
-    void recalcAdvances(QGlyphLayout *glyphs, QTextEngine::ShaperFlags) const;
-
-    void addGlyphsToPath(glyph_t *glyphs, QFixedPoint *positions, int nglyphs,
-                         QPainterPath *path, QTextItem::RenderFlags flags);
-
-    glyph_metrics_t boundingBox(const QGlyphLayout &glyphs);
-    glyph_metrics_t boundingBox(glyph_t g);
-    glyph_metrics_t alphaMapBoundingBox(glyph_t glyph,
-                                        QFixed subPixelPosition,
-                                        const QTransform &matrix,
-                                        GlyphFormat format);
-
-    QFixed ascent() const;
-    QFixed descent() const;
-    QFixed leading() const;
-    QFixed xHeight() const;
-    qreal maxCharWidth() const;
-
-    const char *name() const;
-
-    bool supportsSubPixelPositions() const;
-
-    QImage alphaMapForGlyph(glyph_t, QFixed subPixelPosition, const QTransform &t);
-    QImage alphaRGBMapForGlyph(glyph_t t, QFixed subPixelPosition, const QTransform &xform);
-
-    QFontEngine *cloneWithSize(qreal pixelSize) const;
-
-    bool canRender(const QChar *string, int len);
-    Type type() const;
-
-private:
-    friend class QRawFontPrivate;
-
-    QImage imageForGlyph(glyph_t t, QFixed subPixelPosition, int margin, const QTransform &xform);
-    void collectMetrics();
-
-    IDWriteFontFace *m_directWriteFontFace;
-    IDWriteFactory *m_directWriteFactory;
-    IDWriteBitmapRenderTarget *m_directWriteBitmapRenderTarget;
-
-    QFixed m_lineThickness;
-    int m_unitsPerEm;
-    QFixed m_ascent;
-    QFixed m_descent;
-    QFixed m_xHeight;
-    QFixed m_lineGap;
-    FaceId m_faceId;
-};
-
-QT_END_NAMESPACE
-
-#endif // QT_NO_DIRECTWRITE
-
-#endif // QFONTENGINEDIRECTWRITE_H
diff --git a/src/gui/text/text.pri b/src/gui/text/text.pri
index fb46642b31..ffd53313a3 100644
--- a/src/gui/text/text.pri
+++ b/src/gui/text/text.pri
@@ -77,12 +77,6 @@ SOURCES += \
     text/qglyphrun.cpp \
     text/qdistancefield.cpp
 
-contains(QT_CONFIG, directwrite) {
-    LIBS_PRIVATE += -ldwrite
-    HEADERS += text/qfontenginedirectwrite_p.h
-    SOURCES += text/qfontenginedirectwrite.cpp
-}
-
 SOURCES += \
       text/qfont_qpa.cpp \
       text/qfontengine_qpa.cpp \