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

6 files changed, 48 insertions, 9 deletions

diff --git a/doc/src/getting-started/examples.qdoc b/doc/src/getting-started/examples.qdoc
index 543a2e1..d80308a 100644
--- a/doc/src/getting-started/examples.qdoc
+++ b/doc/src/getting-started/examples.qdoc
@@ -295,6 +295,8 @@
 
     \o \image animation-examples.png
     \o
+    These examples show to to use the \l{The Animation Framework}{animation framework}
+    to build highly animated, high-performance GUIs.
 
     \row
     \o{2,1} \l{Gestures Examples}{\bold{Gestures}}
@@ -322,6 +324,8 @@
 
     \o \image activeqt-examples.png ActiveQt
     \o
+    These examples demonstrate how to write ActiveX controls and control servers
+    with Qt, and how to use ActiveX controls and COM objects in a Qt application.
 
     \row
     \o{2,1} \l{Qt Quarterly}{\bold{Qt Quarterly}}
diff --git a/doc/src/images/graphicseffect-plain.png b/doc/src/images/graphicseffect-plain.png
new file mode 100644
index 0000000..8b4c1c4
--- /dev/null
+++ b/doc/src/images/graphicseffect-plain.png
diff --git a/doc/src/qt4-intro.qdoc b/doc/src/qt4-intro.qdoc
index be4cb48..47eab16 100644
--- a/doc/src/qt4-intro.qdoc
+++ b/doc/src/qt4-intro.qdoc
@@ -483,6 +483,14 @@
 
     \tableofcontents
 
+    \section1 Support for Symbian
+
+    Qt 4.6 is the first release to include support for the Symbian
+    platform, with integration into the S60 framework. The port to
+    Symbian and S60 provides all functionality required to develop
+    rich end-user applications for devices running Symbian 3.1 and
+    later.
+
     \section1 Animation Framework
 
     The animation framework helps build highly animated,
@@ -493,8 +501,9 @@
     The framework makes it easy to animate \l{QObject}s, including
     QWidgets, by allowing Qt properties to be animated. It also allows
     creating custom animations and interpolation functions. Graphics
-    views are not left out--one can animate \l{QGraphicsWidget}s,
-    which inherits from QObject (and thereby enables properties).
+    views are not left out; one can animate \l{QGraphicsWidget}s and
+    new \l{QGraphicsObject}s which inherit from QGraphicsItem
+    (and thereby enable properties).
 
     Animations are controlled using easing curves and can be grouped
     together. This enables animations of arbitrary complexity.
@@ -599,7 +608,16 @@
     as blurring, colorizing or blooming is provided, and it is possible to
     implement custom effects.
 
-    \img graphicseffect-widget.png
+    \table
+    \row
+    \o
+    \o \img graphicseffect-plain.png
+    \o
+    \row
+    \o \img graphicseffect-blur.png
+    \o \img graphicseffect-colorize.png
+    \o \img graphicseffect-bloom.png
+    \endtable
 
     See the QGraphicsEffect class documentation for more information.
 
diff --git a/src/gui/kernel/qdnd_x11.cpp b/src/gui/kernel/qdnd_x11.cpp
index 33da0f3..da150fb 100644
--- a/src/gui/kernel/qdnd_x11.cpp
+++ b/src/gui/kernel/qdnd_x11.cpp
@@ -506,6 +506,7 @@ bool QX11Data::xdndMimeDataForAtom(Atom a, QMimeData *mimeData, QByteArray *data
                     *atomFormat = textprop.encoding;
                     *dataFormat = textprop.format;
                     *data = QByteArray((const char *) textprop.value, textprop.nitems * textprop.format / 8);
+                    ret = true;
 
                     DEBUG("    textprop type %lx\n"
                     "    textprop name '%s'\n"
@@ -541,12 +542,13 @@ bool QX11Data::xdndMimeDataForAtom(Atom a, QMimeData *mimeData, QByteArray *data
                 dm->xdndMimeTransferedPixmap[dm->xdndMimeTransferedPixmapIndex] = pm;
                 dm->xdndMimeTransferedPixmapIndex =
                             (dm->xdndMimeTransferedPixmapIndex + 1) % 2;
+                ret = true;
             }
         } else {
             DEBUG("QClipboard: xdndMimeDataForAtom(): converting to type '%s' is not supported", qPrintable(atomName));
         }
     }
-    return data;
+    return ret && data != 0;
 }
 
 //$$$
diff --git a/src/gui/styles/qs60style_s60.cpp b/src/gui/styles/qs60style_s60.cpp
index 131d8bc..cde48d8 100644
--- a/src/gui/styles/qs60style_s60.cpp
+++ b/src/gui/styles/qs60style_s60.cpp
@@ -635,8 +635,18 @@ bool QS60StylePrivate::isToolBarBackground()
 QPoint qt_s60_fill_background_offset(const QWidget *targetWidget)
 {
     CCoeControl *control = targetWidget->effectiveWinId();
-    TPoint globalPos = control ? control->PositionRelativeToScreen() : TPoint(0,0);
-    return QPoint(globalPos.iX, globalPos.iY);
+    TPoint pos(0,0);
+    if (control) {
+        // FIXME properly: S60 3.1 has a bug that CCoeControl::PositionRelativeToScreen sometimes
+        // freezes the device, possibly in cases where we run out of memory.
+        // We use CCoeControl::Position instead in S60 3.1, which returns same values
+        // in most cases.
+        if (QSysInfo::s60Version() == QSysInfo::SV_S60_3_1)
+            pos = control->Position();
+        else
+            pos = control->PositionRelativeToScreen();
+    }
+    return QPoint(pos.iX, pos.iY);
 }
 
 QPixmap QS60StyleModeSpecifics::createSkinnedGraphicsLX(
@@ -1137,11 +1147,11 @@ QPixmap QS60StylePrivate::part(QS60StyleEnums::SkinParts part,
     const QSize &size, SkinElementFlags flags)
 {
     QSymbianFbsHeapLock lock(QSymbianFbsHeapLock::Unlock);
-    
+
     QPixmap result = (flags & SF_ColorSkinned)?
           QS60StyleModeSpecifics::colorSkinnedGraphics(part, size, flags)
         : QS60StyleModeSpecifics::skinnedGraphics(part, size, flags);
-    
+
     lock.relock();
 
     if (flags & SF_StateDisabled && !QS60StyleModeSpecifics::disabledPartGraphic(part)) {
diff --git a/src/opengl/qgl.cpp b/src/opengl/qgl.cpp
index bfb004e..665290c 100644
--- a/src/opengl/qgl.cpp
+++ b/src/opengl/qgl.cpp
@@ -1718,7 +1718,7 @@ Q_OPENGL_EXPORT QGLShareRegister* qgl_share_reg()
     the top left corner. Inverting the texture implies a deep copy
     prior to upload.
 
-    \value MipmapBindOption Specifies that bindTexture should try
+    \value MipmapBindOption Specifies that bindTexture() should try
     to generate mipmaps.  If the GL implementation supports the \c
     GL_SGIS_generate_mipmap extension, mipmaps will be automatically
     generated for the texture. Mipmap generation is only supported for
@@ -2361,6 +2361,8 @@ GLuint QGLContext::bindTexture(const QImage &image, GLenum target, GLint format)
 }
 
 /*!
+    \since 4.6
+
     Generates and binds a 2D GL texture to the current context, based
     on \a image. The generated texture id is returned and can be used
     in later \c glBindTexture() calls.
@@ -2422,6 +2424,7 @@ GLuint QGLContext::bindTexture(const QPixmap &pixmap, GLenum target, GLint forma
 
 /*!
   \overload
+  \since 4.6
 
   Generates and binds a 2D GL texture to the current context, based
   on \a pixmap.
@@ -4503,6 +4506,7 @@ GLuint QGLWidget::bindTexture(const QImage &image, GLenum target, GLint format)
 
 /*!
   \overload
+  \since 4.6
 
   The binding \a options are a set of options used to decide how to
   bind the texture to the context.
@@ -4544,6 +4548,7 @@ GLuint QGLWidget::bindTexture(const QPixmap &pixmap, GLenum target, GLint format
 
 /*!
   \overload
+  \since 4.6
 
   Generates and binds a 2D GL texture to the current context, based
   on \a pixmap. The generated texture id is returned and can be used in