Merge branch 'stable' into release

Change-Id: I8a7200e65c39b123eb7fc796965a2bf22c66d10c

13 files changed, 68 insertions, 25 deletions

diff --git a/dist/changes-5.0.1 b/dist/changes-5.0.1
new file mode 100644
index 000000000..29176103a
--- /dev/null
+++ b/dist/changes-5.0.1
@@ -0,0 +1,46 @@
+Qt 5.0.1 is a bug-fix release. It maintains both forward and backward
+compatibility (source and binary) with Qt 5.0.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.0/
+
+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                                        *
+****************************************************************************
+
+General Improvements
+--------------------
+
+Third party components
+----------------------
+
+****************************************************************************
+*                      Platform Specific Changes                           *
+****************************************************************************
+
+
+****************************************************************************
+*                      Compiler Specific Changes                           *
+****************************************************************************
+
+
+****************************************************************************
+*                          Tools                                           *
+****************************************************************************
+
+
+****************************************************************************
+*                          Plugins                                         *
+****************************************************************************
+
diff --git a/doc/config/qmake.qdocconf b/doc/config/qmake.qdocconf
index ecbffed31..4f0f89166 100644
--- a/doc/config/qmake.qdocconf
+++ b/doc/config/qmake.qdocconf
@@ -50,7 +50,7 @@ qhp.qmake.extraFiles          = images/bg_l.png \
                              style/style_ie8.css \
                              style/style.css
 
-qhp.qmake.filterAttributes    = qt 5.0.0 tools qmake
+qhp.qmake.filterAttributes    = qt 5.0.1 tools qmake
 qhp.qmake.customFilters.qmake.name = qmake Manual
 qhp.qmake.customFilters.qmake.filterAttributes = qt tools qmake
 qhp.qmake.subprojects         = manual
diff --git a/doc/config/qtdoc-project.qdocconf b/doc/config/qtdoc-project.qdocconf
index 659a5cfa2..6bb54ee7d 100644
--- a/doc/config/qtdoc-project.qdocconf
+++ b/doc/config/qtdoc-project.qdocconf
@@ -1,7 +1,7 @@
 project                 = QtDoc
 description             = Qt Reference Documentation
 url                     = http://qt-project.org/doc/qtdoc
-version                 = 5.0.0
+version                 = 5.0.1
 
 depends += \
     activeqt \
diff --git a/doc/config/qtdoc-qhp.qdocconf b/doc/config/qtdoc-qhp.qdocconf
index ab4bec50a..6b9ccdc7e 100644
--- a/doc/config/qtdoc-qhp.qdocconf
+++ b/doc/config/qtdoc-qhp.qdocconf
@@ -6,9 +6,9 @@ qhp.QtDoc.virtualFolder       = qtdoc
 qhp.QtDoc.indexTitle          = Qt 5.0 Reference Documentation
 qhp.QtDoc.indexRoot           =
 
-qhp.QtDoc.filterAttributes    = qtdoc 5.0.0 qtrefdoc
-qhp.QtDoc.customFilters.Qt.name = Qtdoc 5.0.0
-qhp.QtDoc.customFilters.Qt.filterAttributes = qtdoc 5.0.0
+qhp.QtDoc.filterAttributes    = qtdoc 5.0.1 qtrefdoc
+qhp.QtDoc.customFilters.Qt.name = Qtdoc 5.0.1
+qhp.QtDoc.customFilters.Qt.filterAttributes = qtdoc 5.0.1
 qhp.QtDoc.subprojects         = classes qmltypes examples
 qhp.QtDoc.subprojects.classes.title = Classes
 qhp.QtDoc.subprojects.classes.indexTitle = All Classes
diff --git a/doc/src/datastorage.qdoc b/doc/src/datastorage.qdoc
index 04c5c7538..cae0e5574 100644
--- a/doc/src/datastorage.qdoc
+++ b/doc/src/datastorage.qdoc
@@ -160,7 +160,7 @@ necessary infrastructure:
   \endlist
 \endlist
 
-Besides reading and writing to XML streams, Qt also provides APIs for the
+Besides reading and writing to XML streams, Qt also provides APIs for
 the following additional use cases:
 \list
  \li Querying an XML data source using XQuery and XPath
diff --git a/doc/src/development/qmake-manual.qdoc b/doc/src/development/qmake-manual.qdoc
index f3f11fd73..89d07cc80 100644
--- a/doc/src/development/qmake-manual.qdoc
+++ b/doc/src/development/qmake-manual.qdoc
@@ -4181,12 +4181,6 @@
 
     \snippet doc/src/snippets/code/doc_src_qmake-manual.pro 112
 
