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/BuildingOnUnix.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/BuildingOnUnix.txt')
-rw-r--r--Documentation/BuildingOnUnix.txt7
1 files changed, 3 insertions, 4 deletions
diff --git a/Documentation/BuildingOnUnix.txt b/Documentation/BuildingOnUnix.txt
index ef74387..b9f31ea 100644
--- a/Documentation/BuildingOnUnix.txt
+++ b/Documentation/BuildingOnUnix.txt
@@ -7,10 +7,9 @@ Prerequisites
Building
--------
-- Create a file 'config.py' with the following contents, reflecting your local
- setup:
- qt = "path/to/qt"
- (e.g. qt = "/usr/share/qt4")
+- Swift uses Qt5 for the UI and on Unix-like platforms it is automatically detected
+ using pkg-config.
+ - The dependencies can be installed by running ./BuildTools/InstallSwiftDependencies.sh
- Run
./scons
- To build only a subdir, add the path as a target to scons. E.g., for Swift: