lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2026-05-10 04:58:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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
This commit is contained in:
Frederik Gladhorn
2013-02-20 10:38:41 +01:00
parent ff63f0f3dc 3d960ec9a9
commit 8b6ae1cdd9
3 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
README
View File

@@ -49,9 +49,11 @@ HOW TO BUILD QT5
Windows: Windows:
-------- --------
Open a Windows SDK (7.0, 7.1 or later) command prompt. Ensure that Perl Open a Windows SDK (7.0, 7.1 or later) command prompt. Ensure that the
version 5.12 or later and Python version 2.7 or later can be found in the following tools can be found in the path:
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> cd <path>\qt-everywhere-opensource-src-<version>
configure -prefix %CD%\qtbase -opensource -nomake tests configure -prefix %CD%\qtbase -opensource -nomake tests

BIN
gnuwin32/bin/win_flex.exe
View File

Binary file not shown.

2
qt.pro
View File

@@ -3,7 +3,7 @@ cache(, super)
TEMPLATE = subdirs TEMPLATE = subdirs
CONFIG += prepare_docs qt_docs_targets CONFIG += prepare_docs qt_docs_targets testcase_targets
module_qtbase.subdir = qtbase module_qtbase.subdir = qtbase
module_qtbase.target = module-qtbase module_qtbase.target = module-qtbase