diff options
author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-02-20 10:38:41 +0100 |
---|---|---|
committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-02-20 10:40:05 +0100 |
commit | 8b6ae1cdd948b3286c4eea57b7f68610d103c180 (patch) | |
tree | b5c8a903a6fee2b502142659e9aaad6cea2b409a | |
parent | ff63f0f3dc60c731ec77ed53678c00c06953b0ee (diff) | |
parent | 3d960ec9a9f11da295f603ca6fbfe80ee3681ae9 (diff) |
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
-rw-r--r-- | README | 8 | ||||
-rw-r--r-- | gnuwin32/bin/win_flex.exe | bin | 547328 -> 528896 bytes | |||
-rw-r--r-- | qt.pro | 2 |
3 files changed, 6 insertions, 4 deletions
@@ -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 Binary files differindex bdad3117..20cc60f1 100644 --- a/gnuwin32/bin/win_flex.exe +++ b/gnuwin32/bin/win_flex.exe @@ -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 |