From e536d5ad59e514b3413331716fd1156948d0e53b Mon Sep 17 00:00:00 2001 From: John Preston Date: Mon, 17 Oct 2016 23:55:31 +0300 Subject: [PATCH] Linux build with Qt 5.6.2 done. --- .travis/build.sh | 3 ++- Telegram/gyp/qt.gypi | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.travis/build.sh b/.travis/build.sh index 40b107eb2..65732ab72 100755 --- a/.travis/build.sh +++ b/.travis/build.sh @@ -547,7 +547,8 @@ buildTelegram() { -Dlinux_path_breakpad=$BREAKPAD_PATH \ -Dlinux_path_libexif_lib=/usr/local/lib \ -Dlinux_lib_ssl=-lssl \ - -Dlinux_lib_crypto=-lcrypto\ -licuuc\ -licutu\ -licui18n \ + -Dlinux_lib_crypto=-lcrypto \ + -Dlinux_lib_icu=-licuuc\ -licutu\ -licui18n \ --depth=. --generator-output=../.. --format=cmake -Goutput_dir=out \ Telegram.gyp cd "$UPSTREAM/out/Debug" diff --git a/Telegram/gyp/qt.gypi b/Telegram/gyp/qt.gypi index d5cfd5fcc..24ededbff 100644 --- a/Telegram/gyp/qt.gypi +++ b/Telegram/gyp/qt.gypi @@ -132,6 +132,7 @@ 'linux_path_xkbcommon%': '/usr/local', 'linux_lib_ssl%': '/usr/local/ssl/lib/libssl.a', 'linux_lib_crypto%': '/usr/local/ssl/lib/libcrypto.a', + 'linux_lib_icu%': '/usr/lib/libicutu.a /usr/lib/libicui18n.a /usr/lib/libicuuc.a /usr/lib/libicudata.a', }, 'configurations': { @@ -211,6 +212,7 @@ '<@(qt_libs_release)', '<(linux_lib_ssl)', '<(linux_lib_crypto)', + '