Changeset 649 for branches/vendor/nokia/qt/current/src/plugins

Timestamp:

Mar 7, 2010, 11:52:24 PM (16 years ago)

Author:

Dmitry A. Kuminov

Message:

vendor: Merged in qt-everywhere-opensource-src-4.6.2 from Nokia.

Location:

branches/vendor/nokia/qt/current/src/plugins

Files:

• accessible/compat/main.cpp (modified) (1 diff)
• accessible/compat/q3complexwidgets.cpp (modified) (1 diff)
• accessible/compat/q3complexwidgets.h (modified) (1 diff)
• accessible/compat/q3simplewidgets.cpp (modified) (1 diff)
• accessible/compat/q3simplewidgets.h (modified) (1 diff)
• accessible/compat/qaccessiblecompat.cpp (modified) (1 diff)
• accessible/compat/qaccessiblecompat.h (modified) (1 diff)
• accessible/widgets/complexwidgets.cpp (modified) (1 diff)
• accessible/widgets/complexwidgets.h (modified) (1 diff)
• accessible/widgets/main.cpp (modified) (1 diff)
• accessible/widgets/qaccessiblemenu.cpp (modified) (1 diff)
• accessible/widgets/qaccessiblemenu.h (modified) (1 diff)
• accessible/widgets/qaccessiblewidgets.cpp (modified) (1 diff)
• accessible/widgets/qaccessiblewidgets.h (modified) (1 diff)
• accessible/widgets/rangecontrols.cpp (modified) (1 diff)
• accessible/widgets/rangecontrols.h (modified) (1 diff)
• accessible/widgets/simplewidgets.cpp (modified) (1 diff)
• accessible/widgets/simplewidgets.h (modified) (1 diff)
• codecs/cn/main.cpp (modified) (1 diff)
• codecs/cn/qgb18030codec.cpp (modified) (1 diff)
• codecs/cn/qgb18030codec.h (modified) (1 diff)
• codecs/jp/main.cpp (modified) (1 diff)
• codecs/jp/qeucjpcodec.cpp (modified) (1 diff)
• codecs/jp/qeucjpcodec.h (modified) (1 diff)
• codecs/jp/qfontjpcodec.cpp (modified) (1 diff)
• codecs/jp/qfontjpcodec.h (modified) (1 diff)
• codecs/jp/qjiscodec.cpp (modified) (1 diff)
• codecs/jp/qjiscodec.h (modified) (1 diff)
• codecs/jp/qjpunicode.cpp (modified) (1 diff)
• codecs/jp/qjpunicode.h (modified) (1 diff)
• codecs/jp/qsjiscodec.cpp (modified) (1 diff)
• codecs/jp/qsjiscodec.h (modified) (1 diff)
• codecs/kr/cp949codetbl.h (modified) (1 diff)
• codecs/kr/main.cpp (modified) (1 diff)
• codecs/kr/qeuckrcodec.cpp (modified) (1 diff)
• codecs/kr/qeuckrcodec.h (modified) (1 diff)
• codecs/tw/main.cpp (modified) (1 diff)
• codecs/tw/qbig5codec.cpp (modified) (1 diff)
• codecs/tw/qbig5codec.h (modified) (1 diff)
• decorations/default/main.cpp (modified) (1 diff)
• decorations/styled/main.cpp (modified) (1 diff)
• decorations/windows/main.cpp (modified) (1 diff)
• gfxdrivers/ahi/qscreenahi_qws.cpp (modified) (1 diff)
• gfxdrivers/ahi/qscreenahi_qws.h (modified) (1 diff)
• gfxdrivers/ahi/qscreenahiplugin.cpp (modified) (1 diff)
• gfxdrivers/directfb/qdirectfbkeyboard.cpp (modified) (1 diff)
• gfxdrivers/directfb/qdirectfbkeyboard.h (modified) (1 diff)
• gfxdrivers/directfb/qdirectfbmouse.cpp (modified) (1 diff)
• gfxdrivers/directfb/qdirectfbmouse.h (modified) (1 diff)
• gfxdrivers/directfb/qdirectfbpaintdevice.cpp (modified) (1 diff)
• gfxdrivers/directfb/qdirectfbpaintdevice.h (modified) (1 diff)
• gfxdrivers/directfb/qdirectfbpaintengine.cpp (modified) (10 diffs)
• gfxdrivers/directfb/qdirectfbpaintengine.h (modified) (1 diff)
• gfxdrivers/directfb/qdirectfbpixmap.cpp (modified) (4 diffs)
• gfxdrivers/directfb/qdirectfbpixmap.h (modified) (2 diffs)
• gfxdrivers/directfb/qdirectfbscreen.cpp (modified) (1 diff)
• gfxdrivers/directfb/qdirectfbscreen.h (modified) (2 diffs)
• gfxdrivers/directfb/qdirectfbscreenplugin.cpp (modified) (1 diff)
• gfxdrivers/directfb/qdirectfbwindowsurface.cpp (modified) (2 diffs)
• gfxdrivers/directfb/qdirectfbwindowsurface.h (modified) (1 diff)
• gfxdrivers/linuxfb/main.cpp (modified) (1 diff)
• gfxdrivers/powervr/QWSWSEGL/pvrqwsdrawable.c (modified) (1 diff)
• gfxdrivers/powervr/QWSWSEGL/pvrqwsdrawable.h (modified) (1 diff)
• gfxdrivers/powervr/QWSWSEGL/pvrqwsdrawable_p.h (modified) (1 diff)
• gfxdrivers/powervr/QWSWSEGL/pvrqwswsegl.c (modified) (1 diff)
• gfxdrivers/powervr/pvreglscreen/pvreglscreen.cpp (modified) (1 diff)
• gfxdrivers/powervr/pvreglscreen/pvreglscreen.h (modified) (1 diff)
• gfxdrivers/powervr/pvreglscreen/pvreglscreenplugin.cpp (modified) (1 diff)
• gfxdrivers/powervr/pvreglscreen/pvreglwindowsurface.cpp (modified) (1 diff)
• gfxdrivers/powervr/pvreglscreen/pvreglwindowsurface.h (modified) (1 diff)
• gfxdrivers/qvfb/main.cpp (modified) (1 diff)
• gfxdrivers/transformed/main.cpp (modified) (1 diff)
• gfxdrivers/vnc/main.cpp (modified) (1 diff)
• gfxdrivers/vnc/qscreenvnc_p.h (modified) (1 diff)
• gfxdrivers/vnc/qscreenvnc_qws.cpp (modified) (1 diff)
• gfxdrivers/vnc/qscreenvnc_qws.h (modified) (1 diff)
• graphicssystems/opengl/main.cpp (modified) (1 diff)
• graphicssystems/openvg/main.cpp (modified) (1 diff)
• graphicssystems/openvg/qgraphicssystem_vg.cpp (modified) (1 diff)
• graphicssystems/openvg/qgraphicssystem_vg_p.h (modified) (1 diff)
• graphicssystems/shivavg/main.cpp (modified) (1 diff)
• graphicssystems/shivavg/shivavggraphicssystem.cpp (modified) (1 diff)
• graphicssystems/shivavg/shivavggraphicssystem.h (modified) (1 diff)
• graphicssystems/shivavg/shivavgwindowsurface.cpp (modified) (1 diff)
• graphicssystems/shivavg/shivavgwindowsurface.h (modified) (1 diff)
• graphicssystems/trace/main.cpp (modified) (1 diff)
• graphicssystems/trace/qgraphicssystem_trace.cpp (modified) (1 diff)
• graphicssystems/trace/qgraphicssystem_trace_p.h (modified) (1 diff)
• iconengines/svgiconengine/main.cpp (modified) (1 diff)
• iconengines/svgiconengine/qsvgiconengine.cpp (modified) (1 diff)
• iconengines/svgiconengine/qsvgiconengine.h (modified) (1 diff)
• imageformats/gif/main.cpp (modified) (1 diff)
• imageformats/gif/qgifhandler.cpp (modified) (10 diffs)
• imageformats/gif/qgifhandler.h (modified) (2 diffs)
• imageformats/ico/main.cpp (modified) (1 diff)
• imageformats/ico/qicohandler.cpp (modified) (2 diffs)
• imageformats/ico/qicohandler.h (modified) (1 diff)
• imageformats/jpeg/main.cpp (modified) (1 diff)
• imageformats/jpeg/qjpeghandler.cpp (modified) (1 diff)
• imageformats/jpeg/qjpeghandler.h (modified) (1 diff)
• imageformats/mng/main.cpp (modified) (1 diff)
• imageformats/mng/qmnghandler.cpp (modified) (1 diff)
• imageformats/mng/qmnghandler.h (modified) (1 diff)
• imageformats/svg/main.cpp (modified) (1 diff)
• imageformats/svg/qsvgiohandler.cpp (modified) (1 diff)
• imageformats/svg/qsvgiohandler.h (modified) (1 diff)
• imageformats/tiff/main.cpp (modified) (1 diff)
• imageformats/tiff/qtiffhandler.cpp (modified) (1 diff)
• imageformats/tiff/qtiffhandler.h (modified) (1 diff)
• inputmethods/imsw-multi/qmultiinputcontext.cpp (modified) (1 diff)
• inputmethods/imsw-multi/qmultiinputcontext.h (modified) (1 diff)
• inputmethods/imsw-multi/qmultiinputcontextplugin.cpp (modified) (1 diff)
• inputmethods/imsw-multi/qmultiinputcontextplugin.h (modified) (1 diff)
• kbddrivers/linuxinput/main.cpp (modified) (1 diff)
• mousedrivers/linuxtp/main.cpp (modified) (1 diff)
• mousedrivers/pc/main.cpp (modified) (1 diff)
• mousedrivers/tslib/main.cpp (modified) (1 diff)
• phonon/mmf/mmf.pro (modified) (3 diffs)
• qpluginbase.pri (modified) (1 diff)
• s60/src/qcoreapplication_3_1.cpp (modified) (1 diff)
• s60/src/qcoreapplication_3_2.cpp (modified) (1 diff)
• s60/src/qdesktopservices_3_1.cpp (modified) (1 diff)
• s60/src/qdesktopservices_3_2.cpp (modified) (1 diff)
• s60/src/qlocale_3_1.cpp (modified) (1 diff)
• s60/src/qlocale_3_2.cpp (modified) (1 diff)
• script/qtdbus/main.cpp (modified) (1 diff)
• script/qtdbus/main.h (modified) (1 diff)
• sqldrivers/db2/main.cpp (modified) (1 diff)
• sqldrivers/ibase/main.cpp (modified) (1 diff)
• sqldrivers/mysql/main.cpp (modified) (1 diff)
• sqldrivers/oci/main.cpp (modified) (1 diff)
• sqldrivers/odbc/main.cpp (modified) (1 diff)
• sqldrivers/psql/main.cpp (modified) (1 diff)
• sqldrivers/sqlite/smain.cpp (modified) (1 diff)
• sqldrivers/sqlite2/smain.cpp (modified) (1 diff)
• sqldrivers/tds/main.cpp (modified) (1 diff)

