diff -r 41300fa6a67c -r f7bc934e204c tools/designer/src/lib/shared/qdesigner_introspection.cpp --- a/tools/designer/src/lib/shared/qdesigner_introspection.cpp Tue Feb 02 00:43:10 2010 +0200 +++ b/tools/designer/src/lib/shared/qdesigner_introspection.cpp Wed Mar 31 11:06:36 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) ** @@ -63,7 +63,7 @@ static inline QString charToQString(const char *c) { if (!c) - return QString::null; + return QString(); return QString::fromUtf8(c); }