diff options
| author | Mitch Curtis <mitch.curtis@theqtcompany.com> | 2015-09-01 14:35:03 +0200 |
|---|---|---|
| committer | Mitch Curtis <mitch.curtis@theqtcompany.com> | 2015-09-02 11:33:18 +0000 |
| commit | 60964b2be9b4a021e8b6d5b7e189b0c38e43434b (patch) | |
| tree | 4fbcff61b37f3d473e1d9e90d87efed17cc7cd82 | |
| parent | ee02a2d816f85d2bf91781e50d3ed1cb54aae3e0 (diff) | |
| download | qtdoc-60964b2be9b4a021e8b6d5b7e189b0c38e43434b.tar.gz | |
Update 'Qt for Windows - Building from Source' docs.
bison and flex should now be taken from:
http://sourceforge.net/projects/winflexbison/
Task-number: QTBUG-47834
Change-Id: I38e744758f81c0a28683ff47d2c9cabca6027755
Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
| -rw-r--r-- | doc/src/platforms/windows.qdoc | 14 |
1 files changed, 9 insertions, 5 deletions
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 |