Merge branch '5.5.1' into vxworks-5.5

* 5.5.1:
  Integrating JavaScript in QML: add missing colon.
  Fix some issues with MOC documentation.
  Update 'Qt for Windows - Building from Source' docs.

Change-Id: I12efc3401467083ae0d240cb2f9df596f617c690

3 files changed, 15 insertions, 11 deletions

diff --git a/doc/src/frameworks-technologies/why-moc.qdoc b/doc/src/frameworks-technologies/why-moc.qdoc
index 2f86586e..d8f6c600 100644
--- a/doc/src/frameworks-technologies/why-moc.qdoc
+++ b/doc/src/frameworks-technologies/why-moc.qdoc
@@ -39,16 +39,16 @@
     impossible to express with templates. A generic vector container class
     is easily expressible, even with partial specialisation for pointer
     types, while a function that sets up a graphical user interface based
-    on a XML description given as a string is not expressible as
-    template. And then there is gray area in between. Things that you can
+    on an XML description given as a string is not expressible as a
+    template. And then there is a gray area in between. Things that you can
     hack with templates at the cost of code size, readability,
     portability, usability, extensability, robustness and ultimately
     design beauty. Both templates and the C preprocessor can be stretched
     to do incredibility smart and mind boggling things. But just because
-    those things can be done, does not necessarily mean doing them is the
-    right design choice. Code unfortunately is not meant to be published in
+    those things can be done, it does not necessarily mean doing them is the
+    right design choice. Code, unfortunately, is not meant to be published in
     books, but compiled with real-world compilers on real-world operating
-    system.
+    systems.
 
     Here are some reasons why Qt uses the moc:
 
diff --git a/doc/src/platforms/windows.qdoc b/doc/src/platforms/windows.qdoc
index 06e189c3..c3d033f5 100644
--- a/doc/src/platforms/windows.qdoc
+++ b/doc/src/platforms/windows.qdoc
@@ -350,18 +350,22 @@
            latter is outdated.
 
 
-    Qt WebKit and ANGLE depend on these extra tools from the \l{GnuWin32
-    Project} which are provided for your convenience in the \e gnuwin32/bin
+    Qt WebKit and ANGLE depend on these extra tools from the \l{GnuWin32 Project}{GnuWin32} and
+    \l {http://sourceforge.net/projects/winflexbison/}{Win flex-bison}
+    projects, which are provided for your convenience in the \e gnuwin32/bin
     folder:
     \list
-        \li \l{http://gnuwin32.sourceforge.net/downlinks/bison.php}{Bison}
         \li \l{http://gnuwin32.sourceforge.net/downlinks/gperf.php}{GPerf}
-        \li \l{http://gnuwin32.sourceforge.net/downlinks/flex.php}{Flex}
+        \li \l{http://sourceforge.net/projects/winflexbison/files/win_flex_bison-2.5.5.zip/download}{Bison, Flex}
     \endlist
 
     The \e gnuwin32/bin folder should be added to the \c PATH variable.
 
-    For instructions for building the Qt 5 source,read
+    \note If you are building qtbase outside of qt5.git, you will need to
+    download \e win_bison and \e win_flex from the link above and rename
+    them to \e bison and \e flex.
+
+    For instructions for building the Qt 5 source, read
     the \l{Qt for Windows - Building from Source} page.
 
     \section1 SDKs and Compilers
diff --git a/doc/src/qmlapp/usecases/integratingjs.qdoc b/doc/src/qmlapp/usecases/integratingjs.qdoc
index 6fa8623e..56c498af 100644
--- a/doc/src/qmlapp/usecases/integratingjs.qdoc
+++ b/doc/src/qmlapp/usecases/integratingjs.qdoc
@@ -33,7 +33,7 @@ JavaScript code can be easily integrated into QML to provide UI logic, imperativ
 
 \section1 Using JavaScript Expressions for Property Values
 
-JavaScript expressions can be used in QML as bindings. For example
+JavaScript expressions can be used in QML as bindings. For example:
 \code
 Item {
     width: Math.random()