Merge branch '4.6'

Conflicts:
	src/corelib/global/qglobal.h
	src/gui/dialogs/qfiledialog_win.cpp
	src/plugins/qpluginbase.pri
	src/qbase.pri
	tests/auto/selftests/expected_cmptest.txt
	tests/auto/selftests/expected_crashes_3.txt
	tests/auto/selftests/expected_longstring.txt
	tests/auto/selftests/expected_maxwarnings.txt
	tests/auto/selftests/expected_skip.txt
	tools/assistant/tools/assistant/doc/assistant.qdocconf
	tools/qdoc3/test/assistant.qdocconf
	tools/qdoc3/test/designer.qdocconf
	tools/qdoc3/test/linguist.qdocconf
	tools/qdoc3/test/qmake.qdocconf
	tools/qdoc3/test/qt-build-docs.qdocconf
	tools/qdoc3/test/qt.qdocconf

2 files changed, 180 insertions, 9 deletions

diff --git a/dist/changes-4.6.0 b/dist/changes-4.6.0
index 887c96f..3e7d33b 100644
--- a/dist/changes-4.6.0
+++ b/dist/changes-4.6.0
@@ -91,9 +91,14 @@ Optimizations
 
 QtCore
 ------
+ - QAbstractItemModel
+    * [MR#972] Added API to move items
+    * [MR#1072] Added function beginResetModel() / endResetModel()
+
 
  - QByteArray
     * New overloads for QByteArray::insert() and QByteArray::prepend().
+    * [MR#1286] Added value_type typedef for STL compatibility
 
  - QEventDispatcherGlib (internal class)
     * Fix a regression introduced in 4.5.3 that would cause timers to not
@@ -195,6 +200,8 @@ QtGui
  - QAbstractItemView
     * [256502] Fixes selectionModel::hasSelection return value after
       model::reset.
+    * [MR#1426] Fixes some issues with Shift-selection
+    * [MR#1668] New QAbstractItemView::setDefaultDropAction
 
  - QApplication
     * [QTBUG-739] Removed internal widgets from QApplication::topLevelWidgets().
@@ -317,6 +324,7 @@ QtGui
  - QListView
     * [243335] Fixed the visualRect to return correct values when the widget is
       not yet shown.
+    * [MR#666] Fixed selection with Shift-Arrow/Shift-Click in QListView's IconMode
 
  - QMainWindow
     * [226060] Adding actions to a toolbar would always make the next toolbar
@@ -422,6 +430,9 @@ QtGui
     * [240325] Even with wrap mode set to Qt::TextWordWrap, the layout
       would sometimes break outside word boundaries when floating objects
       affected the width available to the text.
+    * [MR#681] Added support for roman numbering for lists
+    * [MR#1753] Fixed escaping HTML attributes QTextDocument::toHtml()
+
 
  - QTextLayout
     * [QTBUG-4468] Count tabs as multiple characters when applying a fixed
@@ -443,6 +454,7 @@ QtGui
 
  - QTreeWidget
     * [253109] Shows the widget when calling setItemWidget.
+    * [MR#1393] Use stable sorting.
 
  - QWidget
     * Added inputMethodHints property.
@@ -612,7 +624,7 @@ QtWebKit
 
  - QWebElement
    * New class; introduced to implement DOM like operations on a web page.
- 
+
  - QWebFrame
    * New properties for an URL and a focus management.
    * New signals delivering current loading status.
@@ -860,17 +872,17 @@ Qt for Embedded Linux
 
  - Phonon on Windows
    * Now much more reliable when reading a file through a QIODevice.
-   * If Video Mixing Renderer 9 is not available, falls back to software 
+   * If Video Mixing Renderer 9 is not available, falls back to software
      rendering.
    * Fixed a flicker issue when switching source with a transition time of 0
-   
- - [QTBUG-3620] Fixed bug on X11 that caused bitmap fonts to become so small 
-   it was unreadable when printed or presented in a print preview widget. 
-   
- - [QTBUG-4445] Fixed bug on Windows that caused problems when printing 
-   text where several characters were represented by a single glyph, e.g. 
+
+ - [QTBUG-3620] Fixed bug on X11 that caused bitmap fonts to become so small
+   it was unreadable when printed or presented in a print preview widget.
+
+ - [QTBUG-4445] Fixed bug on Windows that caused problems when printing
+   text where several characters were represented by a single glyph, e.g.
    a double 't' with the Calibri font.
-   
+
  - EGL and OpenGL/ES
    * Protect the use of version-specific EGL symbols with #ifdef's.
    * Make sure an EGL context is current when resolving GL extensions.
diff --git a/dist/changes-4.6.1 b/dist/changes-4.6.1
new file mode 100644
index 0000000..6896358
--- /dev/null
+++ b/dist/changes-4.6.1
@@ -0,0 +1,159 @@
+Qt 4.6.1 is a bug-fix release. It maintains both forward and backward
+compatibility (source and binary) with Qt 4.6.0.  For more details,
+refer to the online documentation included in this distribution. The
+documentation is also available online:
+
+  http://qt.nokia.com/doc/4.6
+
+The Qt version 4.6 series is binary compatible with the 4.5.x series.
+Applications compiled for 4.5 will continue to run with 4.6.
+
+Some of the changes listed in this file include issue tracking numbers
+corresponding to tasks in the Qt Bug Tracker, the (now obsolete) Task
+Tracker, or the Merge Request queue of the public source repository.
+
+Qt Bug Tracker: http://bugreports.qt.nokia.com
+Task Tracker:   http://qt.nokia.com/developer/task-tracker
+Merge Request:  http://qt.gitorious.org
+
+****************************************************************************
+*                           General                                        *
+****************************************************************************
+
+New features
+------------
+
+ - SomeClass, SomeOtherClass
+    * New classes for foo, bar and baz
+
+Optimizations
+-------------
+
+ - Optimized foo in QSomeClass
+    * See list of Important Behavior Changes below
+
+
+****************************************************************************
+*                          Library                                         *
+****************************************************************************
+
+QtCore
+------
+
+ - foo
+    * bar
+
+QtGui
+-----
+
+ - foo
+    * bar
+
+QtDBus
+------
+
+ - foo
+    * bar
+
+QtNetwork
+---------
+
+ - foo
+    * bar
+
+QtOpenGL
+--------
+
+ - foo
+    * bar
+
+QtScript
+--------
+
+ - foo
+    * bar
+
+QtSql
+-----
+
+ - foo
+    * bar
+
+QtXml
+-----
+
+ - foo
+    * bar
+
+Qt Plugins
+----------
+
+ - foo
+    * bar
+
+Third party components
+----------------------
+
+ - Updated foo to version 2.3.9.
+
+ - Updated bar to the latest version from baz.org.
+
+
+****************************************************************************
+*                      Platform Specific Changes                           *
+****************************************************************************
+
+Qt for Unix (X11 and Mac OS X)
+------------------------------
+
+ - 
+
+Qt for Linux/X11
+----------------
+
+ -
+
+Qt for Windows
+--------------
+
+ -
+
+Qt for Mac OS X
+---------------
+
+ -
+
+Qt for Embedded Linux
+---------------------
+
+ -
+
+DirectFB
+--------
+
+ -
+
+Qt for Windows CE
+-----------------
+
+ -
+
+****************************************************************************
+*                          Tools                                           *
+****************************************************************************
+
+ - Designer
+   * foo
+
+ - qdoc3
+   * bar
+
+ - Linguist
+   * baz
+
+****************************************************************************
+* Important Behavior Changes *
+****************************************************************************
+
+ -
+