Merge commit 'qt/master'

Conflicts:
	examples/opengl/samplebuffers/glwidget.cpp
	src/corelib/io/qfsfileengine_unix.cpp
	src/corelib/kernel/qobject.cpp
	src/corelib/tools/qsharedpointer.cpp
	src/gui/gui.pro
	tests/auto/qhttp/tst_qhttp.cpp
	tests/auto/qkeyevent/tst_qkeyevent.cpp

15 files changed, 303 insertions, 307 deletions

diff --git a/demos/embedded/embeddedsvgviewer/embeddedsvgviewer.cpp b/demos/embedded/embeddedsvgviewer/embeddedsvgviewer.cpp
index 0359b13..9613905 100644
--- a/demos/embedded/embeddedsvgviewer/embeddedsvgviewer.cpp
+++ b/demos/embedded/embeddedsvgviewer/embeddedsvgviewer.cpp
@@ -34,7 +34,7 @@
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
-** contact the sales department at http://www.qtsoftware.com/contact.
+** contact the sales department at http://qt.nokia.com/contact.
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/embedded/embeddedsvgviewer/embeddedsvgviewer.h b/demos/embedded/embeddedsvgviewer/embeddedsvgviewer.h
index 1171b32..2c4aba9 100644
--- a/demos/embedded/embeddedsvgviewer/embeddedsvgviewer.h
+++ b/demos/embedded/embeddedsvgviewer/embeddedsvgviewer.h
@@ -34,7 +34,7 @@
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
-** contact the sales department at http://www.qtsoftware.com/contact.
+** contact the sales department at http://qt.nokia.com/contact.
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/embedded/embeddedsvgviewer/main.cpp b/demos/embedded/embeddedsvgviewer/main.cpp
index 648e114..bea441c 100644
--- a/demos/embedded/embeddedsvgviewer/main.cpp
+++ b/demos/embedded/embeddedsvgviewer/main.cpp
@@ -34,7 +34,7 @@
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
-** contact the sales department at http://www.qtsoftware.com/contact.
+** contact the sales department at http://qt.nokia.com/contact.
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/embedded/fluidlauncher/demoapplication.cpp b/demos/embedded/fluidlauncher/demoapplication.cpp
index 31a7628..6f7159a 100644
--- a/demos/embedded/fluidlauncher/demoapplication.cpp
+++ b/demos/embedded/fluidlauncher/demoapplication.cpp
@@ -34,7 +34,7 @@
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
-** contact the sales department at http://www.qtsoftware.com/contact.
+** contact the sales department at http://qt.nokia.com/contact.
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/embedded/fluidlauncher/demoapplication.h b/demos/embedded/fluidlauncher/demoapplication.h
index 7864d85..e4e7d29 100644
--- a/demos/embedded/fluidlauncher/demoapplication.h
+++ b/demos/embedded/fluidlauncher/demoapplication.h
@@ -34,7 +34,7 @@
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
-** contact the sales department at http://www.qtsoftware.com/contact.
+** contact the sales department at http://qt.nokia.com/contact.
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/embedded/fluidlauncher/fluidlauncher.cpp b/demos/embedded/fluidlauncher/fluidlauncher.cpp
index c9cb170..e93e023 100644
--- a/demos/embedded/fluidlauncher/fluidlauncher.cpp
+++ b/demos/embedded/fluidlauncher/fluidlauncher.cpp
@@ -34,7 +34,7 @@
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
-** contact the sales department at http://www.qtsoftware.com/contact.
+** contact the sales department at http://qt.nokia.com/contact.
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/embedded/fluidlauncher/fluidlauncher.h b/demos/embedded/fluidlauncher/fluidlauncher.h
index 5adc662..7914847 100644
--- a/demos/embedded/fluidlauncher/fluidlauncher.h
+++ b/demos/embedded/fluidlauncher/fluidlauncher.h
@@ -34,7 +34,7 @@
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
-** contact the sales department at http://www.qtsoftware.com/contact.
+** contact the sales department at http://qt.nokia.com/contact.
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/embedded/fluidlauncher/main.cpp b/demos/embedded/fluidlauncher/main.cpp
index b7c78ff..85094ca 100644
--- a/demos/embedded/fluidlauncher/main.cpp
+++ b/demos/embedded/fluidlauncher/main.cpp
@@ -34,7 +34,7 @@
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
-** contact the sales department at http://www.qtsoftware.com/contact.
+** contact the sales department at http://qt.nokia.com/contact.
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/embedded/fluidlauncher/pictureflow.cpp b/demos/embedded/fluidlauncher/pictureflow.cpp
index 8be5cd3..4076f07 100644
--- a/demos/embedded/fluidlauncher/pictureflow.cpp
+++ b/demos/embedded/fluidlauncher/pictureflow.cpp
@@ -1,66 +1,67 @@
 /****************************************************************************
 **
-* Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies)
-* This is version of the Pictureflow animated image show widget modified by Nokia.
-*
-*  $QT_BEGIN_LICENSE:LGPL$
-*  No Commercial Usage
-*  This file contains pre-release code and may not be distributed.
-*  You may use this file in accordance with the terms and conditions
-*  contained in the either Technology Preview License Agreement or the
-*  Beta Release License Agreement.
-* 
-*  GNU Lesser General Public License Usage
-*  Alternatively, this file may be used under the terms of the GNU Lesser
-*  General Public License version 2.1 as published by the Free Software
-*  Foundation and appearing in the file LICENSE.LGPL included in the
-*  packaging of this file.  Please review the following information to
-*  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.0, included in the file LGPL_EXCEPTION.txt in this
-*  package.
-* 
-*  GNU General Public License Usage
-*  Alternatively, this file may be used under the terms of the GNU
-*  General Public License version 3.0 as published by the Free Software
-*  Foundation and appearing in the file LICENSE.GPL included in the
-*  packaging of this file.  Please review the following information to
-*  ensure the GNU General Public License version 3.0 requirements will be
-*  met: http://www.gnu.org/copyleft/gpl.html.
-* 
-*  If you are unsure which license is appropriate for your use, please
-*  contact the sales department at http://www.qtsoftware.com/contact.
-*  $QT_END_LICENSE$
-*
-*
-* Redistribution and use in source and binary forms, with or without
-* modification, are permitted provided that the following conditions are met:
-*     * Redistributions of source code must retain the above copyright
-*       notice, this list of conditions and the following disclaimer.
-*     * Redistributions in binary form must reproduce the above copyright
-*       notice, this list of conditions and the following disclaimer in the
-*       documentation and/or other materials provided with the distribution.
-*     * Neither the name of the <organization> nor the
-*       names of its contributors may be used to endorse or promote products
-*       derived from this software without specific prior written permission.
-*
-* THIS SOFTWARE IS PROVIDED BY TROLLTECH ASA ``AS IS'' AND ANY
-* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-* DISCLAIMED. IN NO EVENT SHALL <copyright holder> BE LIABLE FOR ANY
-* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This is a version of the Pictureflow animated image show widget modified by Nokia.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at http://qt.nokia.com/contact.
+** $QT_END_LICENSE$
+**
+** Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are met:
+**     * Redistributions of source code must retain the above copyright
+**       notice, this list of conditions and the following disclaimer.
+**     * Redistributions in binary form must reproduce the above copyright
+**       notice, this list of conditions and the following disclaimer in the
+**       documentation and/or other materials provided with the distribution.
+**     * Neither the name of the <organization> nor the
+**       names of its contributors may be used to endorse or promote products
+**       derived from this software without specific prior written permission.
+**
+** THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY
+** EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+** WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+** DISCLAIMED. IN NO EVENT SHALL Nokia Corporation BE LIABLE FOR ANY
+** DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+** (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+** LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+** ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+** SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+**
 ****************************************************************************/
 
-/* 
+/*
   ORIGINAL COPYRIGHT HEADER
   PictureFlow - animated image show widget
   http://pictureflow.googlecode.com
@@ -165,134 +166,134 @@ inline PFreal floatToFixed(float val)
 
 // warning: regenerate the table if IANGLE_MAX and PFREAL_SHIFT are changed!
 static const PFreal sinTable[IANGLE_MAX] = {
-     3,      9,     15,     21,     28,     34,     40,     47, 
-    53,     59,     65,     72,     78,     84,     90,     97, 
-   103,    109,    115,    122,    128,    134,    140,    147, 
-   153,    159,    165,    171,    178,    184,    190,    196, 
-   202,    209,    215,    221,    227,    233,    239,    245, 
-   251,    257,    264,    270,    276,    282,    288,    294, 
-   300,    306,    312,    318,    324,    330,    336,    342, 
-   347,    353,    359,    365,    371,    377,    383,    388, 
-   394,    400,    406,    412,    417,    423,    429,    434, 
-   440,    446,    451,    457,    463,    468,    474,    479, 
-   485,    491,    496,    501,    507,    512,    518,    523, 
-   529,    534,    539,    545,    550,    555,    561,    566, 
-   571,    576,    581,    587,    592,    597,    602,    607, 
-   612,    617,    622,    627,    632,    637,    642,    647, 
-   652,    656,    661,    666,    671,    675,    680,    685, 
-   690,    694,    699,    703,    708,    712,    717,    721, 
-   726,    730,    735,    739,    743,    748,    752,    756, 
-   760,    765,    769,    773,    777,    781,    785,    789, 
-   793,    797,    801,    805,    809,    813,    816,    820, 
-   824,    828,    831,    835,    839,    842,    846,    849, 
-   853,    856,    860,    863,    866,    870,    873,    876, 
-   879,    883,    886,    889,    892,    895,    898,    901, 
-   904,    907,    910,    913,    916,    918,    921,    924, 
-   927,    929,    932,    934,    937,    939,    942,    944, 
-   947,    949,    951,    954,    956,    958,    960,    963, 
-   965,    967,    969,    971,    973,    975,    977,    978, 
-   980,    982,    984,    986,    987,    989,    990,    992, 
-   994,    995,    997,    998,    999,   1001,   1002,   1003, 
-  1004,   1006,   1007,   1008,   1009,   1010,   1011,   1012, 
-  1013,   1014,   1015,   1015,   1016,   1017,   1018,   1018, 
-  1019,   1019,   1020,   1020,   1021,   1021,   1022,   1022, 
-  1022,   1023,   1023,   1023,   1023,   1023,   1023,   1023, 
-  1023,   1023,   1023,   1023,   1023,   1023,   1023,   1022, 
-  1022,   1022,   1021,   1021,   1020,   1020,   1019,   1019, 
-  1018,   1018,   1017,   1016,   1015,   1015,   1014,   1013, 
-  1012,   1011,   1010,   1009,   1008,   1007,   1006,   1004, 
-  1003,   1002,   1001,    999,    998,    997,    995,    994, 
-   992,    990,    989,    987,    986,    984,    982,    980, 
-   978,    977,    975,    973,    971,    969,    967,    965, 
-   963,    960,    958,    956,    954,    951,    949,    947, 
-   944,    942,    939,    937,    934,    932,    929,    927, 
-   924,    921,    918,    916,    913,    910,    907,    904, 
-   901,    898,    895,    892,    889,    886,    883,    879, 
-   876,    873,    870,    866,    863,    860,    856,    853, 
-   849,    846,    842,    839,    835,    831,    828,    824, 
-   820,    816,    813,    809,    805,    801,    797,    793, 
-   789,    785,    781,    777,    773,    769,    765,    760, 
-   756,    752,    748,    743,    739,    735,    730,    726, 
-   721,    717,    712,    708,    703,    699,    694,    690, 
-   685,    680,    675,    671,    666,    661,    656,    652, 
-   647,    642,    637,    632,    627,    622,    617,    612, 
-   607,    602,    597,    592,    587,    581,    576,    571, 
-   566,    561,    555,    550,    545,    539,    534,    529, 
-   523,    518,    512,    507,    501,    496,    491,    485, 
-   479,    474,    468,    463,    457,    451,    446,    440, 
-   434,    429,    423,    417,    412,    406,    400,    394, 
-   388,    383,    377,    371,    365,    359,    353,    347, 
-   342,    336,    330,    324,    318,    312,    306,    300, 
-   294,    288,    282,    276,    270,    264,    257,    251, 
-   245,    239,    233,    227,    221,    215,    209,    202, 
-   196,    190,    184,    178,    171,    165,    159,    153, 
-   147,    140,    134,    128,    122,    115,    109,    103, 
-    97,     90,     84,     78,     72,     65,     59,     53, 
-    47,     40,     34,     28,     21,     15,      9,      3, 
-    -4,    -10,    -16,    -22,    -29,    -35,    -41,    -48, 
-   -54,    -60,    -66,    -73,    -79,    -85,    -91,    -98, 
-  -104,   -110,   -116,   -123,   -129,   -135,   -141,   -148, 
-  -154,   -160,   -166,   -172,   -179,   -185,   -191,   -197, 
-  -203,   -210,   -216,   -222,   -228,   -234,   -240,   -246, 
-  -252,   -258,   -265,   -271,   -277,   -283,   -289,   -295, 
-  -301,   -307,   -313,   -319,   -325,   -331,   -337,   -343, 
-  -348,   -354,   -360,   -366,   -372,   -378,   -384,   -389, 
-  -395,   -401,   -407,   -413,   -418,   -424,   -430,   -435, 
-  -441,   -447,   -452,   -458,   -464,   -469,   -475,   -480, 
-  -486,   -492,   -497,   -502,   -508,   -513,   -519,   -524, 
-  -530,   -535,   -540,   -546,   -551,   -556,   -562,   -567, 
-  -572,   -577,   -582,   -588,   -593,   -598,   -603,   -608, 
-  -613,   -618,   -623,   -628,   -633,   -638,   -643,   -648, 
-  -653,   -657,   -662,   -667,   -672,   -676,   -681,   -686, 
-  -691,   -695,   -700,   -704,   -709,   -713,   -718,   -722, 
-  -727,   -731,   -736,   -740,   -744,   -749,   -753,   -757, 
-  -761,   -766,   -770,   -774,   -778,   -782,   -786,   -790, 
-  -794,   -798,   -802,   -806,   -810,   -814,   -817,   -821, 
-  -825,   -829,   -832,   -836,   -840,   -843,   -847,   -850, 
-  -854,   -857,   -861,   -864,   -867,   -871,   -874,   -877, 
-  -880,   -884,   -887,   -890,   -893,   -896,   -899,   -902, 
-  -905,   -908,   -911,   -914,   -917,   -919,   -922,   -925, 
-  -928,   -930,   -933,   -935,   -938,   -940,   -943,   -945, 
-  -948,   -950,   -952,   -955,   -957,   -959,   -961,   -964, 
-  -966,   -968,   -970,   -972,   -974,   -976,   -978,   -979, 
-  -981,   -983,   -985,   -987,   -988,   -990,   -991,   -993, 
-  -995,   -996,   -998,   -999,  -1000,  -1002,  -1003,  -1004, 
- -1005,  -1007,  -1008,  -1009,  -1010,  -1011,  -1012,  -1013, 
- -1014,  -1015,  -1016,  -1016,  -1017,  -1018,  -1019,  -1019, 
- -1020,  -1020,  -1021,  -1021,  -1022,  -1022,  -1023,  -1023, 
- -1023,  -1024,  -1024,  -1024,  -1024,  -1024,  -1024,  -1024, 
- -1024,  -1024,  -1024,  -1024,  -1024,  -1024,  -1024,  -1023, 
- -1023,  -1023,  -1022,  -1022,  -1021,  -1021,  -1020,  -1020, 
- -1019,  -1019,  -1018,  -1017,  -1016,  -1016,  -1015,  -1014, 
- -1013,  -1012,  -1011,  -1010,  -1009,  -1008,  -1007,  -1005, 
- -1004,  -1003,  -1002,  -1000,   -999,   -998,   -996,   -995, 
-  -993,   -991,   -990,   -988,   -987,   -985,   -983,   -981, 
-  -979,   -978,   -976,   -974,   -972,   -970,   -968,   -966, 
-  -964,   -961,   -959,   -957,   -955,   -952,   -950,   -948, 
-  -945,   -943,   -940,   -938,   -935,   -933,   -930,   -928, 
-  -925,   -922,   -919,   -917,   -914,   -911,   -908,   -905, 
-  -902,   -899,   -896,   -893,   -890,   -887,   -884,   -880, 
-  -877,   -874,   -871,   -867,   -864,   -861,   -857,   -854, 
-  -850,   -847,   -843,   -840,   -836,   -832,   -829,   -825, 
-  -821,   -817,   -814,   -810,   -806,   -802,   -798,   -794, 
-  -790,   -786,   -782,   -778,   -774,   -770,   -766,   -761, 
-  -757,   -753,   -749,   -744,   -740,   -736,   -731,   -727, 
-  -722,   -718,   -713,   -709,   -704,   -700,   -695,   -691, 
-  -686,   -681,   -676,   -672,   -667,   -662,   -657,   -653, 
-  -648,   -643,   -638,   -633,   -628,   -623,   -618,   -613, 
-  -608,   -603,   -598,   -593,   -588,   -582,   -577,   -572, 
-  -567,   -562,   -556,   -551,   -546,   -540,   -535,   -530, 
-  -524,   -519,   -513,   -508,   -502,   -497,   -492,   -486, 
-  -480,   -475,   -469,   -464,   -458,   -452,   -447,   -441, 
-  -435,   -430,   -424,   -418,   -413,   -407,   -401,   -395, 
-  -389,   -384,   -378,   -372,   -366,   -360,   -354,   -348, 
-  -343,   -337,   -331,   -325,   -319,   -313,   -307,   -301, 
-  -295,   -289,   -283,   -277,   -271,   -265,   -258,   -252, 
-  -246,   -240,   -234,   -228,   -222,   -216,   -210,   -203, 
-  -197,   -191,   -185,   -179,   -172,   -166,   -160,   -154, 
-  -148,   -141,   -135,   -129,   -123,   -116,   -110,   -104, 
-   -98,    -91,    -85,    -79,    -73,    -66,    -60,    -54, 
-   -48,    -41,    -35,    -29,    -22,    -16,    -10,     -4 
+     3,      9,     15,     21,     28,     34,     40,     47,
+    53,     59,     65,     72,     78,     84,     90,     97,
+   103,    109,    115,    122,    128,    134,    140,    147,
+   153,    159,    165,    171,    178,    184,    190,    196,
+   202,    209,    215,    221,    227,    233,    239,    245,
+   251,    257,    264,    270,    276,    282,    288,    294,
+   300,    306,    312,    318,    324,    330,    336,    342,
+   347,    353,    359,    365,    371,    377,    383,    388,
+   394,    400,    406,    412,    417,    423,    429,    434,
+   440,    446,    451,    457,    463,    468,    474,    479,
+   485,    491,    496,    501,    507,    512,    518,    523,
+   529,    534,    539,    545,    550,    555,    561,    566,
+   571,    576,    581,    587,    592,    597,    602,    607,
+   612,    617,    622,    627,    632,    637,    642,    647,
+   652,    656,    661,    666,    671,    675,    680,    685,
+   690,    694,    699,    703,    708,    712,    717,    721,
+   726,    730,    735,    739,    743,    748,    752,    756,
+   760,    765,    769,    773,    777,    781,    785,    789,
+   793,    797,    801,    805,    809,    813,    816,    820,
+   824,    828,    831,    835,    839,    842,    846,    849,
+   853,    856,    860,    863,    866,    870,    873,    876,
+   879,    883,    886,    889,    892,    895,    898,    901,
+   904,    907,    910,    913,    916,    918,    921,    924,
+   927,    929,    932,    934,    937,    939,    942,    944,
+   947,    949,    951,    954,    956,    958,    960,    963,
+   965,    967,    969,    971,    973,    975,    977,    978,
+   980,    982,    984,    986,    987,    989,    990,    992,
+   994,    995,    997,    998,    999,   1001,   1002,   1003,
+  1004,   1006,   1007,   1008,   1009,   1010,   1011,   1012,
+  1013,   1014,   1015,   1015,   1016,   1017,   1018,   1018,
+  1019,   1019,   1020,   1020,   1021,   1021,   1022,   1022,
+  1022,   1023,   1023,   1023,   1023,   1023,   1023,   1023,
+  1023,   1023,   1023,   1023,   1023,   1023,   1023,   1022,
+  1022,   1022,   1021,   1021,   1020,   1020,   1019,   1019,
+  1018,   1018,   1017,   1016,   1015,   1015,   1014,   1013,
+  1012,   1011,   1010,   1009,   1008,   1007,   1006,   1004,
+  1003,   1002,   1001,    999,    998,    997,    995,    994,
+   992,    990,    989,    987,    986,    984,    982,    980,
+   978,    977,    975,    973,    971,    969,    967,    965,
+   963,    960,    958,    956,    954,    951,    949,    947,
+   944,    942,    939,    937,    934,    932,    929,    927,
+   924,    921,    918,    916,    913,    910,    907,    904,
+   901,    898,    895,    892,    889,    886,    883,    879,
+   876,    873,    870,    866,    863,    860,    856,    853,
+   849,    846,    842,    839,    835,    831,    828,    824,
+   820,    816,    813,    809,    805,    801,    797,    793,
+   789,    785,    781,    777,    773,    769,    765,    760,
+   756,    752,    748,    743,    739,    735,    730,    726,
+   721,    717,    712,    708,    703,    699,    694,    690,
+   685,    680,    675,    671,    666,    661,    656,    652,
+   647,    642,    637,    632,    627,    622,    617,    612,
+   607,    602,    597,    592,    587,    581,    576,    571,
+   566,    561,    555,    550,    545,    539,    534,    529,
+   523,    518,    512,    507,    501,    496,    491,    485,
+   479,    474,    468,    463,    457,    451,    446,    440,
+   434,    429,    423,    417,    412,    406,    400,    394,
+   388,    383,    377,    371,    365,    359,    353,    347,
+   342,    336,    330,    324,    318,    312,    306,    300,
+   294,    288,    282,    276,    270,    264,    257,    251,
+   245,    239,    233,    227,    221,    215,    209,    202,
+   196,    190,    184,    178,    171,    165,    159,    153,
+   147,    140,    134,    128,    122,    115,    109,    103,
+    97,     90,     84,     78,     72,     65,     59,     53,
+    47,     40,     34,     28,     21,     15,      9,      3,
+    -4,    -10,    -16,    -22,    -29,    -35,    -41,    -48,
+   -54,    -60,    -66,    -73,    -79,    -85,    -91,    -98,
+  -104,   -110,   -116,   -123,   -129,   -135,   -141,   -148,
+  -154,   -160,   -166,   -172,   -179,   -185,   -191,   -197,
+  -203,   -210,   -216,   -222,   -228,   -234,   -240,   -246,
+  -252,   -258,   -265,   -271,   -277,   -283,   -289,   -295,
+  -301,   -307,   -313,   -319,   -325,   -331,   -337,   -343,
+  -348,   -354,   -360,   -366,   -372,   -378,   -384,   -389,
+  -395,   -401,   -407,   -413,   -418,   -424,   -430,   -435,
+  -441,   -447,   -452,   -458,   -464,   -469,   -475,   -480,
+  -486,   -492,   -497,   -502,   -508,   -513,   -519,   -524,
+  -530,   -535,   -540,   -546,   -551,   -556,   -562,   -567,
+  -572,   -577,   -582,   -588,   -593,   -598,   -603,   -608,
+  -613,   -618,   -623,   -628,   -633,   -638,   -643,   -648,
+  -653,   -657,   -662,   -667,   -672,   -676,   -681,   -686,
+  -691,   -695,   -700,   -704,   -709,   -713,   -718,   -722,
+  -727,   -731,   -736,   -740,   -744,   -749,   -753,   -757,
+  -761,   -766,   -770,   -774,   -778,   -782,   -786,   -790,
+  -794,   -798,   -802,   -806,   -810,   -814,   -817,   -821,
+  -825,   -829,   -832,   -836,   -840,   -843,   -847,   -850,
+  -854,   -857,   -861,   -864,   -867,   -871,   -874,   -877,
+  -880,   -884,   -887,   -890,   -893,   -896,   -899,   -902,
+  -905,   -908,   -911,   -914,   -917,   -919,   -922,   -925,
+  -928,   -930,   -933,   -935,   -938,   -940,   -943,   -945,
+  -948,   -950,   -952,   -955,   -957,   -959,   -961,   -964,
+  -966,   -968,   -970,   -972,   -974,   -976,   -978,   -979,
+  -981,   -983,   -985,   -987,   -988,   -990,   -991,   -993,
+  -995,   -996,   -998,   -999,  -1000,  -1002,  -1003,  -1004,
+ -1005,  -1007,  -1008,  -1009,  -1010,  -1011,  -1012,  -1013,
+ -1014,  -1015,  -1016,  -1016,  -1017,  -1018,  -1019,  -1019,
+ -1020,  -1020,  -1021,  -1021,  -1022,  -1022,  -1023,  -1023,
+ -1023,  -1024,  -1024,  -1024,  -1024,  -1024,  -1024,  -1024,
+ -1024,  -1024,  -1024,  -1024,  -1024,  -1024,  -1024,  -1023,
+ -1023,  -1023,  -1022,  -1022,  -1021,  -1021,  -1020,  -1020,
+ -1019,  -1019,  -1018,  -1017,  -1016,  -1016,  -1015,  -1014,
+ -1013,  -1012,  -1011,  -1010,  -1009,  -1008,  -1007,  -1005,
+ -1004,  -1003,  -1002,  -1000,   -999,   -998,   -996,   -995,
+  -993,   -991,   -990,   -988,   -987,   -985,   -983,   -981,
+  -979,   -978,   -976,   -974,   -972,   -970,   -968,   -966,
+  -964,   -961,   -959,   -957,   -955,   -952,   -950,   -948,
+  -945,   -943,   -940,   -938,   -935,   -933,   -930,   -928,
+  -925,   -922,   -919,   -917,   -914,   -911,   -908,   -905,
+  -902,   -899,   -896,   -893,   -890,   -887,   -884,   -880,
+  -877,   -874,   -871,   -867,   -864,   -861,   -857,   -854,
+  -850,   -847,   -843,   -840,   -836,   -832,   -829,   -825,
+  -821,   -817,   -814,   -810,   -806,   -802,   -798,   -794,
+  -790,   -786,   -782,   -778,   -774,   -770,   -766,   -761,
+  -757,   -753,   -749,   -744,   -740,   -736,   -731,   -727,
+  -722,   -718,   -713,   -709,   -704,   -700,   -695,   -691,
+  -686,   -681,   -676,   -672,   -667,   -662,   -657,   -653,
+  -648,   -643,   -638,   -633,   -628,   -623,   -618,   -613,
+  -608,   -603,   -598,   -593,   -588,   -582,   -577,   -572,
+  -567,   -562,   -556,   -551,   -546,   -540,   -535,   -530,
+  -524,   -519,   -513,   -508,   -502,   -497,   -492,   -486,
+  -480,   -475,   -469,   -464,   -458,   -452,   -447,   -441,
+  -435,   -430,   -424,   -418,   -413,   -407,   -401,   -395,
+  -389,   -384,   -378,   -372,   -366,   -360,   -354,   -348,
+  -343,   -337,   -331,   -325,   -319,   -313,   -307,   -301,
+  -295,   -289,   -283,   -277,   -271,   -265,   -258,   -252,
+  -246,   -240,   -234,   -228,   -222,   -216,   -210,   -203,
+  -197,   -191,   -185,   -179,   -172,   -166,   -160,   -154,
+  -148,   -141,   -135,   -129,   -123,   -116,   -110,   -104,
+   -98,    -91,    -85,    -79,    -73,    -66,    -60,    -54,
+   -48,    -41,    -35,    -29,    -22,    -16,    -10,     -4
 };
 
 // this is the program the generate the above table
@@ -335,7 +336,7 @@ inline PFreal fsin(int iangle)
   while(iangle < 0)
     iangle += IANGLE_MAX;
   return sinTable[iangle & IANGLE_MASK];
-}  
+}
 
 inline PFreal fcos(int iangle)
 {
@@ -451,7 +452,7 @@ PictureFlowPrivate::PictureFlowPrivate(PictureFlow* w)
   triggerTimer.setSingleShot(true);
   triggerTimer.setInterval(0);
   QObject::connect(&triggerTimer, SIGNAL(timeout()), widget, SLOT(render()));
-  
+
   recalc(200, 200);
   resetSlides();
 }
@@ -510,7 +511,7 @@ void PictureFlowPrivate::setSlide(int index, const QImage& image)
     slideImages[index] = image;
     surfaceCache.remove(index);
     triggerRender();
-  }  
+  }
 }
 
 int PictureFlowPrivate::getTarget() const
@@ -521,7 +522,7 @@ int PictureFlowPrivate::getTarget() const
 int PictureFlowPrivate::currentSlide() const
 {
   return centerIndex;
-} 
+}
 
 void PictureFlowPrivate::setCurrentSlide(int index)
 {
@@ -630,7 +631,7 @@ static QImage prepareSurface(QImage img, int w, int h)
   int hofs = h / 3;
 
   // offscreen buffer: black is sweet
-  QImage result(hs, w, QImage::Format_RGB16);  
+  QImage result(hs, w, QImage::Format_RGB16);
   result.fill(0);
 
   // transpose the image, this is to speed-up the rendering
@@ -707,7 +708,7 @@ QImage* PictureFlowPrivate::surface(int slideIndex)
 }
 
 
-// Schedules rendering the slides. Call this function to avoid immediate 
+// Schedules rendering the slides. Call this function to avoid immediate
 // render and thus cause less flicker.
 void PictureFlowPrivate::triggerRender()
 {
@@ -735,7 +736,7 @@ void PictureFlowPrivate::render()
       QRect rs = renderSlide(leftSlides[index], alpha, 0, c1-1);
       if(!rs.isEmpty())
         c1 = rs.left();
-    }  
+    }
     for(int index = 0; index < nright-1; index++)
     {
       int alpha = (index < nright-2) ? 256 : 128;
@@ -777,7 +778,7 @@ void PictureFlowPrivate::render()
         c1 = rs.left();
 
       alpha = (step > 0) ? 256-fade/2 : 256;
-    }  
+    }
     for(int index = 0; index < nright; index++)
     {
       int alpha = (index < nright-2) ? 256 : 128;
@@ -792,8 +793,6 @@ void PictureFlowPrivate::render()
         c2 = rs.right();
     }
 
-
-
     QPainter painter;
     painter.begin(&buffer);
 
@@ -811,7 +810,6 @@ void PictureFlowPrivate::render()
     painter.drawText( QRect(0,0, buffer.width(), (buffer.height() - slideSize().height())/4),
                       Qt::AlignCenter, captions[leftTextIndex+1]);
 
-
     painter.end();
   }
 }
@@ -841,8 +839,8 @@ int col1, int col2)
   if(!src)
     return QRect();
 
-  QRect rect(0, 0, 0, 0);  
-  
+  QRect rect(0, 0, 0, 0);
+
 #ifdef PICTUREFLOW_BILINEAR_FILTER
   int sw = src->height() / BILINEAR_STRETCH_HOR;
   int sh = src->width() / BILINEAR_STRETCH_VER;
@@ -907,10 +905,10 @@ int col1, int col2)
     if(column < 0)
       continue;
 
-    rect.setRight(x);  
+    rect.setRight(x);
     if(!flag)
       rect.setLeft(x);
-    flag = true;  
+    flag = true;
 
     int y1 = h/2;
     int y2 = y1+ 1;
@@ -940,7 +938,7 @@ int col1, int col2)
         y2++;
         pixel1 -= pixelstep;
         pixel2 += pixelstep;
-      }  
+      }
     else
       while((y1 >= 0) && (y2 < h) && (p1 >= 0))
       {
@@ -966,8 +964,8 @@ int col1, int col2)
         y2++;
         pixel1 -= pixelstep;
         pixel2 += pixelstep;
-     }  
-   }  
+     }
+   }
 
    rect.setTop(0);
    rect.setBottom(h-1);
@@ -1045,7 +1043,7 @@ void PictureFlowPrivate::updateAnimation()
     const int max = 2 * 65536;
 
     int fi = slideFrame;
-    fi -= (target << 16);  
+    fi -= (target << 16);
     if(fi < 0)
       fi = -fi;
     fi = qMin(fi, max);
@@ -1060,7 +1058,7 @@ void PictureFlowPrivate::updateAnimation()
   int pos = slideFrame & 0xffff;
   int neg = 65536 - pos;
   int tick = (step < 0) ? neg : pos;
-  PFreal ftick = (tick * PFREAL_ONE) >> 16;  
+  PFreal ftick = (tick * PFREAL_ONE) >> 16;
 
   // the leftmost and rightmost slide must fade away
   fade = pos / 256;
@@ -1090,7 +1088,7 @@ void PictureFlowPrivate::updateAnimation()
     step = 0;
     fade = 256;
     return;
-  }  
+  }
 
   for(int i = 0; i < leftSlides.count(); i++)
   {
@@ -1121,7 +1119,7 @@ void PictureFlowPrivate::updateAnimation()
     leftSlides[0].angle = (pos * itilt) >> 16;
     leftSlides[0].cx = -fmul(offsetX, ftick);
     leftSlides[0].cy = fmul(offsetY, ftick);
-  } 
+  }
 
   // must change direction ?
   if(target < index) if(step > 0)
@@ -1157,7 +1155,7 @@ PictureFlow::PictureFlow(QWidget* parent): QWidget(parent)
 PictureFlow::~PictureFlow()
 {
   delete d;
-}  
+}
 
 int PictureFlow::slideCount() const
 {
@@ -1257,7 +1255,7 @@ void PictureFlow::keyPressEvent(QKeyEvent* event)
   {
     if(event->modifiers() == Qt::ControlModifier)
       showSlide(currentSlide()-10);
-    else  
+    else
       showPrevious();
     event->accept();
     return;
@@ -1313,7 +1311,7 @@ void PictureFlow::mouseMoveEvent(QMouseEvent* event)
     {
       speed = ((qAbs(event->pos().x()-d->previousPos.x())*1000) / d->previousPosTimestamp.elapsed())
                     / (d->buffer.width() / 10);
-  
+
       if (speed < SPEED_LOWER_THRESHOLD)
         speed = SPEED_LOWER_THRESHOLD;
       else if (speed > SPEED_UPPER_LIMIT)
@@ -1321,19 +1319,17 @@ void PictureFlow::mouseMoveEvent(QMouseEvent* event)
       else {
         speed = SPEED_LOWER_THRESHOLD + (speed / 3);
 //        qDebug() << "ACCELERATION ENABLED Speed = " << speed << ", Distance = " << distanceMovedSinceLastEvent;
-        
       }
     }
-  
 
 //    qDebug() << "Speed = " << speed;
 
 //    int incr = ((event->pos().x() - d->previousPos.x())/10) * speed;
-    
+
 //    qDebug() << "Incremented by " << incr;
 
     int incr = (distanceMovedSinceLastEvent * speed);
-    
+
     //qDebug() << "(distanceMovedSinceLastEvent * speed) = " << incr;
 
     if (incr > d->pixelsToMovePerSlide*2) {
@@ -1363,8 +1359,6 @@ void PictureFlow::mouseMoveEvent(QMouseEvent* event)
         d->pixelDistanceMoved = 0;
 */
     }
