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
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
-rw-r--r--BuildTools/SCons/SConscript.boot2
-rw-r--r--Documentation/BuildingGenerics.txt6
-rw-r--r--Documentation/BuildingOnUnix.txt7
-rw-r--r--Documentation/BuildingOnWindows.txt2
4 files changed, 8 insertions, 9 deletions
diff --git a/BuildTools/SCons/SConscript.boot b/BuildTools/SCons/SConscript.boot
index b5cc6da..ec3381d 100644
--- a/BuildTools/SCons/SConscript.boot
+++ b/BuildTools/SCons/SConscript.boot
@@ -90,7 +90,7 @@ vars.Add(BoolVariable("try_avahi", "Try configuring for avahi?", "true"))
vars.Add(PathVariable("avahi_includedir", "Avahi headers location", None, PathVariable.PathAccept))
vars.Add(PathVariable("avahi_libdir", "Avahi library location", None, PathVariable.PathAccept))
vars.Add(PathVariable("qt", "Qt location", "", PathVariable.PathAccept))
-vars.Add(BoolVariable("qt5", "Compile in Qt5 mode", "no")) # TODO: auto-detect this
+vars.Add(BoolVariable("qt5", "Compile in Qt5 mode", "yes"))
vars.Add(PathVariable("docbook_xml", "DocBook XML", None, PathVariable.PathAccept))
vars.Add(PathVariable("docbook_xsl", "DocBook XSL", None, PathVariable.PathAccept))
vars.Add(BoolVariable("build_examples", "Build example programs", "yes"))
diff --git a/Documentation/BuildingGenerics.txt b/Documentation/BuildingGenerics.txt
index 66f3347..284cf45 100644
--- a/Documentation/BuildingGenerics.txt
+++ b/Documentation/BuildingGenerics.txt
@@ -1,6 +1,6 @@
To cause scons to search for dependencies instead of using cached results, add force-configure=1 to the commandline:
scons force-configure=1
-Swift is usually built with Qt4. If you want to build it against Qt5, add the line
-qt5 = 1
-to your config.py
+Swift is usually built with Qt5. If you want to build it against Qt4, add the line
+qt5 = 0
+to your config.py. However, Qt4 support is no longer actively maintained.
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:
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