diff options
author | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2012-04-26 10:00:41 +0200 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-05-02 09:33:35 +0200 |
commit | d0c01c581a69649d189a4febea90be050100322f (patch) | |
tree | f2642c9d032718d4f8befcbe2afe5b435bc82b64 /src/declarative/graphicsitems/qdeclarativetextlayout.cpp | |
parent | 951f97722792fee9601425120f0b64408ec18a4a (diff) |
QtQuick1: Fix deprecation warnings.
Introduced by qtbase:0df1c9f1fa04c06d6105de3f312c6c752a58ad70
Change-Id: I61e330707a49efd09bad0efda386712fba207c8a
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
Diffstat (limited to 'src/declarative/graphicsitems/qdeclarativetextlayout.cpp')
-rw-r--r-- | src/declarative/graphicsitems/qdeclarativetextlayout.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/declarative/graphicsitems/qdeclarativetextlayout.cpp b/src/declarative/graphicsitems/qdeclarativetextlayout.cpp index 3f061376..d74a00d6 100644 --- a/src/declarative/graphicsitems/qdeclarativetextlayout.cpp +++ b/src/declarative/graphicsitems/qdeclarativetextlayout.cpp @@ -46,6 +46,8 @@ #include <private/qpainter_p.h> #include <private/qpaintengineex_p.h> +#include <string.h> + QT_BEGIN_NAMESPACE class QDeclarativeTextLayoutPrivate @@ -138,13 +140,13 @@ class DrawTextItemRecorder: public QPaintEngine m_inertText->chars.resize(m_inertText->chars.size() + ti.num_chars); glyph_t *glyphsDestination = m_inertText->glyphs.data() + glyphOffset; - qMemCopy(glyphsDestination, glyphs.constData(), sizeof(glyph_t) * size); + memcpy(glyphsDestination, glyphs.constData(), sizeof(glyph_t) * size); QFixedPoint *positionsDestination = m_inertText->positions.data() + positionOffset; - qMemCopy(positionsDestination, positions.constData(), sizeof(QFixedPoint) * size); + memcpy(positionsDestination, positions.constData(), sizeof(QFixedPoint) * size); QChar *charsDestination = m_inertText->chars.data() + charOffset; - qMemCopy(charsDestination, ti.chars, sizeof(QChar) * ti.num_chars); + memcpy(charsDestination, ti.chars, sizeof(QChar) * ti.num_chars); } |