diff -r 41300fa6a67c -r 2f34d5167611 src/gui/itemviews/qitemdelegate.cpp --- a/src/gui/itemviews/qitemdelegate.cpp Tue Feb 02 00:43:10 2010 +0200 +++ b/src/gui/itemviews/qitemdelegate.cpp Fri Apr 16 15:50:13 2010 +0300 @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** @@ -1033,7 +1033,7 @@ i >>= 4; } - return QString::fromUtf16(ptr, int(&arr[sizeof(arr) / sizeof(ushort)] - ptr)); + return QString((const QChar *)ptr, int(&arr[sizeof(arr) / sizeof(ushort)] - ptr)); } /*!