From e3d2db8d67adf513ddf806b5d4675d59b8daff1c Mon Sep 17 00:00:00 2001 From: Konstantinos Sideris Date: Thu, 27 Apr 2017 01:31:51 +0300 Subject: [PATCH] Set Qt5.7 as the minimum required version --- .ci/linux.sh | 4 ++-- README.md | 9 +++++---- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/.ci/linux.sh b/.ci/linux.sh index 262870bf..2e63da4b 100755 --- a/.ci/linux.sh +++ b/.ci/linux.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash -sudo add-apt-repository -y ppa:beineri/opt-qt562-trusty +sudo add-apt-repository -y ppa:beineri/opt-qt58-trusty sudo add-apt-repository -y ppa:george-edison55/cmake-3.x sudo apt-get update -qq -sudo apt-get install -qq -y qt56base cmake +sudo apt-get install -qq -y qt58base cmake diff --git a/README.md b/README.md index 3db17413..5ddf784f 100644 --- a/README.md +++ b/README.md @@ -13,7 +13,8 @@ but you can of course receive and send messages in the rooms that you are a memb ### Requirements -- Qt5 (5.8 is used for development). +- Qt5 (5.7 or greater). Qt 5.7 adds support for color font rendering with + Freetype, which is essential to properly support emoji. - CMake 3.1 or greater. - A compiler that supports C++11. - Clang 3.3 (or greater). @@ -22,16 +23,16 @@ but you can of course receive and send messages in the rooms that you are a memb ##### Arch Linux ```bash -$ sudo pacman -S qt5-base cmake gcc +$ sudo pacman -S qt5-base cmake gcc fontconfig ``` ##### Ubuntu 14.04 ```bash -$ sudo add-apt-repository ppa:beineri/opt-qt562-trusty +$ sudo add-apt-repository ppa:beineri/opt-qt58-trusty $ sudo add-apt-repository ppa:george-edison55/cmake-3.x $ sudo apt-get update -$ sudo apt-get install qt56base cmake +$ sudo apt-get install qt58base cmake ``` ##### OSX (Xcode 7 or later)