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

Conflicts:

	src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp

11 files changed, 27 insertions, 6 deletions

diff --git a/doc/src/examples/overpainting.qdoc b/doc/src/examples/overpainting.qdoc
index 91100c0..b19b503 100644
--- a/doc/src/examples/overpainting.qdoc
+++ b/doc/src/examples/overpainting.qdoc
@@ -159,9 +159,10 @@
 
     \snippet examples/opengl/overpainting/glwidget.cpp 7
 
-    Once the list containing the object has been executed, the matrix stack
-    needs to be restored to its original state at the start of this function
-    before we can begin overpainting:
+    Once the list containing the object has been executed, the GL
+    states we changed and the matrix stack needs to be restored to its
+    original state at the start of this function before we can begin
+    overpainting:
 
     \snippet examples/opengl/overpainting/glwidget.cpp 8
 
diff --git a/doc/src/frameworks-technologies/graphicsview.qdoc b/doc/src/frameworks-technologies/graphicsview.qdoc
index 8d7ea2c..397cb19 100644
--- a/doc/src/frameworks-technologies/graphicsview.qdoc
+++ b/doc/src/frameworks-technologies/graphicsview.qdoc
@@ -551,4 +551,24 @@
           the widget is transformed resolution independently, allowing the
           fonts and style to stay crisp when zoomed in. (Note that the effect
           of resolution independence depends on the style.)
+
+    \section1 Performance
+
+      \section2 Floating Point Instructions
+
+        In order to accurately and quickly apply transformations and effects to
+        items, Graphics View is built with the assumption that the user's hardware
+        is able to provide reasonable performance for floating point instructions.
+
+        Many workstations and desktop computers are equipped with suitable hardware
+        to accelerate this kind of computation, but some embedded devices may only
+        provide libraries to handle mathematical operations or emulate floating
+        point instructions in software.
+
+        As a result, certain kinds of effects may be slower than expected on certain
+        devices. It may be possible to compensate for this performance hit by making
+        optimizations in other areas; for example, by using \l{#OpenGL Rendering}{OpenGL}
+        to render a scene. However, any such optimizations may themselves cause a
+        reduction in performance if they also rely on the presence of floating point
+        hardware.
 */
diff --git a/doc/src/images/graphicseffect-blur.png b/doc/src/images/graphicseffect-blur.png
new file mode 100644
index 0000000..3fa403b
--- /dev/null
+++ b/doc/src/images/graphicseffect-blur.png
diff --git a/doc/src/images/graphicseffect-colorize.png b/doc/src/images/graphicseffect-colorize.png
new file mode 100644
index 0000000..96fbfe4
--- /dev/null
+++ b/doc/src/images/graphicseffect-colorize.png
diff --git a/doc/src/images/graphicseffect-drop-shadow.png b/doc/src/images/graphicseffect-drop-shadow.png
new file mode 100644
index 0000000..c02415a
--- /dev/null
+++ b/doc/src/images/graphicseffect-drop-shadow.png
diff --git a/doc/src/images/graphicseffect-effects.png b/doc/src/images/graphicseffect-effects.png
new file mode 100644
index 0000000..422ae19
--- /dev/null
+++ b/doc/src/images/graphicseffect-effects.png
diff --git a/doc/src/images/graphicseffect-grayscale.png b/doc/src/images/graphicseffect-grayscale.png
new file mode 100644
index 0000000..2bd0c93
--- /dev/null
+++ b/doc/src/images/graphicseffect-grayscale.png
diff --git a/doc/src/images/graphicseffect-opacity.png b/doc/src/images/graphicseffect-opacity.png
new file mode 100644
index 0000000..de15859
--- /dev/null
+++ b/doc/src/images/graphicseffect-opacity.png
diff --git a/doc/src/images/graphicseffect-pixelize.png b/doc/src/images/graphicseffect-pixelize.png
new file mode 100644
index 0000000..047c452
--- /dev/null
+++ b/doc/src/images/graphicseffect-pixelize.png
diff --git a/doc/src/images/graphicseffect-widget.png b/doc/src/images/graphicseffect-widget.png
new file mode 100644
index 0000000..27245d1
--- /dev/null
+++ b/doc/src/images/graphicseffect-widget.png
diff --git a/doc/src/snippets/code/src_corelib_kernel_qobject.cpp b/doc/src/snippets/code/src_corelib_kernel_qobject.cpp
index 5c0f80c..a02d4e9 100644
--- a/doc/src/snippets/code/src_corelib_kernel_qobject.cpp
+++ b/doc/src/snippets/code/src_corelib_kernel_qobject.cpp
@@ -39,10 +39,10 @@ timer->inherits("QTimer");          // returns true
 timer->inherits("QObject");         // returns true
 timer->inherits("QAbstractButton"); // returns false
 
-// QLayout inherits QObject and QLayoutItem
-QLayout *layout = new QLayout;
+// QVBoxLayout inherits QObject and QLayoutItem
+QVBoxLayout *layout = new QVBoxLayout;
 layout->inherits("QObject");        // returns true
-layout->inherits("QLayoutItem");    // returns false
+layout->inherits("QLayoutItem");    // returns true (even though QLayoutItem is not a QObject)
 //! [4]