branches/vendor/nokia/qt/current/src/plugins/accessible/compat/main.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

branches/vendor/nokia/qt/current/src/plugins/accessible/compat/q3complexwidgets.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

branches/vendor/nokia/qt/current/src/plugins/accessible/compat/q3complexwidgets.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

branches/vendor/nokia/qt/current/src/plugins/accessible/compat/q3simplewidgets.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

branches/vendor/nokia/qt/current/src/plugins/accessible/compat/q3simplewidgets.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

branches/vendor/nokia/qt/current/src/plugins/accessible/compat/qaccessiblecompat.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

branches/vendor/nokia/qt/current/src/plugins/accessible/compat/qaccessiblecompat.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

branches/vendor/nokia/qt/current/src/plugins/accessible/widgets/complexwidgets.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

branches/vendor/nokia/qt/current/src/plugins/accessible/widgets/complexwidgets.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

branches/vendor/nokia/qt/current/src/plugins/accessible/widgets/main.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

branches/vendor/nokia/qt/current/src/plugins/accessible/widgets/qaccessiblemenu.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

branches/vendor/nokia/qt/current/src/plugins/accessible/widgets/qaccessiblemenu.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

branches/vendor/nokia/qt/current/src/plugins/accessible/widgets/qaccessiblewidgets.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

branches/vendor/nokia/qt/current/src/plugins/accessible/widgets/qaccessiblewidgets.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

branches/vendor/nokia/qt/current/src/plugins/accessible/widgets/rangecontrols.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

branches/vendor/nokia/qt/current/src/plugins/accessible/widgets/rangecontrols.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

branches/vendor/nokia/qt/current/src/plugins/accessible/widgets/simplewidgets.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

branches/vendor/nokia/qt/current/src/plugins/accessible/widgets/simplewidgets.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

branches/vendor/nokia/qt/current/src/plugins/codecs/cn/main.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

branches/vendor/nokia/qt/current/src/plugins/codecs/cn/qgb18030codec.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

branches/vendor/nokia/qt/current/src/plugins/codecs/cn/qgb18030codec.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

branches/vendor/nokia/qt/current/src/plugins/codecs/jp/main.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

branches/vendor/nokia/qt/current/src/plugins/codecs/jp/qeucjpcodec.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

branches/vendor/nokia/qt/current/src/plugins/codecs/jp/qeucjpcodec.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

branches/vendor/nokia/qt/current/src/plugins/codecs/jp/qfontjpcodec.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

branches/vendor/nokia/qt/current/src/plugins/codecs/jp/qfontjpcodec.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

branches/vendor/nokia/qt/current/src/plugins/codecs/jp/qjiscodec.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

branches/vendor/nokia/qt/current/src/plugins/codecs/jp/qjiscodec.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

branches/vendor/nokia/qt/current/src/plugins/codecs/jp/qjpunicode.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

branches/vendor/nokia/qt/current/src/plugins/codecs/jp/qjpunicode.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

branches/vendor/nokia/qt/current/src/plugins/codecs/jp/qsjiscodec.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

branches/vendor/nokia/qt/current/src/plugins/codecs/jp/qsjiscodec.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

branches/vendor/nokia/qt/current/src/plugins/codecs/kr/cp949codetbl.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

branches/vendor/nokia/qt/current/src/plugins/codecs/kr/main.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

branches/vendor/nokia/qt/current/src/plugins/codecs/kr/qeuckrcodec.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

branches/vendor/nokia/qt/current/src/plugins/codecs/kr/qeuckrcodec.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

branches/vendor/nokia/qt/current/src/plugins/codecs/tw/main.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

branches/vendor/nokia/qt/current/src/plugins/codecs/tw/qbig5codec.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

branches/vendor/nokia/qt/current/src/plugins/codecs/tw/qbig5codec.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

branches/vendor/nokia/qt/current/src/plugins/decorations/default/main.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

branches/vendor/nokia/qt/current/src/plugins/decorations/styled/main.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

branches/vendor/nokia/qt/current/src/plugins/decorations/windows/main.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

branches/vendor/nokia/qt/current/src/plugins/gfxdrivers/ahi/qscreenahi_qws.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

branches/vendor/nokia/qt/current/src/plugins/gfxdrivers/ahi/qscreenahi_qws.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

branches/vendor/nokia/qt/current/src/plugins/gfxdrivers/ahi/qscreenahiplugin.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

branches/vendor/nokia/qt/current/src/plugins/gfxdrivers/directfb/qdirectfbkeyboard.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

branches/vendor/nokia/qt/current/src/plugins/gfxdrivers/directfb/qdirectfbkeyboard.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

branches/vendor/nokia/qt/current/src/plugins/gfxdrivers/directfb/qdirectfbmouse.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

branches/vendor/nokia/qt/current/src/plugins/gfxdrivers/directfb/qdirectfbmouse.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

branches/vendor/nokia/qt/current/src/plugins/gfxdrivers/directfb/qdirectfbpaintdevice.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

branches/vendor/nokia/qt/current/src/plugins/gfxdrivers/directfb/qdirectfbpaintdevice.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

branches/vendor/nokia/qt/current/src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])
@@ -104 +104 @@
     void blit(const QRectF &dest, IDirectFBSurface *surface, const QRectF &src);
 
+
+
     inline void updateClip();
     virtual void systemStateChanged();
@@ -527 +529 @@
     if (!(d->compositionModeStatus & QDirectFBPaintEnginePrivate::PorterDuff_SupportedBlits)
         || (d->transformationType & QDirectFBPaintEnginePrivate::Matrix_BlitsUnsupported)
-        || d->clipType == QDirectFBPaintEnginePrivate::ComplexClip
+        || (d->clipType == QDirectFBPaintEnginePrivate::ComplexClip)
+        || (!d->supportsStretchBlit() && state()->matrix.mapRect(r).size() != sr.size())
 #ifndef QT_DIRECTFB_IMAGECACHE
-        || QDirectFBScreen::getSurfacePixelFormat(image.format()) == DSPF_UNKNOWN
+        || 
 #elif defined QT_NO_DIRECTFB_PREALLOCATED
-        || QDirectFBPaintEnginePrivate::cacheCost(image) > imageCache.maxCost()
+        || )
 #endif
         )
