Merge branch '4.6' into lighthouse

Conflicts:
	configure
	src/gui/image/qpixmapdatafactory.cpp
	src/gui/kernel/qapplication_p.h
	src/gui/painting/qgraphicssystem.cpp

1 files changed, 5 insertions, 5 deletions

diff --git a/src/corelib/io/qiodevice.h b/src/corelib/io/qiodevice.h
index 5a1c106..60ca74c 100644
--- a/src/corelib/io/qiodevice.h
+++ b/src/corelib/io/qiodevice.h
@@ -1,6 +1,7 @@
 /****************************************************************************
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtCore module of the Qt Toolkit.
@@ -20,10 +21,9 @@
 ** ensure the GNU Lesser General Public License version 2.1 requirements
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
-** In addition, as a special exception, Nokia gives you certain
-** additional rights.  These rights are described in the Nokia Qt LGPL
-** Exception version 1.1, included in the file LGPL_EXCEPTION.txt in this
-** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
@@ -198,7 +198,7 @@ public:
     inline QT3_SUPPORT qint64 writeBlock(const QByteArray &data) { return write(data); }
 
     inline QT3_SUPPORT int getch() { char c; return getChar(&c) ? int(uchar(c)) : -1; }
-    inline QT3_SUPPORT int putch(int c) { return putChar(c) ? int(uchar(c)) : -1; }
+    inline QT3_SUPPORT int putch(int c) { return putChar(char(c)) ? int(uchar(c)) : -1; }
     inline QT3_SUPPORT int ungetch(int c) { ungetChar(uchar(c)); return c; }
 #endif
 };