Merge commit 'upstream/4.6' into 4.6

10 files changed, 39 insertions, 26 deletions

diff --git a/doc/src/bughowto.qdoc b/doc/src/bughowto.qdoc
index 971634a..e9ae965 100644
--- a/doc/src/bughowto.qdoc
+++ b/doc/src/bughowto.qdoc
@@ -48,24 +48,32 @@
     about it so that we can fix it.
 
     Before reporting a bug, please check the \l{FAQs}, \l{Platform
-    Notes}, and the \l{Task Tracker} on the Qt website to see
+    Notes}, and the \l{Qt Bug Tracker} on the Qt website to see
     if the issue is already known.
 
-    If you have found a new bug, please submit a bug report using
-    the \l{Bug Report Form}. Always include the following information
-    in your bug report:
+    The first thing you should do is to sign up for an account for
+    the \l{Qt Bug Tracker}, if you do not already have one. Once you
+    have done that you can submit and track your bug reports and they
+    will be publicly available from the moment you submit them.
+
+    Always include the following information in your bug report:
 
     \list 1
     \o The name and version number of your compiler
     \o The name and version number of your operating system
     \o The version of Qt you are using, and what configure options it was
-       compiled with.
+       compiled with
+    \o Reliable and clear description on how to reproduce the problem
     \endlist
+   
+    If possible, please provide a test written using the QtTest module
+    as this will improve the procedure of reproducing your problem and
+    allow the developers to address the issue in a more efficient way.
 
-    If the problem you are reporting is only visible at run-time, try to
-    create a small test program that shows the problem when run. Often,
-    such a program can be created with some minor changes to one
-    of the many example programs in Qt's \c examples directory.
+    Otherwise, if the problem you are reporting is only visible at run-time,
+    try to create a small test program that shows the problem when run.
+    Often, such a program can be created with some minor changes to one of
+    the many example programs in Qt's examples directory.
 
     If you have implemented a bug fix and want to contribute your fix
     directly, then you can do so through the \l{Public Qt Repository}.
diff --git a/doc/src/images/graphicseffect-bloom.png b/doc/src/images/graphicseffect-bloom.png
deleted file mode 100644
index dace7eb..0000000
--- a/doc/src/images/graphicseffect-bloom.png
+++ /dev/null
diff --git a/doc/src/images/graphicseffect-effects.png b/doc/src/images/graphicseffect-effects.png
deleted file mode 100644
index 609bef9..0000000
--- a/doc/src/images/graphicseffect-effects.png
+++ /dev/null
diff --git a/doc/src/images/graphicseffect-grayscale.png b/doc/src/images/graphicseffect-grayscale.png
deleted file mode 100644
index 8b6e5c6..0000000
--- a/doc/src/images/graphicseffect-grayscale.png
+++ /dev/null
diff --git a/doc/src/images/graphicseffect-pixelize.png b/doc/src/images/graphicseffect-pixelize.png
deleted file mode 100644
index 57a0057..0000000
--- a/doc/src/images/graphicseffect-pixelize.png
+++ /dev/null
diff --git a/doc/src/images/hoverevents.png b/doc/src/images/hoverevents.png
new file mode 100644
index 0000000..ccc079b
--- /dev/null
+++ b/doc/src/images/hoverevents.png
diff --git a/doc/src/platforms/supported-platforms.qdoc b/doc/src/platforms/supported-platforms.qdoc
index 302ecb4..560ddfe 100644
--- a/doc/src/platforms/supported-platforms.qdoc
+++ b/doc/src/platforms/supported-platforms.qdoc
@@ -86,7 +86,7 @@
     \row    \o Apple Mac OS X 10.5 "Leopard" x86_64 (Carbon, Cocoa 32 and 64bit)
                                      \o As provided by Apple
     \row    \o Embedded Linux QWS (ARM)