@@ -574 +577 @@
         QDirectFBPixmapData *dfbData = static_cast<QDirectFBPixmapData*>(data);
         if (!(d->compositionModeStatus & QDirectFBPaintEnginePrivate::PorterDuff_SupportedBlits)
-               || (d->transformationType & QDirectFBPaintEnginePrivate::Matrix_BlitsUnsupported)
-               || d->clipType == QDirectFBPaintEnginePrivate::ComplexClip
-               || (state()->renderHints & QPainter::SmoothPixmapTransform
-                   && state()->matrix.mapRect(r).size() != sr.size())) {
+            || (d->transformationType & QDirectFBPaintEnginePrivate::Matrix_BlitsUnsupported)
+            || (d->clipType == QDirectFBPaintEnginePrivate::ComplexClip)
+            || (!d->supportsStretchBlit() && state()->matrix.mapRect(r).size() != sr.size())) {
             RASTERFALLBACK(DRAW_PIXMAP, r, pixmap.size(), sr);
             const QImage *img = dfbData->buffer();
@@ -607 +609 @@
     } else if (!(d->compositionModeStatus & QDirectFBPaintEnginePrivate::PorterDuff_SupportedBlits)
                || (d->transformationType & QDirectFBPaintEnginePrivate::Matrix_BlitsUnsupported)
-               || d->clipType == QDirectFBPaintEnginePrivate::ComplexClip
-               || (state()->renderHints & QPainter::SmoothPixmapTransform && state()->matrix.isScaling())) {
+               || 
+               || ( && state()->matrix.isScaling())) {
         RASTERFALLBACK(DRAW_TILED_PIXMAP, r, pixmap.size(), offset);
         QPixmapData *pixmapData = pixmap.pixmapData();
@@ -733 +735 @@
             if (!(d->compositionModeStatus & QDirectFBPaintEnginePrivate::PorterDuff_SupportedBlits)
                 || (d->transformationType & QDirectFBPaintEnginePrivate::Matrix_BlitsUnsupported)
-                || (state()->renderHints & QPainter::SmoothPixmapTransform && state()->matrix.isScaling())) {
+                || ( && state()->matrix.isScaling())) {
                 break;
             }
@@ -758 +760 @@
     Q_D(QDirectFBPaintEngine);
     if ((d->transformationType & QDirectFBPaintEnginePrivate::Matrix_RectsUnsupported)
-        || d->clipType == QDirectFBPaintEnginePrivate::ComplexClip
+        || 
         || !d->testCompositionMode(0, 0, &color)) {
         RASTERFALLBACK(FILL_RECT, rect, color, VOID_ARG());
@@ -1050 +1052 @@
         result = surface->Blit(surface, s, &sRect, dr.x(), dr.y());
     } else {
+
         const DFBRectangle dRect = { dr.x(), dr.y(), dr.width(), dr.height() };
         result = surface->StretchBlit(surface, s, &sRect, &dRect);
@@ -1097 +1100 @@
     IDirectFBSurface *sourceSurface = dfbData->directFBSurface();
     if (transform.isScaling()) {
+
         Q_ASSERT(qMin(transform.m11(), transform.m22()) >= 0);
         offset.rx() *= transform.m11();
@@ -1185 +1189 @@
 }
 
+
+
+
+
+
+
+
+
+
+
 void QDirectFBPaintEnginePrivate::systemStateChanged()
 {

branches/vendor/nokia/qt/current/src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

branches/vendor/nokia/qt/current/src/plugins/gfxdrivers/directfb/qdirectfbpixmap.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])
@@ -471 +471 @@
 
     QDirectFBPixmapData *data = new QDirectFBPixmapData(screen, QPixmapData::PixmapType);
+
     DFBSurfaceBlittingFlags flags = DSBLIT_NOFX;
     data->alpha = alpha;
@@ -552 +553 @@
 }
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 void QDirectFBPixmapData::invalidate()
 {
@@ -568 +597 @@
 
 #endif // QT_NO_QWS_DIRECTFB
-
-
-

branches/vendor/nokia/qt/current/src/plugins/gfxdrivers/directfb/qdirectfbpixmap.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])
@@ -82 +82 @@
     virtual QPaintEngine *paintEngine() const;
     virtual QImage *buffer();
+
     // Pure virtual in QPixmapData, so re-implement here and delegate to QDirectFBPaintDevice
     virtual int metric(QPaintDevice::PaintDeviceMetric m) const { return QDirectFBPaintDevice::metric(m); }

branches/vendor/nokia/qt/current/src/plugins/gfxdrivers/directfb/qdirectfbscreen.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

branches/vendor/nokia/qt/current/src/plugins/gfxdrivers/directfb/qdirectfbscreen.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])
@@ -69 +69 @@
 #if !defined QT_NO_DIRECTFB_IMAGEPROVIDER && !defined QT_DIRECTFB_IMAGEPROVIDER
 #define QT_DIRECTFB_IMAGEPROVIDER
+
+
+
 #endif
 #if !defined QT_DIRECTFB_IMAGEPROVIDER_KEEPALIVE && !defined QT_NO_DIRECTFB_IMAGEPROVIDER_KEEPALIVE

branches/vendor/nokia/qt/current/src/plugins/gfxdrivers/directfb/qdirectfbscreenplugin.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

