Merge remote-tracking branch 'origin/release' into stable

Change-Id: I316359874afb67c824980d627527adbe57b2f10d

3 files changed, 33 insertions, 5 deletions

diff --git a/dist/changes-5.1.1 b/dist/changes-5.1.1
new file mode 100644
index 000000000..4e938e47f
--- /dev/null
+++ b/dist/changes-5.1.1
@@ -0,0 +1,25 @@
+Qt 5.1.1 is a bug-fix release. It maintains both forward and backward
+compatibility (source and binary) with Qt 5.1.0.
+
+For more details, refer to the online documentation included in this
+distribution. The documentation is also available online:
+
+  http://qt-project.org/doc/qt-5.1/
+
+The Qt version 5.1 series is binary compatible with the 5.0.x series.
+Applications compiled for 5.0 will continue to run with 5.1.
+
+Some of the changes listed in this file include issue tracking numbers
+corresponding to tasks in the Qt Bug Tracker:
+
+  http://bugreports.qt-project.org/
+
+Each of these identifiers can be entered in the bug tracker to obtain more
+information about a particular change.
+
+
+****************************************************************************
+*                           General                                        *
+****************************************************************************
+
+ - Documentation: Fixed several missing information or incorrect information.
diff --git a/doc/src/getting-started/gettingstartedqt.qdoc b/doc/src/getting-started/gettingstartedqt.qdoc
index 844245678..824cef17d 100644
--- a/doc/src/getting-started/gettingstartedqt.qdoc
+++ b/doc/src/getting-started/gettingstartedqt.qdoc
@@ -86,7 +86,7 @@
     you to be able to build and run the project. The .pro file is complete.
     We will take a closer look at the file contents in the following sections.
 
-    \section2 Learn More
+    \b{Learn More}
 
     \table
         \header
@@ -139,7 +139,7 @@
     widgets of the application. Examples of events are mouse presses
     and key strokes.
 
-    \section2 Learn More
+    \b{Learn More}
 
     \table
         \header
@@ -292,7 +292,7 @@
     in that case, you have to remember to add the line \c{QT += widgets} to the generated
     file in order to link against the Qt Widgets Module.
 
-    \section2 Learn More
+    \b{Learn More}
 
     \table
         \header
@@ -379,7 +379,7 @@
 
     \snippet snippets/widgets-tutorial/notepad/notepad.cpp 1
 
-    \section2 Learn More
+    \b{Learn More}
 
     \table
         \header
@@ -495,7 +495,7 @@
     the QTextStream class again. QTextStream can also write
     \l{QString}s to the file with the << operator.
 
-    \section2 Learn More
+    \b{Learn More}
 
     \table
         \header
diff --git a/doc/src/source-breaks.qdoc b/doc/src/source-breaks.qdoc
index 1f6a79668..109571fff 100644
--- a/doc/src/source-breaks.qdoc
+++ b/doc/src/source-breaks.qdoc
@@ -119,6 +119,8 @@ The following sections lists the API changes in each module and provides recomme
        \li \l{QAbstractItemModel::createIndex} method now only provides the void* and quintptr overloads, making calls with a literal \c 0
            (createIndex(row, col, 0)) ambiguous. Either cast (quintptr(0)) or omit the third argument(to get the void* overload).
       \endlist
+       \li \l{QAbstractItemModel::setRoleNames()} is deprecated. Use \l{QAbstractItemModel::roleNames()} instead.
+           \l{QAbstractItemModel::roleNames} is virtual now to allow a consistent API with the rest of QAbstractItemModel. Reimplementing the virtual methods to provide the elements is preferred to setting those directly.
      \li Default value of the \l{QSortFilterProxyModel::dynamicSortFilter} property is changed to \c{true}.
      \li \l{QString::mid}, \l{QString::midRef}, and \l{QByteArray::mid} now return an empty \c{QString}, \c{QStringRef}, and \c{QByteArray} respectively,
          if the position passed is equal to the length (that is, right after the last character/byte).
@@ -184,6 +186,7 @@ The following sections lists the API changes in each module and provides recomme
         These have been moved to the new \l{QUrlQuery} class.
     \li \l{Qt::WFlags} is deprecated, use \l{Qt::WindowFlags} instead.
         This typedef dates from the Qt 1 days, and such abbreviations are not current Qt style.
+    \li \l{Qt::HANDLE} typedef is now defined as \c{void *} on all platforms.
     \endlist
 
 \section1 Changes to Qt GUI