Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration into master-integration

* 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration: (28 commits)
  Use numeric virtual keyboard for all number entry modes.
  QTBUG-17776, reporting terminated threads as not running on Symbian
  Splitview - Auto-translation rules changed
  Support clipboard function on Symbian
  Added qmlshadersplugin to Symbian qt.iby-file.
  Workaround webkit deadlock on macos x
  Disable antialiasing for tiled image drawing.
  Ensure visibility of input widget in QML app when doing layout switch
  Def update for gui, openvg, and opengl.
  Revert "Def update."
  Fix trailing whitespace
  Remove unnecessary resizes during orientation change
  Revert "Symbian: Fix QFontInfo::pixelSize()"
  Improving warning messages in QVolatileImage.
  Proper naming for raster pixmap and paintengine on Symbian.
  Def update.
  Handle QVolatileImage-backed pixmaps optimally in drawPixmap().
  Resizable graphicsview's background is drawn incorrectly in splitview
  Add inputcontext reset to orientation switch in Symbian
  QS60Style: QGroupBox is drawn as white box in upcoming Symbian release
  ...

5 files changed, 35 insertions, 11 deletions

diff --git a/doc/src/declarative/elements.qdoc b/doc/src/declarative/elements.qdoc
index a861a66..6b7a5fc 100644
--- a/doc/src/declarative/elements.qdoc
+++ b/doc/src/declarative/elements.qdoc
@@ -175,6 +175,8 @@ Elements that animate properties based on data types
 \o \l {ParticleMotionLinear} - Adds linear motion behavior to \l {Particles}
 \o \l {ParticleMotionGravity} - Adds gravitational motion to \l {Particles}
 \o \l {ParticleMotionWander} - Adds varied motions to \l {Particles}
+\o \l {ShaderEffectItem} - Enables the use of OpenGL Shading Language together with QML
+\o \l {ShaderEffectSource} - Encapsulates QML item tree as a source item for \l {ShaderEffectItem}
 \endlist
 
 \section1 Add-On Elements
@@ -321,3 +323,14 @@ should first be obtained and installed.
     \generatelist{related}
 
 */
+
+/*!
+    \group qml-shader-elements
+    \title QML Shader Elements
+    \ingroup qml-groups
+
+    \brief Elements for using OpenGL shading language code together with the QML code.
+
+    \generatelist{related}
+
+*/
diff --git a/doc/src/declarative/examples.qdoc b/doc/src/declarative/examples.qdoc
index 0e325e2..1003b22 100644
--- a/doc/src/declarative/examples.qdoc
+++ b/doc/src/declarative/examples.qdoc
@@ -33,7 +33,7 @@
 
 
 Qt includes a set of examples and demos that show how to use various aspects
-of QML. The examples are small demonstrations of particular QML components, 
+of QML. The examples are small demonstrations of particular QML components,
 while the demos contain more complete and functional applications.
 
 To run the examples and demos, open them in Qt Creator or use the included
@@ -60,43 +60,43 @@ can be used to produce sophisticated interfaces and applications:
 \table
 \row
 
-\o 
+\o
 \l{demos/declarative/calculator}{Calculator}
 \image qml-calculator-example-small.png
 
-\o 
+\o
 \l{demos/declarative/flickr}{Flickr Mobile}
 \image qml-flickr-demo-small.png
 
-\o 
+\o
 \l{demos/declarative/minehunt}{Minehunt}
 \image qml-minehunt-demo-small.png
 
 \row
 
-\o 
+\o
 \l{demos/declarative/photoviewer}{Photo Viewer}
 \image qml-photoviewer-demo-small.png
 
-\o 
+\o
 \l{demos/declarative/rssnews}{RSS News Reader}
 \image qml-rssnews-demo-small.png
 
-\o 
+\o
 \l{demos/declarative/samegame}{Same Game}
 \image qml-samegame-demo-small.png
 
 \row
 
-\o 
+\o
 \l{demos/declarative/snake}{Snake}
 \image qml-snake-demo-small.png
 
-\o 
+\o
 \l{demos/declarative/twitter}{Twitter}
 \image qml-twitter-demo-small.png
 
-\o 
+\o
 \l{demos/declarative/webbrowser}{Web Browser}
 \image qml-webbrowser-demo-small.png
 
@@ -109,7 +109,7 @@ The demos can be found in Qt's \c demos/declarative directory.
 
 The QML examples are small, simple applications that show how to use a particular
 QML component or feature. If you are new
-to QML, you may also find the \l{QML Tutorial}{Hello World} and 
+to QML, you may also find the \l{QML Tutorial}{Hello World} and
 \l {QML Advanced Tutorial}{Same Game} tutorials useful.
 
 The examples can be found in Qt's \c examples/declarative directory.
@@ -234,6 +234,7 @@ The examples can be found in Qt's \c examples/declarative directory.
 
 \list
 \o \l{src/imports/folderlistmodel}{Folder List Model} - a C++ model plugin
+\o \l{declarative/shadereffects}{Shader Effects}
 \endlist
 
 */
diff --git a/doc/src/declarative/pics/shaderexample.png b/doc/src/declarative/pics/shaderexample.png
new file mode 100644
index 0000000..dbc7291
--- /dev/null
+++ b/doc/src/declarative/pics/shaderexample.png
diff --git a/doc/src/examples/qml-examples.qdoc b/doc/src/examples/qml-examples.qdoc
index 00eeb43..a910266 100644
--- a/doc/src/examples/qml-examples.qdoc
+++ b/doc/src/examples/qml-examples.qdoc
@@ -714,3 +714,13 @@
 
     \image qml-xmlhttprequest-example.png
 */
+
+/*!
+    \title Labs: Shader Effects
+    \example declarative/shadereffects
+
+    This example shows how to create visual effects by using OpenGL shading language together with QML using \l ShaderEffectItem and \l ShaderEffectSource APIs.
+
+    \image qml-shadereffects-example.png
+*/
+
diff --git a/doc/src/images/qml-shadereffects-example.png b/doc/src/images/qml-shadereffects-example.png
new file mode 100644
index 0000000..9649fe1
--- /dev/null
+++ b/doc/src/images/qml-shadereffects-example.png