Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6

13 files changed, 825 insertions, 51 deletions

diff --git a/doc/src/diagrams/qt-embedded-architecture.sk b/doc/src/diagrams/qt-embedded-architecture.sk
new file mode 100644
index 0000000..1aba03b
--- /dev/null
+++ b/doc/src/diagrams/qt-embedded-architecture.sk
@@ -0,0 +1,402 @@
+##Sketch 1 2
+document()
+layout('A4',0)
+layer('Layer 1',1,1,0,0,(0,0,0))
+gl([(0,(1,1,1)),(0.29,(1,1,1)),(1,(0.396,0.396,0.396))])
+pgr(0.5,0.5,0)
+fp()
+le()
+lw(1)
+lj(1)
+b()
+bs(284.808,72.5,0)
+bs(282.5,72.5,0)
+bs(282.5,77.5,0)
+bs(287.5,77.5,0)
+bs(287.5,72.5,0)
+bs(284.808,72.5,0)
+gl([(0,(1,1,1)),(0.29,(1,1,1)),(1,(0.396,0.396,0.396))])
+pgr(0.5,0.5,0)
+fp()
+le()
+lw(1)
+lj(1)
+b()
+bs(12.308,72.5,0)
+bs(10,72.5,0)
+bs(10,77.5,0)
+bs(15,77.5,0)
+bs(15,72.5,0)
+bs(12.308,72.5,0)
+gl([(0,(1,1,1)),(1,(0.396,0.396,0.396))])
+pgl(0,-1,0)
+fp()
+le()
+lw(1)
+lj(1)
+b()
+bs(148.669,72.5,0)
+bs(12.5,72.5,0)
+bs(12.5,75,0)
+bs(285,75,0)
+bs(285,72.5,0)
+bs(148.669,72.5,0)
+gl([(0,(1,1,1)),(0.29,(1,1,1)),(1,(0.396,0.396,0.396))])
+pgr(0.5,0.5,0)
+fp()
+le()
+lw(1)
+lj(1)
+b()
+bs(94.808,32.5,0)
+bs(92.5,32.5,0)
+bs(92.5,37.5,0)
+bs(97.5,37.5,0)
+bs(97.5,32.5,0)
+bs(94.808,32.5,0)
+gl([(0,(1,1,1)),(0.29,(1,1,1)),(1,(0.396,0.396,0.396))])
+pgr(0.5,0.5,0)
+fp()
+le()
+lw(1)
+lj(1)
+b()
+bs(284.808,32.5,0)
+bs(282.5,32.5,0)
+bs(282.5,37.5,0)
+bs(287.5,37.5,0)
+bs(287.5,32.5,0)
+bs(284.808,32.5,0)
+gl([(0,(1,1,1)),(0.29,(1,1,1)),(1,(0.396,0.396,0.396))])
+pgr(0.5,0.5,0)
+fp()
+le()
+lw(1)
+lj(1)
+b()
+bs(284.808,112.5,0)
+bs(282.5,112.5,0)
+bs(282.5,117.5,0)
+bs(287.5,117.5,0)
+bs(287.5,112.5,0)
+bs(284.808,112.5,0)
+gl([(0,(1,1,1)),(0.29,(1,1,1)),(1,(0.396,0.396,0.396))])
+pgr(0.5,0.5,0)
+fp()
+le()
+lw(1)
+lj(1)
+b()
+bs(12.308,32.5,0)
+bs(10,32.5,0)
+bs(10,37.5,0)
+bs(15,37.5,0)
+bs(15,32.5,0)
+bs(12.308,32.5,0)
+gl([(0,(1,1,1)),(0.29,(1,1,1)),(1,(0.396,0.396,0.396))])
+pgr(0.5,0.5,0)
+fp()
+le()
+lw(1)
+lj(1)
+b()
+bs(202.308,32.5,0)
+bs(200,32.5,0)
+bs(200,37.5,0)
+bs(205,37.5,0)
+bs(205,32.5,0)
+bs(202.308,32.5,0)
+gl([(0,(1,1,1)),(0.29,(1,1,1)),(1,(0.396,0.396,0.396))])
+pgr(0.5,0.5,0)
+fp()
+le()
+lw(1)
+lj(1)
+b()
+bs(12.308,112.5,0)
+bs(10,112.5,0)
+bs(10,117.5,0)
+bs(15,117.5,0)
+bs(15,112.5,0)
+bs(12.308,112.5,0)
+gl([(0,(1,1,1)),(0.29,(1,1,1)),(1,(0.396,0.396,0.396))])
+pgr(0.5,0.5,0)
+fp()
+le()
+lw(1)
+lj(1)
+b()
+bs(94.808,60,0)
+bs(92.5,60,0)
+bs(92.5,65,0)
+bs(97.5,65,0)
+bs(97.5,60,0)
+bs(94.808,60,0)
+gl([(0,(1,1,1)),(0.29,(1,1,1)),(1,(0.396,0.396,0.396))])
+pgr(0.5,0.5,0)
+fp()
+le()
+lw(1)
+lj(1)
+b()
+bs(284.808,60,0)
+bs(282.5,60,0)
+bs(282.5,65,0)
+bs(287.5,65,0)
+bs(287.5,60,0)
+bs(284.808,60,0)
+gl([(0,(1,1,1)),(0.29,(1,1,1)),(1,(0.396,0.396,0.396))])
+pgr(0.5,0.5,0)
+fp()
+le()
+lw(1)
+lj(1)
+b()
+bs(284.808,150,0)
+bs(282.5,150,0)
+bs(282.5,155,0)
+bs(287.5,155,0)
+bs(287.5,150,0)
+bs(284.808,150,0)
+gl([(0,(1,1,1)),(0.29,(1,1,1)),(1,(0.396,0.396,0.396))])
+pgr(0.5,0.5,0)
+fp()
+le()
+lw(1)
+lj(1)
+b()
+bs(284.808,100,0)
+bs(282.5,100,0)
+bs(282.5,105,0)
+bs(287.5,105,0)
+bs(287.5,100,0)
+bs(284.808,100,0)
+gl([(0,(1,1,1)),(1,(0.396,0.396,0.396))])
+pgl(0,-1,0)
+fp()
+le()
+lw(1)
+lj(1)
+b()
+bs(53.7255,32.5,0)
+bs(12.5,32.5,0)
+bs(12.5,35,0)
+bs(95,35,0)
+bs(95,32.5,0)
+bs(53.7255,32.5,0)
+gl([(0,(1,1,1)),(1,(0.396,0.396,0.396))])
+pgl(0,-1,0)
+fp()
+le()
+lw(1)
+lj(1)
+b()
+bs(243.725,32.5,0)
+bs(202.5,32.5,0)
+bs(202.5,35,0)
+bs(285,35,0)
+bs(285,32.5,0)
+bs(243.725,32.5,0)
+gl([(0,(1,1,1)),(1,(0.396,0.396,0.396))])
+pgl(0,-1,0)
+fp()
+le()
+lw(1)
+lj(1)
+b()
+bs(148.669,112.5,0)
+bs(12.5,112.5,0)
+bs(12.5,115,0)
+bs(285,115,0)
+bs(285,112.5,0)
+bs(148.669,112.5,0)
+gl([(0,(1,1,1)),(1,(0.396,0.396,0.396))])
+pgl(1,0,0)
+fp()
+le()
+lw(1)
+lj(1)
+b()
+bs(96.249,35,0)
+bs(95,35,0)
+bs(95,62.5,0)
+bs(97.5,62.5,0)
+bs(97.5,35,0)
+bs(96.249,35,0)
+gl([(0,(1,1,1)),(1,(0.396,0.396,0.396))])
+pgl(1,0,0)
+fp()
+le()
+lw(1)
+lj(1)
+b()
+bs(286.249,35,0)
+bs(285,35,0)
+bs(285,62.5,0)
+bs(287.5,62.5,0)
+bs(287.5,35,0)
+bs(286.249,35,0)
+gl([(0,(1,1,1)),(1,(0.396,0.396,0.396))])
+pgl(1,0,0)
+fp()
+le()
+lw(1)
+lj(1)
+b()
+bs(286.249,115,0)
+bs(285,115,0)
+bs(285,152.5,0)
+bs(287.5,152.5,0)
+bs(287.5,115,0)
+bs(286.249,115,0)
+gl([(0,(1,1,1)),(1,(0.396,0.396,0.396))])
+pgl(1,0,0)
+fp()
+le()
+lw(1)
+lj(1)
+b()
+bs(286.249,75,0)
+bs(285,75,0)
+bs(285,102.5,0)
+bs(287.5,102.5,0)
+bs(287.5,75,0)
+bs(286.249,75,0)
+gl([(0,(0.13,0.255,0.167)),(1,(0.165,0.362,0.168))])
+pgl(0,-1,0)
+fp()
+r(85,0,0,-30,10,65)
+gl([(0,(0.542,0.544,0.197)),(1,(0.855,0.859,0.231))])
+pgl(0,-1,0)
+fp()
+r(85,0,0,-30,200,65)
+fp((1,1,1))
+b()
+bs(10,135,0)
+bs(285,135,0)
+bs(285,155,0)
+bs(10,155,0)
+bs(10,135,0)
+bC()
+fp((0.8,0.8,0.8))
+b()
+bs(10,115,0)
+bs(285,115,0)
+bs(285,135,0)
+bs(10,135,0)
+bs(10,115,0)
+bC()
+fp((0.651,0.808,0.224))
+b()
+bs(10,75,0)
+bs(285,75,0)
+bs(285,105,0)
+bs(10,105,0)
+bs(10,75,0)
+bC()
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('Application Source Code',(81.47,141.384))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('Qt API',(129.824,121.384))
+fp((1,1,1))
+le()
+lw(1)
+Fn('Helvetica')
+txt('Linux',(38.16,46.384))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('S60',(231.826,46.384))
+fp((1,1,1))
+Fn('Helvetica')
+txt('Qt for Embedded Platforms',(74.804,85.126))
+G()
+G()
+gl([(0,(1,1,1)),(0.29,(1,1,1)),(1,(0.396,0.396,0.396))])
+pgr(0.5,0.5,0)
+fp()
+le()
+lw(1)
+lj(1)
+b()
+bs(189.808,32.5,0)
+bs(187.5,32.5,0)
+bs(187.5,37.5,0)
+bs(192.5,37.5,0)
+bs(192.5,32.5,0)
+bs(189.808,32.5,0)
+gl([(0,(1,1,1)),(0.29,(1,1,1)),(1,(0.396,0.396,0.396))])
+pgr(0.5,0.5,0)
+fp()
+le()
+lw(1)
+lj(1)
+b()
+bs(189.808,60,0)
+bs(187.5,60,0)
+bs(187.5,65,0)
+bs(192.5,65,0)
+bs(192.5,60,0)
+bs(189.808,60,0)
+gl([(0,(1,1,1)),(1,(0.396,0.396,0.396))])
+pgl(1,0,0)
+fp()
+le()
+lw(1)
+lj(1)
+b()
+bs(191.249,35,0)
+bs(190,35,0)
+bs(190,62.5,0)
+bs(192.5,62.5,0)
+bs(192.5,35,0)
+bs(191.249,35,0)
+G_()
+gl([(0,(1,1,1)),(0.29,(1,1,1)),(1,(0.396,0.396,0.396))])
+pgr(0.5,0.5,0)
+fp()
+le()
+lw(1)
+lj(1)
+b()
+bs(107.308,32.5,0)
+bs(105,32.5,0)
+bs(105,37.5,0)
+bs(110,37.5,0)
+bs(110,32.5,0)
+bs(107.308,32.5,0)
+gl([(0,(1,1,1)),(1,(0.396,0.396,0.396))])
+pgl(0,-1,0)
+fp()
+le()
+lw(1)
+lj(1)
+b()
+bs(148.725,32.5,0)
+bs(107.5,32.5,0)
+bs(107.5,35,0)
+bs(190,35,0)
+bs(190,32.5,0)
+bs(148.725,32.5,0)
+gl([(0,(0.384,0.491,0.805)),(1,(0.617,0.746,1))])
+pgl(0,-1,0)
+fp()
+r(85,0,0,-30,105,65)
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('Windows CE',(113.162,46.384))
+G_()
+le()
+lw(1)
+r(277.5,0,0,-125,10,155)
+guidelayer('Guide Lines',1,0,0,1,(0,0,1))
+grid((0,0,2.5,2.5),1,(0,0,1),'Grid')
diff --git a/doc/src/diagrams/qtopiacore/home-screen.png b/doc/src/diagrams/qtopiacore/home-screen.png
new file mode 100644
index 0000000..400c448
--- /dev/null
+++ b/doc/src/diagrams/qtopiacore/home-screen.png
diff --git a/doc/src/diagrams/qtopiacore/qt-embedded-linux-architecture.sk b/doc/src/diagrams/qtopiacore/qt-embedded-linux-architecture.sk
new file mode 100644
index 0000000..ee60589
--- /dev/null
+++ b/doc/src/diagrams/qtopiacore/qt-embedded-linux-architecture.sk
@@ -0,0 +1,300 @@
+##Sketch 1 2
+document()
+layout('A4',0)
+layer('Layer 1',1,1,0,0,(0,0,0))
+gl([(0,(1,1,1)),(0.29,(1,1,1)),(1,(0.396,0.396,0.396))])
+pgr(0.5,0.5,0)
+fp()
+le()
+lw(1)
+lj(1)
+b()
+bs(284.808,72.5,0)
+bs(282.5,72.5,0)
+bs(282.5,77.5,0)
+bs(287.5,77.5,0)
+bs(287.5,72.5,0)
+bs(284.808,72.5,0)
+gl([(0,(1,1,1)),(0.29,(1,1,1)),(1,(0.396,0.396,0.396))])
+pgr(0.5,0.5,0)
+fp()
+le()
+lw(1)
+lj(1)
+b()
+bs(12.308,72.5,0)
+bs(10,72.5,0)
+bs(10,77.5,0)
+bs(15,77.5,0)
+bs(15,72.5,0)
+bs(12.308,72.5,0)
+gl([(0,(1,1,1)),(1,(0.396,0.396,0.396))])
+pgl(0,-1,0)
+fp()
+le()
+lw(1)
+lj(1)
+b()
+bs(148.669,72.5,0)
+bs(12.5,72.5,0)
+bs(12.5,75,0)
+bs(285,75,0)
+bs(285,72.5,0)
+bs(148.669,72.5,0)
+gl([(0,(1,1,1)),(0.29,(1,1,1)),(1,(0.396,0.396,0.396))])
+pgr(0.5,0.5,0)
+fp()
+le()
+lw(1)
+lj(1)
+b()
+bs(284.808,32.5,0)
+bs(282.5,32.5,0)
+bs(282.5,37.5,0)
+bs(287.5,37.5,0)
+bs(287.5,32.5,0)
+bs(284.808,32.5,0)
+gl([(0,(1,1,1)),(0.29,(1,1,1)),(1,(0.396,0.396,0.396))])
+pgr(0.5,0.5,0)
+fp()
+le()
+lw(1)
+lj(1)
+b()
+bs(284.808,112.5,0)
+bs(282.5,112.5,0)
+bs(282.5,117.5,0)
+bs(287.5,117.5,0)
+bs(287.5,112.5,0)
+bs(284.808,112.5,0)
+gl([(0,(1,1,1)),(0.29,(1,1,1)),(1,(0.396,0.396,0.396))])
+pgr(0.5,0.5,0)
+fp()
+le()
+lw(1)
+lj(1)
+b()
+bs(12.308,32.5,0)
+bs(10,32.5,0)
+bs(10,37.5,0)
+bs(15,37.5,0)
+bs(15,32.5,0)
+bs(12.308,32.5,0)
+gl([(0,(1,1,1)),(0.29,(1,1,1)),(1,(0.396,0.396,0.396))])
+pgr(0.5,0.5,0)
+fp()
+le()
+lw(1)
+lj(1)
+b()
+bs(12.308,112.5,0)
+bs(10,112.5,0)
+bs(10,117.5,0)
+bs(15,117.5,0)
+bs(15,112.5,0)
+bs(12.308,112.5,0)
+gl([(0,(1,1,1)),(0.29,(1,1,1)),(1,(0.396,0.396,0.396))])
+pgr(0.5,0.5,0)
+fp()
+le()
+lw(1)
+lj(1)
+b()
+bs(284.808,60,0)
+bs(282.5,60,0)
+bs(282.5,65,0)
+bs(287.5,65,0)
+bs(287.5,60,0)
+bs(284.808,60,0)
+gl([(0,(1,1,1)),(0.29,(1,1,1)),(1,(0.396,0.396,0.396))])
+pgr(0.5,0.5,0)
+fp()
+le()
+lw(1)
+lj(1)
+b()
+bs(284.808,150,0)
+bs(282.5,150,0)
+bs(282.5,155,0)
+bs(287.5,155,0)
+bs(287.5,150,0)
+bs(284.808,150,0)
+gl([(0,(1,1,1)),(0.29,(1,1,1)),(1,(0.396,0.396,0.396))])
+pgr(0.5,0.5,0)
+fp()
+le()
+lw(1)
+lj(1)
+b()
+bs(284.808,100,0)
+bs(282.5,100,0)
+bs(282.5,105,0)
+bs(287.5,105,0)
+bs(287.5,100,0)
+bs(284.808,100,0)
+gl([(0,(1,1,1)),(1,(0.396,0.396,0.396))])
+pgl(0,-1,0)
+fp()
+le()
+lw(1)
+lj(1)
+b()
+bs(148.669,32.5,0)
+bs(12.5,32.5,0)
+bs(12.5,35,0)
+bs(285,35,0)
+bs(285,32.5,0)
+bs(148.669,32.5,0)
+gl([(0,(1,1,1)),(1,(0.396,0.396,0.396))])
+pgl(0,-1,0)
+fp()
+le()
+lw(1)
+lj(1)
+b()
+bs(148.669,112.5,0)
+bs(12.5,112.5,0)
+bs(12.5,115,0)
+bs(285,115,0)
+bs(285,112.5,0)
+bs(148.669,112.5,0)
+gl([(0,(1,1,1)),(1,(0.396,0.396,0.396))])
+pgl(1,0,0)
+fp()
+le()
+lw(1)
+lj(1)
+b()
+bs(286.249,35,0)
+bs(285,35,0)
+bs(285,62.5,0)
+bs(287.5,62.5,0)
+bs(287.5,35,0)
+bs(286.249,35,0)
+gl([(0,(1,1,1)),(1,(0.396,0.396,0.396))])
+pgl(1,0,0)
+fp()
+le()
+lw(1)
+lj(1)
+b()
+bs(286.249,115,0)
+bs(285,115,0)
+bs(285,152.5,0)
+bs(287.5,152.5,0)
+bs(287.5,115,0)
+bs(286.249,115,0)
+gl([(0,(1,1,1)),(1,(0.396,0.396,0.396))])
+pgl(1,0,0)
+fp()
+le()
+lw(1)
+lj(1)
+b()
+bs(286.249,75,0)
+bs(285,75,0)
+bs(285,102.5,0)
+bs(287.5,102.5,0)
+bs(287.5,75,0)
+bs(286.249,75,0)
+gl([(0,(0,0,0)),(1,(0.362,0.362,0.362))])
+pgl(0,-1,0)
+fp()
+r(275,0,0,-30,10,65)
+fp((1,1,1))
+b()
+bs(10,135,0)
+bs(285,135,0)
+bs(285,155,0)
+bs(10,155,0)
+bs(10,135,0)
+bC()
+fp((0.8,0.8,0.8))
+b()
+bs(10,115,0)
+bs(285,115,0)
+bs(285,135,0)
+bs(10,135,0)
+bs(10,115,0)
+bC()
+fp((0.651,0.808,0.224))
+b()
+bs(10,75,0)
+bs(285,75,0)
+bs(285,105,0)
+bs(10,105,0)
+bs(10,75,0)
+bC()
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('Application Source Code',(81.47,141.384))
+fp((0,0,0))
+le()
+lw(1)
+Fn('Helvetica')
+txt('Qt API',(129.824,121.384))
+gl([(0,(0.248,0.248,0.248)),(1,(0.362,0.362,0.362))])
+pgl(0,-1,0)
+fp()
+le()
+lw(0.5)
+b()
+bs(105,40,0)
+bs(115,60,0)
+bs(200,60,0)
+bs(190,40,0)
+bs(105,40,0)
+bC()
+fp((0.788,0.13,0.13))
+le()
+lw(0.5)
+b()
+bs(190,40,0)
+bs(200,60,0)
+bs(280,60,0)
+bs(280,40,0)
+bs(190,40,0)
+bC()
+fp((1,1,1))
+le()
+lw(1)
+Fn('Helvetica')
+txt('Framebuffer',(120,46.384))
+gl([(0,(0.248,0.248,0.248)),(1,(0.362,0.362,0.362))])
+pgl(0,-1,0)
+fp()
+le()
+lw(0.5)
+b()
+bs(15,40,0)
+bs(15,60,0)
+bs(110,60,0)
+bs(99.4444,40,0)
+bs(15,40,0)
+bC()
+fp((1,1,1))
+le()
+lw(1)
+Fn('Helvetica')
+txt('Linux Kernel',(25,46.384))
+G()
+fp((1,1,1))
+le()
+lw(1)
+Fn('Helvetica')
+Fs(8)
+txt('Accelerated',(217.76,51.756))
+fp((1,1,1))
+le()
+lw(1)
+Fn('Helvetica')
+Fs(8)
+txt('Graphics',(222.876,42.6))
+G_()
+fp((1,1,1))
+Fn('Helvetica')
+txt('Qt for Embedded Linux',(85.802,85.126))
+guidelayer('Guide Lines',1,0,0,1,(0,0,1))
+grid((0,0,2.5,2.5),1,(0,0,1),'Grid')
diff --git a/doc/src/frameworks-technologies/gestures.qdoc b/doc/src/frameworks-technologies/gestures.qdoc
index c9ca305..57f25ba 100644
--- a/doc/src/frameworks-technologies/gestures.qdoc
+++ b/doc/src/frameworks-technologies/gestures.qdoc
@@ -47,44 +47,104 @@
     \ingroup howto
     \brief An overview of the Qt support for Gesture programming.
 