-    The final step is to set the \l{qmake Variable Reference#CONFIG}{CONFIG}
-    variable. Since this is a Qt application, we need to put \c qt on the
-    \c CONFIG line so that \l{qmake Manual#qmake}{\c qmake} will add the
-    relevant libraries to be linked against and ensure that build lines for
-    \c moc and \c uic are included in the generated Makefile.
-
     The finished project file should look like this:
 
     \snippet doc/src/snippets/code/doc_src_qmake-manual.pro 113
diff --git a/doc/src/getting-started/gettingstartedqml.qdoc b/doc/src/getting-started/gettingstartedqml.qdoc
index a07550d5f..e8e1027f5 100644
--- a/doc/src/getting-started/gettingstartedqml.qdoc
+++ b/doc/src/getting-started/gettingstartedqml.qdoc
@@ -99,7 +99,7 @@
     This simple rectangle has a unique identifier, \c simplebutton, which is bound to the
     id property. The \c Rectangle element's properties are bound to values by listing the
     property, followed by a colon, then the value. In the code sample, the color \c grey
-    is bound to the the Rectangle's \c color property. Similarly, we bind the \c width
+    is bound to the Rectangle's \c color property. Similarly, we bind the \c width
     and \c height of the Rectangle.
 
     The \l {Text}{Text} element is a non-editable text field. We name this \c Text element
diff --git a/doc/src/getting-started/gettingstartedqt.qdoc b/doc/src/getting-started/gettingstartedqt.qdoc
index f499ad574..e0e1dd5b0 100644
--- a/doc/src/getting-started/gettingstartedqt.qdoc
+++ b/doc/src/getting-started/gettingstartedqt.qdoc
@@ -482,7 +482,7 @@
 
     \section2 Saving Files
 
-    Now, let us move on to the the \c{on_actionSave_triggered()} slot, which
+    Now, let us move on to the \c{on_actionSave_triggered()} slot, which
     also uses QFileDialog to create a dialog in which the user can save a
     file with the specified name in the specified location.
 
diff --git a/doc/src/getting-started/installation.qdoc b/doc/src/getting-started/installation.qdoc
index 555ea9927..8f092a1f5 100644
--- a/doc/src/getting-started/installation.qdoc
+++ b/doc/src/getting-started/installation.qdoc
@@ -665,8 +665,13 @@ in the \l{Qt for Windows CE Requirements} document.
     \brief Setting up the Mac OS X environment for Qt.
     \previouspage General Qt Requirements
 
-    Qt requires Xcode to be installed on the system. Xcode should be
-    available on the Mac installation CD.
+    Qt requires Xcode to be installed on the system. You can get it from:
+
+    \l{https://developer.apple.com/xcode/}
+
+    The command line tools are also needed, they can be installed within XCode:
+
+    Xcode->Preferences->Downloads->Components->Command Line Tools
 
     \sa {Known Issues}
 */
diff --git a/doc/src/portingcppapps_toqt5.qdoc b/doc/src/portingcppapps_toqt5.qdoc
index 82a213552..ded883a73 100644
--- a/doc/src/portingcppapps_toqt5.qdoc
+++ b/doc/src/portingcppapps_toqt5.qdoc
@@ -38,7 +38,7 @@ to port the \l{Animated Tiles Example}{Animated Tiles} C++ application to Qt 5:
        \note You can find a perl script called fixqt4headers in the bin directory of your Qt package that will
         automate many of the required header file changes.
    \li Edit the \c {animatedtiles.pro} and add \c {QT += widgets} towards the end of the file.
-       \note QtGui is included by default in all Qt applications unless excluded using the \c {QT -= qtgui} directive in the \c{qmake} project file.
+       \note QtGui is included by default in all Qt applications unless excluded using the \c {QT -= gui} directive in the \c{qmake} project file.
    \li Run qmake and make utilities to build the binary.
 \endlist
 
diff --git a/doc/src/snippets/code/doc_src_qmake-manual.pro b/doc/src/snippets/code/doc_src_qmake-manual.pro
index 240632bf3..2417a6e0d 100644
--- a/doc/src/snippets/code/doc_src_qmake-manual.pro
+++ b/doc/src/snippets/code/doc_src_qmake-manual.pro
@@ -692,7 +692,6 @@ TARGET = helloworld
 
 
 #! [113]
-CONFIG += qt
 HEADERS += hello.h
 SOURCES += hello.cpp
 SOURCES += main.cpp
@@ -710,7 +709,7 @@ qmake -tp vc hello.pro
 
 
 #! [116]
-CONFIG += qt debug
+CONFIG += debug
 HEADERS += hello.h
 SOURCES += hello.cpp
 SOURCES += main.cpp
@@ -725,7 +724,7 @@ win32 {
 
 
 #! [118]
-CONFIG += qt debug
+CONFIG += debug
 HEADERS += hello.h
 SOURCES += hello.cpp
 SOURCES += main.cpp
@@ -746,7 +745,7 @@ unix {
 
 
 #! [120]
-CONFIG += qt debug
+CONFIG += debug
 HEADERS += hello.h
 SOURCES += hello.cpp
 SOURCES += main.cpp
@@ -772,7 +771,7 @@ win32 {
 
 
 #! [122]
-CONFIG += qt debug
+CONFIG += debug
 HEADERS += hello.h
 SOURCES += hello.cpp
 SOURCES += main.cpp
@@ -798,7 +797,7 @@ HEADERS += hello.h
 SOURCES += hello.cpp
 SOURCES += main.cpp
 DEFINES += USE_MY_STUFF
-CONFIG  += qt warn_on release
+CONFIG  += release
 #! [123]
 
 
diff --git a/doc/src/snippets/widget-mask/widget-mask.pro b/doc/src/snippets/widget-mask/widget-mask.pro
index f0807a5e1..f06374780 100644
--- a/doc/src/snippets/widget-mask/widget-mask.pro
+++ b/doc/src/snippets/widget-mask/widget-mask.pro
@@ -1,3 +1,2 @@
 SOURCES     = main.cpp
 RESOURCES   = mask.qrc
-CONFIG      += qt
diff --git a/doc/src/source-breaks.qdoc b/doc/src/source-breaks.qdoc
index d6bcd027c..2ab827672 100644
--- a/doc/src/source-breaks.qdoc
+++ b/doc/src/source-breaks.qdoc
@@ -121,7 +121,7 @@ The following sections lists the API changes in each module and provides recomme
      \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).
          In Qt 4, they use to return a null \c{QString} or a null \c{QStringRef}.
-     \li The following \l{QString} functions use the the C locale instead of the default or system locale:
+     \li The following \l{QString} functions use the C locale instead of the default or system locale:
       \list
        \li \l{QString::toLongLong}{toLongLong()}
        \li \l{QString::toULongLong}{toULongLong()}