-
-    
   }
 
   d->previousPos = event->pos();
diff --git a/demos/embedded/fluidlauncher/pictureflow.h b/demos/embedded/fluidlauncher/pictureflow.h
index 05090f2..adede78 100644
--- a/demos/embedded/fluidlauncher/pictureflow.h
+++ b/demos/embedded/fluidlauncher/pictureflow.h
@@ -1,64 +1,66 @@
 /****************************************************************************
-*
-* Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies)
-* This is version of the Pictureflow animated image show widget modified by Nokia.
-*
-*  $QT_BEGIN_LICENSE:LGPL$
-*  No Commercial Usage
-*  This file contains pre-release code and may not be distributed.
-*  You may use this file in accordance with the terms and conditions
-*  contained in the either Technology Preview License Agreement or the
-*  Beta Release License Agreement.
-* 
-*  GNU Lesser General Public License Usage
-*  Alternatively, this file may be used under the terms of the GNU Lesser
-*  General Public License version 2.1 as published by the Free Software
-*  Foundation and appearing in the file LICENSE.LGPL included in the
-*  packaging of this file.  Please review the following information to
-*  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.0, included in the file LGPL_EXCEPTION.txt in this
-*  package.
-* 
-*  GNU General Public License Usage
-*  Alternatively, this file may be used under the terms of the GNU
-*  General Public License version 3.0 as published by the Free Software
-*  Foundation and appearing in the file LICENSE.GPL included in the
-*  packaging of this file.  Please review the following information to
-*  ensure the GNU General Public License version 3.0 requirements will be
-*  met: http://www.gnu.org/copyleft/gpl.html.
-* 
-*  If you are unsure which license is appropriate for your use, please
-*  contact the sales department at http://www.qtsoftware.com/contact.
-*  $QT_END_LICENSE$
-*
-*
-* Redistribution and use in source and binary forms, with or without
-* modification, are permitted provided that the following conditions are met:
-*     * Redistributions of source code must retain the above copyright
-*       notice, this list of conditions and the following disclaimer.
-*     * Redistributions in binary form must reproduce the above copyright
-*       notice, this list of conditions and the following disclaimer in the
-*       documentation and/or other materials provided with the distribution.
-*     * Neither the name of the <organization> nor the
-*       names of its contributors may be used to endorse or promote products
-*       derived from this software without specific prior written permission.
-*
-* THIS SOFTWARE IS PROVIDED BY TROLLTECH ASA ``AS IS'' AND ANY
-* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-* DISCLAIMED. IN NO EVENT SHALL <copyright holder> BE LIABLE FOR ANY
-* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This is a version of the Pictureflow animated image show widget modified by Nokia.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** 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.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at http://qt.nokia.com/contact.
+** $QT_END_LICENSE$
+**
+** Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are met:
+**     * Redistributions of source code must retain the above copyright
+**       notice, this list of conditions and the following disclaimer.
+**     * Redistributions in binary form must reproduce the above copyright
+**       notice, this list of conditions and the following disclaimer in the
+**       documentation and/or other materials provided with the distribution.
+**     * Neither the name of the <organization> nor the
+**       names of its contributors may be used to endorse or promote products
+**       derived from this software without specific prior written permission.
+**
+** THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY
+** EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+** WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+** DISCLAIMED. IN NO EVENT SHALL Nokia Corporation BE LIABLE FOR ANY
+** DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+** (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+** LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+** ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+** SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+**
 ****************************************************************************/
