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

* 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration:
  My 4.6.3 changes.
  Added my 4.6.3 changes.
  My 4.6.3 changes.
  Add my 4.6.3 changes
  Fix WebKit version dependency in pkg files
  Add support for including module specific .pri files as part of qt.prf handling
  My changelog entries for 4.6.3
  Add my changes to the 4.6.3 changes log
  my changelog for 4.6.3
  Switch Symbian^3 QCursor implementation back to 5.0 way
  fix qmake -project once more

1 files changed, 126 insertions, 13 deletions

diff --git a/dist/changes-4.6.3 b/dist/changes-4.6.3
index d8e9fb4..08db0bb 100644
--- a/dist/changes-4.6.3
+++ b/dist/changes-4.6.3
@@ -40,14 +40,85 @@ Optimizations
 QtCore
 ------
 
- - foo
-    * bar
+ - QStateMachine
+    * [QTBUG-8842] Ensure history configuration is cleared when a state
+      machine is restarted
+ - QXmlStreamReader
+    * [QTBUG-9196] fixed crash when parsing
 
 QtGui
 -----
 
- - foo
-    * bar
+ - QPainter
+	* [QTBUG-10421] Fixed WebKit-specific justification bug for text containing
+       more than one script.
+
+ - QRegion
+    * [QTBUG-7699] Prevented crash on large x-coordinates.
+
+ - QTextEdit
+	* [QTBUG-9599] Fixed crash when copying the current text cursor  as a result
+      of deleting a character.
+
+ - QTextEngine
+    * [QTBUG-9374] Fixed possible crash in QTextEngine::boundingBox() when using
+      multiscripted text.
+
+ - QTextLayout
+    * [QTBUG-9074] Fixed performance regression that was introduced in Qt 4.6.0.
+
+ - QTransform
+    * [QTBUG-8557] Fixed bug in QTransform::type() potentially occuring
+      after using operator/ or operator* or their overloads.
+
+ - Improved scrolling horizontally with a mouse wheel over sliders.
+ - [QTBUG-7451] Gestures respect panels on QGraphicsView.
+
+ - QCUPSSupport
+    * [QTBUG-10512] Fixed a potential crash with misconfigured CUPS printers.
+    * [QTBUG-6419] Make QCUPSSupport::printerHasPPD() release temporary file
+      handles.
+
+ - QPDFBaseEngine
+    * [QTBUG-8451] Fixed line and point drawing in the PS and PDF generators.
+
+ - QTextDocument
+    * [QTBUG-10301] Fixed a leak in QTextDocument::print().
+
+ - QFontEngine
+    * [QTBUG-3976] Fixed a leak for QFont objects used in threads.
+
+ - QPSPrintEngine
+    * [QTBUG-10121] Fixed incorrect version setting for EPS files.
+    * [QTBUG-10140] Fixed generation of the %%BoundingBox operator to output
+      integer values instead of floating point values.
+
+ - QWin32PrintEngine
+    * [QTBUG-9938] Fixed a crash on Windows 7 systems with invalid PrinterPorts
+      registry entries.
+
+ - QTriangulatingStroker
+    * [QTBUG-9548] Fixed possible data corruption when certain paths were triangulated.
+
+ - QRasterPaintEngine
+    * [QTBUG-9036] Fixed ClearType text rendering on translucent surfaces under Windows.
+
+ - QPixmap
+    * [QTBUG-8606] Fixed QPixmap::load() to not modify referenced copies.
+
+ - QPainter
+    * [QTBUG-8140] Speed up custom bitmap bruses under X11 without Xrender support.
+    * [QTBUG-8032] Fixed drawing pixmaps onto bitmaps on X11 without Xrender support.
+
+ - QImageReader
+    * [QTBUG-7980] Fixed QImageReader::setAutoDetectImageFormat() to work with plugins.
+
+ - QGifHandler
+    * [QTBUG-7037] Fixed QGifHandler::loopCount().
+    * [QTBUG-6696] Cache the sizes of images in an animated GIF.
+
+ - qDrawPixmaps()
+    * [QTBUG-8455] Fixed qDrawPixmaps() to draw on integer coordinates under Mac OS X.
 
 QtDBus
 ------
@@ -64,14 +135,47 @@ QtNetwork
 QtOpenGL
 --------
 
- - foo
-    * bar
+ - QOpenGLPaintEngine
+    * [QTBUG-10529] Fixed an issue where bound pixmaps were not released correctly
+      in the GL 1 engine.
+
+ - QGL2PaintEngineEx
+    * [QTBUG-8681] Fixed an application exit crash that could occur in
+      the GL2 engine under X11.
+
+ - QGLWidget
+    * [QTBUG-7545] Fixed QGLWidget::grabFrameBuffer() to honor the 'withAlpha' flag.
+    * [QTBUG-8054] Fixed drawing QPixmaps onto QGLWidgets on different X11 screens.
+    * [QTBUG-7865] Fixed bug where GL widgets were not fully updated on
+      Windows Vista/7 with Aero disabled.
+    * [QTBUG-8753] Worked around driver bug causing clipping errors on the N900.
+    * [QTBUG-10510] Workaround ATI driver bug when using QGraphicsEffect with GL.
+
+ - QGLContext
+    * [QTBUG-5732] Fixed a GLX warning that occured with some Intel chipsets under X11.
+
+ - QGLPixelBuffer
+    * [QTBUG-8047] Fixed usage of QGLPixelBuffer with share widgets on other X11 screens.
 
 QtScript
 --------
 
- - foo
-    * bar
+ - [QTBUG-7066] Fixed regression introduced in 4.6.0 that made it not
+   possible to change the prototype of the global object
+ - [QTBUG-8366] Fixed regression introduced in 4.6.0 that caused the
+   instanceof operator to throw an error when the right-hand-side is
+   generated by QScriptEngine::newQMetaObject()
+ - [QTBUG-8400] Fixed memory leak when lazily binding QScriptValue to an
+   engine
+ - [QTBUG-9775] Fixed regression introduced in 4.6.0 that caused the
+   qsTr() function not to resolve the translation context correctly when
+   invoked in the global scope
+ - QScriptClass
+   * [QTBUG-8364] Fixed regression introduced in 4.6.0 that could cause
+     the Callable extension to crash
+ - QScriptEngine
+   * [QTBUG-6437] Fixed regression introduced in 4.6.0 that made
+     installTranslatorFunctions() not work with custom global object
 
 QtSql
 -----
@@ -82,8 +186,13 @@ QtSql
 QtXml
 -----
 
- - foo
-    * bar
+ - [QTBUG-8398] QDom: prevent infinite loop when cloning a DTD
+
+QtXmlPatterns
+-------------
+- [QTBUG-8920] fixed crash with anonymous types in XsdSchemaChecker
+- [QTBUG-8394] include/import/redefine schemas only once
+- QXmlSchema: fix crash with referencing elements
 
 Qt Plugins
 ----------
@@ -106,17 +215,21 @@ Third party components
 Qt for Unix (X11 and Mac OS X)
 ------------------------------
 
- - 
+ -
 
 Qt for Linux/X11
 ----------------
 
- -
+ - [MR 458] Improved handling of Shift-Tab with VNC on X11.
+ - [QTBUG-7063] Changed key bindings (XF86XK_MyComputer, Qt::Key_Launch0,
+   Key_Calculator) on X11 back to how it was in Qt 4.5 before MR 1742
+   accidentally changed it.
 
 Qt for Windows
 --------------
 
- -
+ - [QTBUG-6007] On Windows we query if there is a touch screen and do not try
+   to enable gestures otherwise.
 
 Qt for Mac OS X
 ---------------