Swiftdiff options
| author | Tobias Markmann <tm@ayena.de> | 2016-01-07 09:59:03 (GMT) |
|---|---|---|
| committer | Tobias Markmann <tm@ayena.de> | 2016-01-07 09:59:03 (GMT) |
| commit | 832a6a33dbc15aade09a469d2801d222bb4171d7 (patch) | |
| tree | cb78ca1d7d15178d54ed030b26892cd01b72b0a4 /Documentation | |
| parent | 9e704326b5a052715436529c08b51f2dcabca238 (diff) | |
| download | swift-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')
| -rw-r--r-- | Documentation/BuildingGenerics.txt | 6 | ||||
| -rw-r--r-- | Documentation/BuildingOnUnix.txt | 7 | ||||
| -rw-r--r-- | Documentation/BuildingOnWindows.txt | 2 |
3 files changed, 7 insertions, 8 deletions
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 @@ -1,22 +1,21 @@ Prerequisites ------------ - GCC - Python - OpenSSL (and development package) - Qt Open Source Edition (and development package. Optional; not needed for Swiften) 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: ./scons Swift Running tests ------------- If you want to run the unit tests (only interesting if you're doing development work) - Run diff --git a/Documentation/BuildingOnWindows.txt b/Documentation/BuildingOnWindows.txt index 14a9b5b..d296241 100644 --- a/Documentation/BuildingOnWindows.txt +++ b/Documentation/BuildingOnWindows.txt @@ -41,19 +41,19 @@ Running tests Packaging Swift --------------- For packaging use: - Microsoft Visual C++ Express 2008 or Microsoft VS 2013 Express - No OpenSSL - 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 wix_bindir = "c:\\program files\\Windows Installer XML v3.5\\bin" - run the following commands. Two scons runs are required as 'scons dist=1' requires the Swift.exe to be in place. scons scons dist=1 Notes |