+
 /*
   ORIGINAL COPYRIGHT HEADER
   PictureFlow - animated image show widget
@@ -93,15 +95,15 @@
 class PictureFlowPrivate;
 
 /*!
-  Class PictureFlow implements an image show widget with animation effect 
-  like Apple's CoverFlow (in iTunes and iPod). Images are arranged in form 
-  of slides, one main slide is shown at the center with few slides on 
-  the left and right sides of the center slide. When the next or previous 
-  slide is brought to the front, the whole slides flow to the right or 
-  the right with smooth animation effect; until the new slide is finally 
+  Class PictureFlow implements an image show widget with animation effect
+  like Apple's CoverFlow (in iTunes and iPod). Images are arranged in form
+  of slides, one main slide is shown at the center with few slides on
+  the left and right sides of the center slide. When the next or previous
+  slide is brought to the front, the whole slides flow to the right or
+  the right with smooth animation effect; until the new slide is finally
   placed at the center.
 
- */ 
+ */
 class PictureFlow : public QWidget
 {
 Q_OBJECT
@@ -114,7 +116,7 @@ Q_OBJECT
 public:
   /*!
     Creates a new PictureFlow widget.
-  */  
+  */
   PictureFlow(QWidget* parent = 0);
 
   /*!
@@ -134,17 +136,17 @@ public:
 
   /*!
     Returns the dimension of each slide (in pixels).
-  */  
+  */
   QSize slideSize() const;
 
   /*!
     Sets the dimension of each slide (in pixels).
-  */  
+  */
   void setSlideSize(QSize size);
 
   /*!
     Sets the zoom factor (in percent).
-  */ 
+  */
   void setZoomFactor(int zoom);
 
   /*!
@@ -161,13 +163,13 @@ public:
     Returns QImage of specified slide.
     This function will be called only whenever necessary, e.g. the 100th slide
     will not be retrived when only the first few slides are visible.
-  */  
+  */
   virtual QImage slide(int index) const;
 
   /*!
     Sets an image for specified slide. If the slide already exists,
     it will be replaced.
-  */  
+  */
   virtual void setSlide(int index, const QImage& image);
 
   virtual void setSlideCaption(int index, QString caption);
@@ -175,20 +177,20 @@ public:
   /*!
     Sets a pixmap for specified slide. If the slide already exists,
     it will be replaced.
-  */  
+  */
   virtual void setSlide(int index, const QPixmap& pixmap);
 
   /*!
     Returns the index of slide currently shown in the middle of the viewport.
-  */  
+  */
   int currentSlide() const;
 
 public slots:
 
   /*!
-    Sets slide to be shown in the middle of the viewport. No animation 
+    Sets slide to be shown in the middle of the viewport. No animation
     effect will be produced, unlike using showSlide.
-  */  
+  */
   void setCurrentSlide(int index);
 
   /*!
diff --git a/demos/embedded/fluidlauncher/slideshow.cpp b/demos/embedded/fluidlauncher/slideshow.cpp
index 8ffdd15..cb05a77 100644
--- a/demos/embedded/fluidlauncher/slideshow.cpp
+++ b/demos/embedded/fluidlauncher/slideshow.cpp
@@ -34,7 +34,7 @@
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
-** contact the sales department at http://www.qtsoftware.com/contact.
+** contact the sales department at http://qt.nokia.com/contact.
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/embedded/fluidlauncher/slideshow.h b/demos/embedded/fluidlauncher/slideshow.h
index 3cc1d7c..0bb6ed3 100644
--- a/demos/embedded/fluidlauncher/slideshow.h
+++ b/demos/embedded/fluidlauncher/slideshow.h
@@ -34,7 +34,7 @@
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
-** contact the sales department at http://www.qtsoftware.com/contact.
+** contact the sales department at http://qt.nokia.com/contact.
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/embedded/styledemo/main.cpp b/demos/embedded/styledemo/main.cpp
index e34a628..7aab532 100644
--- a/demos/embedded/styledemo/main.cpp
+++ b/demos/embedded/styledemo/main.cpp
@@ -34,7 +34,7 @@
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
-** contact the sales department at http://www.qtsoftware.com/contact.
+** contact the sales department at http://qt.nokia.com/contact.
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/embedded/styledemo/stylewidget.cpp b/demos/embedded/styledemo/stylewidget.cpp
index 26673ba..1a2f83f 100644
--- a/demos/embedded/styledemo/stylewidget.cpp
+++ b/demos/embedded/styledemo/stylewidget.cpp
@@ -34,7 +34,7 @@
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
-** contact the sales department at http://www.qtsoftware.com/contact.
+** contact the sales department at http://qt.nokia.com/contact.
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/demos/embedded/styledemo/stylewidget.h b/demos/embedded/styledemo/stylewidget.h
index 88e9461..7fe0a76 100644
--- a/demos/embedded/styledemo/stylewidget.h
+++ b/demos/embedded/styledemo/stylewidget.h
@@ -34,7 +34,7 @@
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
-** contact the sales department at http://www.qtsoftware.com/contact.
+** contact the sales department at http://qt.nokia.com/contact.
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/