diff options
| author | Stephen Kelly <stephen.kelly@kdab.com> | 2011-12-09 01:18:07 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-12-09 18:31:08 +0100 |
| commit | d215bdfc523739187931b0921e174e5fc217d0e4 (patch) | |
| tree | 2e661fbd3e4b98564dae2ad87546d56240668549 /src/gui/image | |
| parent | 4471e45f74a74827464774480306c1fbd70a5d7e (diff) | |
Make headers safe with QT_NO_CAST_FROM_BYTEARRAY.
Change-Id: I0f9dfee505ebc48d9c586c010ad75877a7387836
Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
Diffstat (limited to 'src/gui/image')
| -rw-r--r-- | src/gui/image/qimage.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/image/qimage.h b/src/gui/image/qimage.h index a18d81068e..a8491c8109 100644 --- a/src/gui/image/qimage.h +++ b/src/gui/image/qimage.h @@ -363,9 +363,9 @@ inline QString QImage::text(const QImageTextKeyLang&kl) const { if (!d) return QString(); - QString k = QString::fromAscii(kl.key); + QString k = QString::fromAscii(kl.key.constData()); if (!kl.lang.isEmpty()) - k += QLatin1Char('/') + QString::fromAscii(kl.lang); + k += QLatin1Char('/') + QString::fromAscii(kl.lang.constData()); return text(k); } |