From d215bdfc523739187931b0921e174e5fc217d0e4 Mon Sep 17 00:00:00 2001 From: Stephen Kelly Date: Fri, 9 Dec 2011 01:18:07 +0100 Subject: [PATCH] Make headers safe with QT_NO_CAST_FROM_BYTEARRAY. Change-Id: I0f9dfee505ebc48d9c586c010ad75877a7387836 Reviewed-by: Marius Storm-Olsen --- src/gui/image/qimage.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/gui/image/qimage.h b/src/gui/image/qimage.h index a18d810..a8491c8 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); } -- 2.7.4