branches/vendor/nokia/qt/current/src/plugins/gfxdrivers/directfb/qdirectfbwindowsurface.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])
@@ -379 +379 @@
     }
     screen->flipSurface(dfbSurface, flipFlags, region, offset);
-    if (noSystemBackground) {
-        dfbSurface->Clear(dfbSurface, 0, 0, 0, 0);
-    }
 #else
     setOpaque(windowOpacity != 0xff);

branches/vendor/nokia/qt/current/src/plugins/gfxdrivers/directfb/qdirectfbwindowsurface.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

branches/vendor/nokia/qt/current/src/plugins/gfxdrivers/linuxfb/main.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

branches/vendor/nokia/qt/current/src/plugins/gfxdrivers/powervr/QWSWSEGL/pvrqwsdrawable.c

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

branches/vendor/nokia/qt/current/src/plugins/gfxdrivers/powervr/QWSWSEGL/pvrqwsdrawable.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

branches/vendor/nokia/qt/current/src/plugins/gfxdrivers/powervr/QWSWSEGL/pvrqwsdrawable_p.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

branches/vendor/nokia/qt/current/src/plugins/gfxdrivers/powervr/QWSWSEGL/pvrqwswsegl.c

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

branches/vendor/nokia/qt/current/src/plugins/gfxdrivers/powervr/pvreglscreen/pvreglscreen.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

branches/vendor/nokia/qt/current/src/plugins/gfxdrivers/powervr/pvreglscreen/pvreglscreen.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

branches/vendor/nokia/qt/current/src/plugins/gfxdrivers/powervr/pvreglscreen/pvreglscreenplugin.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

branches/vendor/nokia/qt/current/src/plugins/gfxdrivers/powervr/pvreglscreen/pvreglwindowsurface.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

branches/vendor/nokia/qt/current/src/plugins/gfxdrivers/powervr/pvreglscreen/pvreglwindowsurface.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

branches/vendor/nokia/qt/current/src/plugins/gfxdrivers/qvfb/main.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

branches/vendor/nokia/qt/current/src/plugins/gfxdrivers/transformed/main.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

branches/vendor/nokia/qt/current/src/plugins/gfxdrivers/vnc/main.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

branches/vendor/nokia/qt/current/src/plugins/gfxdrivers/vnc/qscreenvnc_p.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

branches/vendor/nokia/qt/current/src/plugins/gfxdrivers/vnc/qscreenvnc_qws.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

branches/vendor/nokia/qt/current/src/plugins/gfxdrivers/vnc/qscreenvnc_qws.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

branches/vendor/nokia/qt/current/src/plugins/graphicssystems/opengl/main.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

branches/vendor/nokia/qt/current/src/plugins/graphicssystems/openvg/main.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

branches/vendor/nokia/qt/current/src/plugins/graphicssystems/openvg/qgraphicssystem_vg.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

branches/vendor/nokia/qt/current/src/plugins/graphicssystems/openvg/qgraphicssystem_vg_p.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

branches/vendor/nokia/qt/current/src/plugins/graphicssystems/shivavg/main.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

branches/vendor/nokia/qt/current/src/plugins/graphicssystems/shivavg/shivavggraphicssystem.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

branches/vendor/nokia/qt/current/src/plugins/graphicssystems/shivavg/shivavggraphicssystem.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

branches/vendor/nokia/qt/current/src/plugins/graphicssystems/shivavg/shivavgwindowsurface.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

branches/vendor/nokia/qt/current/src/plugins/graphicssystems/shivavg/shivavgwindowsurface.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

branches/vendor/nokia/qt/current/src/plugins/graphicssystems/trace/main.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

branches/vendor/nokia/qt/current/src/plugins/graphicssystems/trace/qgraphicssystem_trace.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

branches/vendor/nokia/qt/current/src/plugins/graphicssystems/trace/qgraphicssystem_trace_p.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

branches/vendor/nokia/qt/current/src/plugins/iconengines/svgiconengine/main.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

branches/vendor/nokia/qt/current/src/plugins/iconengines/svgiconengine/qsvgiconengine.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

branches/vendor/nokia/qt/current/src/plugins/iconengines/svgiconengine/qsvgiconengine.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

branches/vendor/nokia/qt/current/src/plugins/imageformats/gif/main.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

branches/vendor/nokia/qt/current/src/plugins/imageformats/gif/qgifhandler.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])
@@ -72 +72 @@
 
     int decode(QImage *image, const uchar* buffer, int length,
-               int *nextFrameDelay, int *loopCount, QSize *nextSize);
+               int *nextFrameDelay, int *loopCount);
+    static void scan(QIODevice *device, QVector<QSize> *imageSizes, int *loopCount);
 
     bool newFrame;
