From 74e46f7b804db780aa2c80a00c0bc7238b5d8bf4 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 6 Sep 2017 15:09:21 +0300
Subject: [PATCH] Fix travis / appveyor CI builds.

---
 .appveyor/install.bat | 2 +-
 .travis/build.sh      | 5 +++++
 appveyor.yml          | 2 +-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/.appveyor/install.bat b/.appveyor/install.bat
index 7def393f8..9a6a30d1a 100644
--- a/.appveyor/install.bat
+++ b/.appveyor/install.bat
@@ -5,7 +5,7 @@ SET LIB_DIR=%BUILD_DIR%\Libraries
 SET SRC_DIR=%BUILD_DIR%\tdesktop
 SET QT_VERSION=5_6_2
 
-call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x86
+call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Auxiliary\Build\vcvarsall.bat" x86
 
 call:configureBuild
 call:getDependencies
diff --git a/.travis/build.sh b/.travis/build.sh
index 764d29e93..749c4e12f 100755
--- a/.travis/build.sh
+++ b/.travis/build.sh
@@ -542,6 +542,11 @@ buildCustomQt() {
   git apply "$QT_PATCH"
   cd ..
 
+  cd "$EXTERNAL/qt${QT_VERSION}/qtbase/src/plugins/platforminputcontexts"
+  git clone https://github.com/telegramdesktop/fcitx.git
+  git clone https://github.com/telegramdesktop/hime.git
+  cd ../../../..
+
   ./configure -prefix $QT_PATH -release -opensource -confirm-license -qt-zlib \
               -qt-libpng -qt-libjpeg -qt-freetype -qt-harfbuzz -qt-pcre -qt-xcb \
               -qt-xkbcommon-x11 -no-opengl -no-gtkstyle -static \
diff --git a/appveyor.yml b/appveyor.yml
index cdef9f078..d436d5683 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,4 +1,4 @@
-image: Visual Studio 2015
+image: Visual Studio 2017
 clone_folder: C:\TBuild\tdesktop
 test: off
 deploy: off