-                                     \o gcc (\l{http:\\www.codesourcery.com}{Codesourcery version)}
+                                     \o gcc (\l{http://www.codesourcery.com/}{Codesourcery version)}
     \row    \o Windows CE 5.0 (ARMv4i, x86, MIPS)
                                      \o MSVC 2005 WinCE 5.0 Standard (x86, pocket, smart, mipsii)
     \row    \o Symbian (S60 3.1, 3.2 and 5.0)
@@ -125,7 +125,7 @@
     \row    \o Linux
                                      \o Intel Compiler
     \row    \o Embedded Linux QWS (Mips, PowerPC)
-                                     \o gcc (\l{http:\\www.codesourcery.com}{Codesourcery version)}
+                                     \o gcc (\l{http://www.codesourcery.com/}{Codesourcery version)}
     \row    \o Embedded Linux X11 (ARM)
                                      \o gcc (\l{http://www.scratchbox.org/}{Scratchbox)}
     \row    \o Windows CE 6.0 (ARMv4i, x86, MIPS)
diff --git a/doc/src/qt-webpages.qdoc b/doc/src/qt-webpages.qdoc
index 1eee805..41f1350 100644
--- a/doc/src/qt-webpages.qdoc
+++ b/doc/src/qt-webpages.qdoc
@@ -50,7 +50,12 @@
 */
 
 /*!
-    \externalpage http://qt.nokia.com/bugreport-form
+    \externalpage http://bugreports.qt.nokia.com
+    \title Qt Bug Tracker
+*/
+
+/*!
+    \externalpage http://bugreports.qt.nokia.com
     \title Bug Report Form
 */
 
@@ -175,7 +180,7 @@
 */
 
 /*!
-    \externalpage http://qt.nokia.com/developer/task-tracker
+    \externalpage http://bugreports.qt.nokia.com
     \title Task Tracker
 */
 
diff --git a/doc/src/qt4-intro.qdoc b/doc/src/qt4-intro.qdoc
index 4911426..2f74451 100644
--- a/doc/src/qt4-intro.qdoc
+++ b/doc/src/qt4-intro.qdoc
@@ -608,19 +608,19 @@
     \section1 Graphics Effects
 
     Effects can be used to alter the appearance of UI elements such as
-    \l{QGraphicsItem}s and \l{QWidget}s. A range of standard effects such
-    as blurring, colorizing or blooming is provided, and it is possible to
-    implement custom effects.
+    \l{QGraphicsItem}s and \l{QWidget}s. A couple of standard effects such
+    as blurring, colorizing and drop shadow are provided, and it is
+    possible to implement custom effects.
 
     \table
     \row
-    \o
-    \o \img graphicseffect-plain.png
-    \o
+    \o{2,1} \img graphicseffect-plain.png
     \row
     \o \img graphicseffect-blur.png
     \o \img graphicseffect-colorize.png
-    \o \img graphicseffect-bloom.png
+    \row
+    \o \img graphicseffect-opacity.png
+    \o \img graphicseffect-drop-shadow.png
     \endtable
 
     See the QGraphicsEffect class documentation for more information.
diff --git a/doc/src/snippets/code/src_gui_effects_qgraphicseffect.cpp b/doc/src/snippets/code/src_gui_effects_qgraphicseffect.cpp
index 35689f4..5ef6609 100644
--- a/doc/src/snippets/code/src_gui_effects_qgraphicseffect.cpp
+++ b/doc/src/snippets/code/src_gui_effects_qgraphicseffect.cpp
@@ -40,11 +40,11 @@
 ****************************************************************************/
 
 //! [0]
-MyGraphicsOpacityEffect::draw(QPainter *painter, QGraphicsEffectSource *source)
+MyGraphicsOpacityEffect::draw(QPainter *painter)
 {
     // Fully opaque; draw directly without going through a pixmap.
     if (qFuzzyCompare(m_opacity, 1)) {
-        source->draw(painter);
+        drawSource(painter);
         return;
     }
     ...
@@ -52,18 +52,18 @@ MyGraphicsOpacityEffect::draw(QPainter *painter, QGraphicsEffectSource *source)
 //! [0]
 
 //! [1]
-MyGraphicsEffect::draw(QPainter *painter, QGraphicsEffectSource *source)
+MyGraphicsEffect::draw(QPainter *painter)
 {
     ...
     QPoint offset;
-    if (source->isPixmap()) {
+    if (sourceIsPixmap()) {
         // No point in drawing in device coordinates (pixmap will be scaled anyways).
-        const QPixmap pixmap = source->pixmap(Qt::LogicalCoordinates, &offset);
+        const QPixmap pixmap = sourcePixmap(Qt::LogicalCoordinates, &offset);
         ...
         painter->drawPixmap(offset, pixmap);
     } else {
         // Draw pixmap in device coordinates to avoid pixmap scaling;
-        const QPixmap pixmap = source->pixmap(Qt::DeviceCoordinates, &offset);
+        const QPixmap pixmap = sourcePixmap(Qt::DeviceCoordinates, &offset);
         painter->setWorldTransform(QTransform());
         ...
         painter->drawPixmap(offset, pixmap);