@@ -230 +231 @@
 */
 int QGIFFormat::decode(QImage *image, const uchar *buffer, int length,
-                       int *nextFrameDelay, int *loopCount, QSize *nextSize)
+                       int *nextFrameDelay, int *loopCount)
 {
     // We are required to state that
@@ -347 +348 @@
                     bits = image->bits();
                     memset(bits, 0, image->byteCount());
-
-                    // ### size of the upcoming frame, should rather
-                    // be known before decoding it.
-                    *nextSize = QSize(swidth, sheight);
                 }
 
@@ -646 +643 @@
 }
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 void QGIFFormat::fillRect(QImage *image, int col, int row, int w, int h, QRgb color)
 {
@@ -764 +1028 @@
     gifFormat = new QGIFFormat;
     nextDelay = 0;
-    loopCnt = 0;
+    loopCnt = ;
     frameNumber = -1;
-    nextSize = QSize();
+    ;
 }
 
@@ -788 +1052 @@
 
         int decoded = gifFormat->decode(&lastImage, (const uchar *)buffer.constData(), buffer.size(),
-                                        &nextDelay, &loopCnt, &nextSize);
+                                        &nextDelay, &loopCnt);
         if (decoded == -1)
             break;
@@ -832 +1096 @@
 
         int decoded = gifFormat->decode(&lastImage, (const uchar *)buffer.constData(), buffer.size(),
-                                        &nextDelay, &loopCnt, &nextSize);
+                                        &nextDelay, &loopCnt);
         if (decoded == -1)
             break;
@@ -863 +1127 @@
 {
     if (option == Size) {
-        if (imageIsComing())
-            return nextSize;
+        if (!scanIsCached) {
+            QGIFFormat::scan(device(), &imageSizes, &loopCnt);
+            scanIsCached = true;
+        }
+        // before the first frame is read, or we have an empty data stream
+        if (frameNumber == -1)
+            return (imageSizes.count() > 0) ? QVariant(imageSizes.at(0)) : QVariant();
+        // after the last frame has been read, the next size is undefined
+        if (frameNumber >= imageSizes.count() - 1)
+            return QVariant();
+        // and the last case: the size of the next frame
+        return imageSizes.at(frameNumber + 1);
     } else if (option == Animation) {
         return true;
@@ -884 +1158 @@
 int QGifHandler::imageCount() const
 {
-    return 0; // Don't know
+    if (!scanIsCached) {
+        QGIFFormat::scan(device(), &imageSizes, &loopCnt);
+        scanIsCached = true;
+    }
+    return imageSizes.count();
 }
 
 int QGifHandler::loopCount() const
 {
+
+
+
+
     return loopCnt-1; // In GIF, loop count is iteration count, so subtract one
 }

branches/vendor/nokia/qt/current/src/plugins/imageformats/gif/qgifhandler.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])
@@ -88 +88 @@
     mutable int loopCnt;
     int frameNumber;
-    mutable QSize nextSize;
+    mutable QVector<QSize> imageSizes;
+    mutable bool scanIsCached;
 };
 

branches/vendor/nokia/qt/current/src/plugins/imageformats/ico/main.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

branches/vendor/nokia/qt/current/src/plugins/imageformats/ico/qicohandler.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])
@@ -557 +557 @@
                     icoAttrib.ncolors = header.biClrUsed ? header.biClrUsed : 1 << icoAttrib.nbits;
                 icoAttrib.w = iconEntry.bWidth;
+
+
                 icoAttrib.h = iconEntry.bHeight;
+
+
 
                 QImage::Format format = QImage::Format_ARGB32;

branches/vendor/nokia/qt/current/src/plugins/imageformats/ico/qicohandler.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

branches/vendor/nokia/qt/current/src/plugins/imageformats/jpeg/main.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

branches/vendor/nokia/qt/current/src/plugins/imageformats/jpeg/qjpeghandler.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

branches/vendor/nokia/qt/current/src/plugins/imageformats/jpeg/qjpeghandler.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

branches/vendor/nokia/qt/current/src/plugins/imageformats/mng/main.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

branches/vendor/nokia/qt/current/src/plugins/imageformats/mng/qmnghandler.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

branches/vendor/nokia/qt/current/src/plugins/imageformats/mng/qmnghandler.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

branches/vendor/nokia/qt/current/src/plugins/imageformats/svg/main.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

branches/vendor/nokia/qt/current/src/plugins/imageformats/svg/qsvgiohandler.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

branches/vendor/nokia/qt/current/src/plugins/imageformats/svg/qsvgiohandler.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

