summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTobias Markmann <tm@ayena.de>2016-01-07 09:59:03 (GMT)
committerTobias Markmann <tm@ayena.de>2016-01-07 09:59:03 (GMT)
commit832a6a33dbc15aade09a469d2801d222bb4171d7 (patch)
treecb78ca1d7d15178d54ed030b26892cd01b72b0a4 /Documentation/BuildingOnWindows.txt
parent9e704326b5a052715436529c08b51f2dcabca238 (diff)
downloadswift-832a6a33dbc15aade09a469d2801d222bb4171d7.zip
swift-832a6a33dbc15aade09a469d2801d222bb4171d7.tar.bz2
Default to Qt5 for building Swift
Updated documentation accordingly. Test-Information: Build and ran unit tests on OS X 10.11.2. Change-Id: Iec4e82d3b63a6b0d24b854734879dd2fbfe17d79
Diffstat (limited to 'Documentation/BuildingOnWindows.txt')
-rw-r--r--Documentation/BuildingOnWindows.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/BuildingOnWindows.txt b/Documentation/BuildingOnWindows.txt
index 14a9b5b..d296241 100644
--- a/Documentation/BuildingOnWindows.txt
+++ b/Documentation/BuildingOnWindows.txt
@@ -47,7 +47,7 @@ For packaging use:
- WiX
- Download the C++ redistributable package from Microsoft and put it at C:\Program Files (x86)\Common Files\Merge Modules\
- config.py should contain:
- qt = "c:\\qt\\4.7.4"
+ qt = "c:\\qt\\5.4.2"
vcredist = "C:\\Program Files (x86)\\Common Files\\Merge Modules\\vcredist_x86.exe"
debug = 1
optimize = 1