Merge branch 'master' of https://github.com/telegramdesktop/tdesktop

Author: john-preston

.gitignore

@@ -29,3 +29,4 @@ ipch/
 /Telegram/*.user.*
 /Linux/
 /Telegram/Makefile
+*.*~

QTCREATOR.md

@@ -94,6 +94,7 @@ Install some packages for Qt (see **/home/user/TBuild/Libraries/QtStatic/qtbase/
     sudo apt-get install libxcb-keysyms1-dev
     sudo apt-get install libxcb-icccm4-dev
     sudo apt-get install libxcb-render-util0-dev
+    sudo apt-get install libxcb-util0-dev
     sudo apt-get install libxrender-dev
     sudo apt-get install libpulse-dev
 

Telegram/FixMake.sh

@@ -7,6 +7,7 @@ sed -i 's/\-lxcb\-xfixes/\/usr\/lib\/x86_64\-linux\-gnu\/libxcb\-xfixes\.a/g' Ma
 sed -i 's/\-lxcb\-shm/\/usr\/lib\/x86_64\-linux\-gnu\/libxcb\-shm\.a/g' Makefile
 sed -i 's/\-lxcb\-randr/\/usr\/lib\/x86_64\-linux\-gnu\/libxcb\-randr\.a/g' Makefile
 sed -i 's/\-lxcb\-shape/\/usr\/lib\/x86_64\-linux\-gnu\/libxcb\-shape\.a/g' Makefile
+sed -i 's/\-lxcb\-image/\/usr\/lib\/x86_64\-linux\-gnu\/libxcb\-image\.a \/usr\/lib\/x86_64\-linux\-gnu\/libxcb\-util\.a/g' Makefile
 sed -i 's/\-llzma/\/usr\/local\/lib\/liblzma\.a/g' Makefile
 sed -i 's/\-lglib\-2\.0/\/usr\/lib\/x86_64\-linux\-gnu\/libglib\-2\.0\.a/g' Makefile