branches/vendor/nokia/qt/current/src/plugins/imageformats/tiff/main.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

branches/vendor/nokia/qt/current/src/plugins/imageformats/tiff/qtiffhandler.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

branches/vendor/nokia/qt/current/src/plugins/imageformats/tiff/qtiffhandler.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

branches/vendor/nokia/qt/current/src/plugins/inputmethods/imsw-multi/qmultiinputcontext.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

branches/vendor/nokia/qt/current/src/plugins/inputmethods/imsw-multi/qmultiinputcontext.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

branches/vendor/nokia/qt/current/src/plugins/inputmethods/imsw-multi/qmultiinputcontextplugin.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

branches/vendor/nokia/qt/current/src/plugins/inputmethods/imsw-multi/qmultiinputcontextplugin.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

branches/vendor/nokia/qt/current/src/plugins/kbddrivers/linuxinput/main.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

branches/vendor/nokia/qt/current/src/plugins/mousedrivers/linuxtp/main.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

branches/vendor/nokia/qt/current/src/plugins/mousedrivers/pc/main.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

branches/vendor/nokia/qt/current/src/plugins/mousedrivers/tslib/main.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

branches/vendor/nokia/qt/current/src/plugins/phonon/mmf/mmf.pro

@@ -36 +36 @@
            $$PHONON_MMF_DIR/dummyplayer.h            \
            $$PHONON_MMF_DIR/effectfactory.h          \
+
+
+
            $$PHONON_MMF_DIR/mediaobject.h            \
            $$PHONON_MMF_DIR/mmf_medianode.h          \
            $$PHONON_MMF_DIR/mmf_videoplayer.h        \
+
            $$PHONON_MMF_DIR/objectdump.h             \
            $$PHONON_MMF_DIR/objectdump_symbian.h     \
@@ -58 +62 @@
            $$PHONON_MMF_DIR/dummyplayer.cpp          \
            $$PHONON_MMF_DIR/effectfactory.cpp        \
+
+
+
            $$PHONON_MMF_DIR/mediaobject.cpp          \
            $$PHONON_MMF_DIR/mmf_medianode.cpp        \
            $$PHONON_MMF_DIR/mmf_videoplayer.cpp      \
+
            $$PHONON_MMF_DIR/objectdump.cpp           \
            $$PHONON_MMF_DIR/objectdump_symbian.cpp   \
@@ -82 +90 @@
 LIBS += -lapgrfx -lapmime         # For recognizer
 LIBS += -lmmfcontrollerframework  # For CMMFMetaDataEntry
+
 
 # These are for effects.

branches/vendor/nokia/qt/current/src/plugins/qpluginbase.pri

@@ -1 +1 @@
 TEMPLATE = lib
 isEmpty(QT_MAJOR_VERSION) {
-   VERSION=4.6.1
+   VERSION=4.6.
 } else {
    VERSION=$${QT_MAJOR_VERSION}.$${QT_MINOR_VERSION}.$${QT_PATCH_VERSION}

branches/vendor/nokia/qt/current/src/plugins/s60/src/qcoreapplication_3_1.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

branches/vendor/nokia/qt/current/src/plugins/s60/src/qcoreapplication_3_2.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

branches/vendor/nokia/qt/current/src/plugins/s60/src/qdesktopservices_3_1.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

branches/vendor/nokia/qt/current/src/plugins/s60/src/qdesktopservices_3_2.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

branches/vendor/nokia/qt/current/src/plugins/s60/src/qlocale_3_1.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

branches/vendor/nokia/qt/current/src/plugins/s60/src/qlocale_3_2.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

branches/vendor/nokia/qt/current/src/plugins/script/qtdbus/main.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

branches/vendor/nokia/qt/current/src/plugins/script/qtdbus/main.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

branches/vendor/nokia/qt/current/src/plugins/sqldrivers/db2/main.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

branches/vendor/nokia/qt/current/src/plugins/sqldrivers/ibase/main.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

branches/vendor/nokia/qt/current/src/plugins/sqldrivers/mysql/main.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

branches/vendor/nokia/qt/current/src/plugins/sqldrivers/oci/main.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

branches/vendor/nokia/qt/current/src/plugins/sqldrivers/odbc/main.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

branches/vendor/nokia/qt/current/src/plugins/sqldrivers/psql/main.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

branches/vendor/nokia/qt/current/src/plugins/sqldrivers/sqlite/smain.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

branches/vendor/nokia/qt/current/src/plugins/sqldrivers/sqlite2/smain.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

branches/vendor/nokia/qt/current/src/plugins/sqldrivers/tds/main.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 20 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])