-    The QGesture class provides the ability to form gestures from a series
-    of events independent of the input method. A gesture could be a particular
-    movement of a mouse, a touch screen action, or a series of events from
-    some other source. The nature of the input, the interpretation
-    of the gesture and the action taken are the choice of the implementing
+    Qt includes a framework for gesture programming that gives has the ability
+    to form gestures from a series of events, independently of the input methods
+    used. A gesture could be a particular movement of a mouse, a touch screen
+    action, or a series of events from some other source. The nature of the input,
+    the interpretation of the gesture and the action taken are the choice of the
     developer.
 
     \tableofcontents
 
+    \section1 Overview
 
-    \section1   Creating Your Own Gesture Recognizer
+    QGesture is the central class in Qt's gesture framework, providing the API
+    used by classes that represent specific gestures, such as QPanGesture,
+    QPinchGesture, and QSwipeGesture. These standard classes are ready to use,
+    and each exposes functions and properties that give gesture-specific
+    information about the user's input. This is described in the
+    \l{#Using Standard Gestures}{Using Standard Gestures} section.
+
+    QGesture is also designed to be subclassed and extended so that support for
+    new gestures can be implemented by developers. Adding support for a new
+    gesture involves implementing code to recognize the gesture from incoming
+    events. This is described in the
+    \l{#Creating Your Own Gesture Recognizer}{Creating Your Own Gesture Recognizer}
+    section.
+
+    \section1 Using Standard Gestures with Widgets
+
+    Gesture objects are applied directly to widgets and other controls that accept
+    user input \mdash these are the \e{target objects}. When a gesture object is
+    constructed, the target object is typically passed to the constructor, though
+    it can also be passed as the argument to the \l{QGesture::}{setGestureTarget()}
+    function.
+
+    \snippet examples/gestures/imageviewer/imagewidget.cpp construct swipe gesture
+
+    In the above code, the gesture is set up in the constructor of the target object
+    itself, so the argument to the QSwipeGesture constructor is \e this.
+
+    When the user performs a gesture, various signals may be emitted by the
+    gesture object. To monitor the user's actions, you need to connect signals
+    from the gesture object to slots in your code.
+
+    \snippet examples/gestures/imageviewer/imagewidget.cpp connect swipe gesture
+
+    Here, the \l{QGesture::}{triggered()} signal is used to inform the application
+    that a gesture was used. More precise monitoring of a gesture can be implemented
+    by connecting its \l{QGesture::}{started()}, \l{QGesture::}{canceled()} and
+    \l{QGesture::}{finished()} signals to slots.
+
+    Responding to a signal is simply a matter of obtaining the gesture that sent
+    it and examining the information it contains.
+
+    \snippet examples/gestures/imageviewer/imagewidget.cpp swipe slot start
+
+    \snippet examples/gestures/imageviewer/imagewidget.cpp swipe slot finish
+
+    Here, we examine the direction in which the user swiped the widget and modify
+    its contents accordingly.
+
+    \section1 Using Standard Gestures with Graphics Items
+
+    The approach used for applying gestures to widgets can also be used with
+    graphics items. However, instead of passing a target object to the
+    gesture object's constructor, you set a target graphics item with the
+    \l{QGesture::}{setGraphicsItem()} function.
+
+    \section1 Creating Your Own Gesture Recognizer
 
     QGesture is a base class for a user defined gesture recognizer class. In
     order to implement the recognizer you will need to subclass the
-    QGesture class and implement the pure virtual function \l{QGesture::filterEvent()}{filterEvent()}. Once
-    you have implemented the \l{QGesture::filterEvent()}{filterEvent()} function to
+    QGesture class and implement the pure virtual function
+    \l{QGesture::}{filterEvent()} to filter out events that are not relevant
+    to your gesture.
+
+    Once you have implemented the \l{QGesture::}{filterEvent()} function to
     make your own recognizer you can process events. A sequence of events may,
     according to your own rules, represent a gesture. The events can be singly
-    passed to the recognizer via the \l{QGesture::filterEvent()}{filterEvent()} function or as a stream of
-    events by specifying a parent source of events. The events can be from any
-    source and could result in any action as defined by the user. The source
-    and action need not be graphical though that would be the most likely
-    scenario. To find how to connect a source of events to automatically feed into the recognizer see QGesture.
+    passed to the recognizer via the \l{QGesture::}{filterEvent()} function
+    or as a stream of events by specifying a parent source of events. The events
+    can be from any source and could result in any action as defined by the user.
+    The source and action need not be graphical, though that would be the most
+    likely scenario. To find how to connect a source of events to automatically
+    feed into the recognizer see the QGesture documentation.
 
     Recognizers based on QGesture can emit any of the following signals:
 
     \snippet doc/src/snippets/gestures/qgesture.h  qgesture-signals
 
     These signals are emitted when the state changes with the call to
-    \l{QGesture::updateState()}{updateState()}, more than one signal may
+    \l{QGesture::}{updateState()}, more than one signal may
     be emitted when a change of state occurs. There are four GestureStates
 
     \table
-    \header \o New State                \o Description              \o QGesture Actions on Entering this State
-    \row    \o Qt::NoGesture        \o Initial value            \o emit \l {QGesture::canceled()}{canceled()}
-    \row    \o Qt::GestureStarted   \o A continuous gesture has started \o emit \l{QGesture::started()}{started()} and emit \l{QGesture::triggered()}{triggered()}
-    \row    \o Qt::GestureUpdated   \o A gesture continues      \o emit \l{QGesture::triggered()}{triggered()}
-    \row    \o Qt::GestureFinished  \o A gesture has finished.  \o emit \l{QGesture::finished()}{finished()}
+    \header \o New State            \o Description              \o QGesture Actions on Entering this State
+    \row    \o Qt::NoGesture        \o Initial value            \o emit \l {QGesture::}{cancelled()}
+    \row    \o Qt::GestureStarted   \o A continuous gesture has started \o emit \l{QGesture::}{started()} and emit \l{QGesture::}{triggered()}
+    \row    \o Qt::GestureUpdated   \o A gesture continues      \o emit \l{QGesture::}{triggered()}
+    \row    \o Qt::GestureFinished  \o A gesture has finished.  \o emit \l{QGesture::}{finished()}
     \endtable
 
     \note \l{QGesture::started()}{started()} can be emitted if entering any
@@ -105,12 +165,12 @@
     conclude with a call to \l{QGesture::updateState()}{updateState()} to
     change the current state to Qt::NoGesture.
 
-    \section1   An Example, ImageViewer
+    \section1 The ImageViewer Example
 
     To illustrate how to use QGesture we will look at the ImageViewer
-    example. This example uses QPanGesture, standard gesture, and an
+    example. This example uses QPanGesture, a standard gesture, and an
     implementation of TapAndHoldGesture. Note that TapAndHoldGesture is
-    platform dependent.
+    platform-dependent.
 
     \snippet doc/src/snippets/gestures/imageviewer/tapandholdgesture.cpp tapandhold-reset
 
@@ -156,8 +216,8 @@
     Following the logic of how the QEvent is processed we can summmarize
     it as follows:
     \list
-        \o filterEvent() becomes the event filter of the parent ImageWidget object for a QPanGesture object and a
-    TapAndHoldGesture object.
+        \o filterEvent() becomes the event filter of the parent ImageWidget object
+        for a QPanGesture object and a TapAndHoldGesture object.
         \o filterEvent() then calls updateState() to change states
         \o updateState() emits the appropriate signal(s) for the state change.
         \o The signals are caught by the defined slots in ImageWidget
diff --git a/doc/src/getting-started/installation.qdoc b/doc/src/getting-started/installation.qdoc
index 2217a90..1a20be9 100644
--- a/doc/src/getting-started/installation.qdoc
+++ b/doc/src/getting-started/installation.qdoc
@@ -589,6 +589,10 @@ If you are using pre-built binaries, follow the instructions
         To configure Qt for S60, do:
 
         \snippet doc/src/snippets/code/doc_src_installation.qdoc 23
+        to build the tools using MinGW, and the libraries using abld.
+        or
+        \snippet doc/src/snippets/code/doc_src_installation.qdoc 31
+        to build the tools using MinGW, and the libraries using sbsv2.
 
         For other options, type \c{configure -help} to get a list of all available
         options.
@@ -957,6 +961,7 @@ If you are using pre-built binaries, follow the instructions
 
     Qt for S60 requires the following software installed on your development PC:
     \list
+        \o \l{http://www.mingw.org/}{MinGW 3.4.5 or higher}, or another windows compiler to build the tools.
         \o \l{http://www.forum.nokia.com/main/resources/tools_and_sdks/carbide_cpp/}{Carbide.c++ v2.0.0 or higher}           
            \list
            \o \bold{Note:} It may be necessary to update the Carbide compiler.
@@ -966,7 +971,7 @@ If you are using pre-built binaries, follow the instructions
         \o \l{http://www.forum.nokia.com/main/resources/tools_and_sdks/S60SDK/}{S60 Platform SDK 3rd Edition FP1 or higher}
         \o \l{http://www.forum.nokia.com/main/resources/technologies/openc_cpp/}{Open C/C++ v1.6.0 or higher}. 
            Install this to all S60 SDKs you plan to use Qt with.
-        \o Building Qt libraries requires \l{http://www.arm.com/products/DevTools/RVCT.html}{RVCT} 2.2 [build 616] or later,
+        \o Building Qt libraries requires \l{http://www.arm.com/products/DevTools/RVCT.html}{RVCT} 2.2 [build 686] or later,
            which is not available free of charge. 
     \endlist
 
diff --git a/doc/src/images/qt-embedded-architecture.png b/doc/src/images/qt-embedded-architecture.png
index 97a29d0..d3f8edc 100644
--- a/doc/src/images/qt-embedded-architecture.png
+++ b/doc/src/images/qt-embedded-architecture.png
diff --git a/doc/src/images/qt-embedded-linux-architecture.png b/doc/src/images/qt-embedded-linux-architecture.png
new file mode 100644
index 0000000..abf5bd8
--- /dev/null
+++ b/doc/src/images/qt-embedded-linux-architecture.png
diff --git a/doc/src/modules.qdoc b/doc/src/modules.qdoc
index 7a5fb4d..1c63d46 100644
--- a/doc/src/modules.qdoc
+++ b/doc/src/modules.qdoc
@@ -581,8 +581,10 @@
     \legalese
     This file is part of the KDE project
 
-    Copyright (C) 2005-2007 Matthias Kretz <kretz@kde.org> \BR
-    Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+    Copyright (C) 2004-2009 Matthias Kretz <kretz@kde.org> \BR
+    Copyright (C) 2008 Ian Monroe <ian@monroe.nu> \BR
+    Copyright (C) 2007-2008 Trolltech ASA \BR
+    Copyright (C) 2008-2009 Nokia Corporation and/or its subsidiary(-ies). \BR
     Contact: Nokia Corporation (qt-info@nokia.com)
 
     This library is free software; you can redistribute it and/or
diff --git a/doc/src/platforms/qt-embedded-linux.qdoc b/doc/src/platforms/qt-embedded-linux.qdoc
index ba1bce9..21cbf3b 100644
--- a/doc/src/platforms/qt-embedded-linux.qdoc
+++ b/doc/src/platforms/qt-embedded-linux.qdoc
@@ -63,7 +63,7 @@
     with Embedded Linux.  Qt for Embedded Linux provides the standard Qt API for
     embedded devices with a lightweight window system.
 
-    \image qt-embedded-architecture.png
+    \image qt-embedded-linux-architecture.png
 
     Qt for Embedded Linux applications write directly to the framebuffer,
     eliminating the need for the X Window System and saving memory.
diff --git a/doc/src/platforms/qt-embedded.qdoc b/doc/src/platforms/qt-embedded.qdoc
index 6928a67..0b2c2ac 100644
--- a/doc/src/platforms/qt-embedded.qdoc
+++ b/doc/src/platforms/qt-embedded.qdoc
@@ -49,28 +49,28 @@
     of desktop platforms. The features provided for each platform depend on the
     capabilities and architecture of the operating system.
 
-    Currently, two embedded platforms are supported by Qt:
+    \image qt-embedded-architecture.png
+
+    Currently, three embedded platforms are supported by Qt:
 
     \table 90%
-    \header
-    \raw HTML
-      <td style="width: 40%">Embedded Linux</td>
-      <td style="background: white; width: 5%"></td>
-      <td style="width: 40%">Windows CE</td>
-    \endraw
-    \row    \o \l{Qt for Embedded Linux} is designed to be used on Linux devices
-               without X11 or existing graphical environments. This flavor of
-               Qt includes a framework for creating both applications and an
-               environment for them. As a result, it includes features for
-               window management, inter-process communication and facilities
-               for handling input and display devices.
-    \raw HTML
-      <td style="background: white; width: 5%"></td>
-    \endraw
+    \header \o Embedded Linux \o Windows CE \o S60
+    \row
+    \o \l{Qt for Embedded Linux} is designed to be used on Linux devices
+    without X11 or existing graphical environments. This flavor of
+    Qt includes a framework for creating both applications and an
+    environment for them. As a result, it includes features for
+    window management, inter-process communication and facilities
+    for handling input and display devices.
     \o \l{Qt for Windows CE} is used to create applications running in
-               existing Windows CE and Windows Mobile environments.
-               Applications use the appropriate style for the embedded
-               environment and use native features, such as menus, to conform
-               to the native style guidelines.
+    existing Windows CE and Windows Mobile environments.
+    Applications use the appropriate style for the embedded
+    environment and use native features, such as menus, to conform
+    to the native style guidelines.
+    \o \l{S60 - Introduction to using Qt}{Qt for S60} is used to create
+    applications running in existing S60 environments.
+    Applications use the appropriate style for the embedded
+    environment and use native features, such as menus, to conform
+    to the native style guidelines.
     \endtable
 */
diff --git a/doc/src/snippets/code/doc_src_installation.qdoc b/doc/src/snippets/code/doc_src_installation.qdoc
index 412cee3..68765ec 100644
--- a/doc/src/snippets/code/doc_src_installation.qdoc
+++ b/doc/src/snippets/code/doc_src_installation.qdoc
@@ -204,3 +204,8 @@ make sis QT_SIS_OPTIONS=-i QT_SIS_CERTIFICATE=<certificate file> QT_SIS_KEY=<cer
 cd embedded\fluidlauncher
 make sis QT_SIS_OPTIONS=-i
 //! [30]
+
+//! [31]
+cd \Qt\%VERSION%
+configure -platform win32-g++ -xplatform symbian-sbsv2
+//! [31]
diff --git a/doc/src/snippets/code/doc_src_stylesheet.qdoc b/doc/src/snippets/code/doc_src_stylesheet.qdoc
index 9f5d989..f79f7ff 100644
--- a/doc/src/snippets/code/doc_src_stylesheet.qdoc
+++ b/doc/src/snippets/code/doc_src_stylesheet.qdoc
@@ -421,9 +421,6 @@ QSpinBox::down-button { height: 10px }
 //! [59]
 /* implicitly sets the size of down-button to the size of spindown.png */
 QSpinBox::down-button { image: url(:/images/spindown.png) }
-
-QTextEdit { image: url(x1.png) url(x2.png) }
-QTextEdit { image: url(pic1.svg) }
 //! [59]
 
 
diff --git a/doc/src/widgets-and-layouts/stylesheet.qdoc b/doc/src/widgets-and-layouts/stylesheet.qdoc
index adaaf71..c40795a 100644
--- a/doc/src/widgets-and-layouts/stylesheet.qdoc
+++ b/doc/src/widgets-and-layouts/stylesheet.qdoc
@@ -1970,6 +1970,9 @@
            image within the rectangle can be specified using
            \l{image-position-prop}{image-position}.
 
+           This property is for \l{subcontrol}s only--we don't support it for
+           other elements.
+
            \warning The QIcon SVG plugin is needed to render SVG images.
 
            Example: