summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThanos Doukoudakis <thanos.doukoudakis@isode.com>2018-04-16 09:59:34 (GMT)
committerKevin Smith <kevin.smith@isode.com>2018-05-10 08:13:57 (GMT)
commit4663da31954d989f8535b94c4a78a0f4515542a4 (patch)
treeaa6cf7a359ed0e61e038f3f518581bc9351d52f9 /DEVELOPMENT.md
parent8fab33012e5ac7c03ab00ec30118dcb2c5218051 (diff)
downloadswift-4663da31954d989f8535b94c4a78a0f4515542a4.zip
swift-4663da31954d989f8535b94c4a78a0f4515542a4.tar.bz2
Enable Emojis on Windows and Linux
This patch enables emojis for Linux and Windows. In windows, currently the emojis are only black and white, due to some inconsistencies in the UI. For Linux the Noto Colour Emoji font (https://www.google.com/get/noto/) is used. The client must be build with Qt 5.6 or newer to support the emoji characters. Test-Information: Tested the changes with Qt 5.8 on Windows 10 and Linux Ubuntu 17.10. Built and tested the appimage on Ubuntu 17.10 and Ubuntu 16.04. Change-Id: I6d0f2842349eae789d773c33d1a93ad33304df3e
Diffstat (limited to 'DEVELOPMENT.md')
-rw-r--r--DEVELOPMENT.md2
1 files changed, 1 insertions, 1 deletions
diff --git a/DEVELOPMENT.md b/DEVELOPMENT.md
index 5873300..69c4ead 100644
--- a/DEVELOPMENT.md
+++ b/DEVELOPMENT.md
@@ -48,7 +48,7 @@ For packaging use:
- WiX
- Swift has a dependency on C++ redistributable package from Microsoft that needs to be deployed during install. If the common tools for Visual C++ is installed, then the installation file should be located under `C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\redist\1033\` (for Visual Studio 2013). If not download from Microsoft and put it at `C:\Program Files (x86)\Common Files\Merge Modules\`
- `config.py` should contain:
- qt = "c:\\qt\\5.4.2"
+ qt = "c:\\qt\\5.6.2"
vcredist = "C:\\Program Files (x86)\\Microsoft Visual Studio 12.0\\VC\\redist\\vcredist_x86.exe"
vcredistdir = "C:\\Program Files (x86)\\Microsoft Visual Studio 12.0\\VC\\redist\\x86\Microsoft.VC120.CRT\\"
debug = 1