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

Make headers safe with QT_NO_CAST_FROM_BYTEARRAY.

Browse Source 
Change-Id: I0f9dfee505ebc48d9c586c010ad75877a7387836
Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
This commit is contained in:
Stephen Kelly 2011-12-09 01:18:07 +01:00 committed by Qt by Nokia
parent 4471e45f74
commit d215bdfc52
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/gui/image/qimage.h
View File

@ -363,9 +363,9 @@ inline QString QImage::text(const QImageTextKeyLang&kl) const
{ {
if (!d) if (!d)
return QString(); return QString();
QString k = QString::fromAscii(kl.key); QString k = QString::fromAscii(kl.key.constData());
if (!kl.lang.isEmpty()) if (!kl.lang.isEmpty())
k += QLatin1Char('/') + QString::fromAscii(kl.lang); k += QLatin1Char('/') + QString::fromAscii(kl.lang.constData());
return text(k); return text(k);
} }