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

All submodules are kept at their dev branch version.

Conflicts:
	qtactiveqt
	qtbase
	qtdeclarative
	qtdoc
	qtgraphicaleffects
	qtimageformats
	qtjsbackend
	qtmultimedia
	qtqa
	qtquick1
	qtrepotools
	qtscript
	qtsvg
	qttools
	qttranslations
	qtwebkit
	qtwebkit-examples-and-demos
	qtxmlpatterns

Change-Id: Ib9086eb5fef5580792286c9c6efd0f30e186543d

3 files changed, 6 insertions, 4 deletions

diff --git a/README b/README
index b1c97a49..392d7eb2 100644
--- a/README
+++ b/README
@@ -49,9 +49,11 @@ HOW TO BUILD QT5
    Windows:
    --------
 
-     Open a Windows SDK (7.0, 7.1 or later) command prompt. Ensure that Perl
-     version 5.12 or later and Python version 2.7 or later can be found in the
-     path.
+     Open a Windows SDK (7.0, 7.1 or later) command prompt. Ensure that the
+     following tools can be found in the path:
+     * Perl version 5.12 or later   [http://www.activestate.com/activeperl/]
+     * Python version 2.7 or later  [http://www.activestate.com/activepython/]
+     * Ruby version 1.9.3 or later  [http://rubyinstaller.org/]
 
      cd <path>\qt-everywhere-opensource-src-<version>
      configure -prefix %CD%\qtbase -opensource -nomake tests
diff --git a/gnuwin32/bin/win_flex.exe b/gnuwin32/bin/win_flex.exe
index bdad3117..20cc60f1 100644
--- a/gnuwin32/bin/win_flex.exe
+++ b/gnuwin32/bin/win_flex.exe
diff --git a/qt.pro b/qt.pro
index b4cef4df..62468b27 100644
--- a/qt.pro
+++ b/qt.pro
@@ -3,7 +3,7 @@ cache(, super)
 
 TEMPLATE      = subdirs
 
-CONFIG += prepare_docs qt_docs_targets
+CONFIG += prepare_docs qt_docs_targets testcase_targets
 
 module_qtbase.subdir = qtbase
 module_qtbase.target = module-qtbase