fixed 0.8.12.dev version

Merge branch 'dev' of https://github.com/telegramdesktop/tdesktop into dev
version 0.8.12.dev with new emojis support
2015-05-08 19:01:11 +03:00 · 2015-05-08 17:44:40 +03:00 · 2015-05-08 17:44:07 +03:00 · 2015-05-08 17:36:05 +03:00 · 2015-05-08 16:08:36 +03:00 · 2015-05-08 16:06:53 +03:00
271 changed files with 68285 additions and 26510 deletions
--- a/MSVC.md
+++ b/MSVC.md
@@ -117,13 +117,18 @@ to have **D:\TBuild\Libraries\opus\win32**
 * Build Debug configuration
 * Build Release configuration

-####Qt 5.3.1, slightly patched
+####Qt 5.4.0, slightly patched

-http://download.qt-project.org/official_releases/qt/5.3/5.3.1/single/qt-everywhere-opensource-src-5.3.1.zip
+http://download.qt-project.org/official_releases/qt/5.4/5.4.0/single/qt-everywhere-opensource-src-5.4.0.zip

-Extract to **D:\TBuild\Libraries\**, rename **qt-everywhere-opensource-src-5.3.1** to **QtStatic** to have **D:\TBuild\Libraries\QtStatic\qtbase\** folder
+Extract to **D:\TBuild\Libraries\**, rename **qt-everywhere-opensource-src-5.4.0** to **QtStatic** to have **D:\TBuild\Libraries\QtStatic\qtbase\** folder

-Apply patch – copy (with overwrite!) everything from **D:\TBuild\tdesktop\\\_qt\_5\_3\_1\_patch\** to **D:\TBuild\Libraries\QtStatic\**
+Apply patch
+
+* OR copy (with overwrite!) everything from **D:\TBuild\tdesktop\\\_qt\_5\_4\_0\_patch\** to **D:\TBuild\Libraries\QtStatic\**
+* OR copy **D:\TBuild\tdesktop\\\_qt\_5\_4\_0\_patch.diff** to **D:\TBuild\Libraries\QtStatic\**, go there in Git Bash and run
+
+    git apply _qt_5_4_0_patch.diff

 #####Building library

@@ -137,12 +142,12 @@ There go to Qt directory

 and after that run configure

-    configure -debug-and-release -opensource -confirm-license -static -I "D:\TBuild\Libraries\OpenSSL-Win32\include" -L "C:\Program Files (x86)\Microsoft SDKs\Windows\v7.1A\Lib" -l Gdi32 -opengl desktop -openssl-linked OPENSSL_LIBS_DEBUG="D:\TBuild\Libraries\OpenSSL-Win32\lib\VC\static\ssleay32MTd.lib D:\TBuild\Libraries\OpenSSL-Win32\lib\VC\static\libeay32MTd.lib" OPENSSL_LIBS_RELEASE="D:\TBuild\Libraries\OpenSSL-Win32\lib\VC\static\ssleay32MT.lib D:\TBuild\Libraries\OpenSSL-Win32\lib\VC\static\libeay32MT.lib" -mp -nomake examples -platform win32-msvc2013
+    configure -debug-and-release -opensource -confirm-license -static -I "D:\TBuild\Libraries\OpenSSL-Win32\include" -L "C:\Program Files (x86)\Microsoft SDKs\Windows\v7.1A\Lib" -l Gdi32 -no-opengl -openssl-linked OPENSSL_LIBS_DEBUG="D:\TBuild\Libraries\OpenSSL-Win32\lib\VC\static\ssleay32MTd.lib D:\TBuild\Libraries\OpenSSL-Win32\lib\VC\static\libeay32MTd.lib" OPENSSL_LIBS_RELEASE="D:\TBuild\Libraries\OpenSSL-Win32\lib\VC\static\ssleay32MT.lib D:\TBuild\Libraries\OpenSSL-Win32\lib\VC\static\libeay32MT.lib" -mp -nomake examples -nomake tests -platform win32-msvc2013

 to configure Qt build. After configuration is complete run

-    nmake
-    nmake install
+    nmake module-qtbase module-qtimageformats
+    nmake module-qtbase-install_subtargets module-qtimageformats-install_subtargets

 building (**nmake** command) will take really long time.

@@ -156,8 +161,8 @@ Close all VS2013 instances and install to default location

 * Launch VS2013 for configuring Qt Addin
 * QT5 > Qt Options > Add
-  * Version name: **QtStatic.5.3.1**
+  * Version name: **QtStatic.5.4.0**
  * Path: **D:\TBuild\Libraries\QtStatic\qtbase**
-* Default Qt/Win version: **QtStatic.5.3.1** – **OK**
+* Default Qt/Win version: **QtStatic.5.4.0** – **OK**
 * File > Open > Project/Solution > **D:\TBuild\tdesktop\Telegram.sln**
 * Build \ Build Solution (Debug and Release configurations)
--- a/QTCREATOR.md
+++ b/QTCREATOR.md
@@ -30,7 +30,7 @@ or download in ZIP and extract to **/home/user/TBuild** rename **tdesktop-master

 Install dev libraries

-    sudo apt-get install libexif-dev liblzma-dev libz-dev libssl-dev
+    sudo apt-get install libexif-dev liblzma-dev libz-dev libssl-dev libappindicator-dev libunity-dev

 Install audio libraries

@@ -79,33 +79,38 @@ then go to **/home/user/TBuild/Libraries/openal-soft/build** and run
    make
    sudo make install

-####Qt 5.3.1, slightly patched
+####Qt 5.4.0, slightly patched

-http://download.qt-project.org/official_releases/qt/5.3/5.3.1/single/qt-everywhere-opensource-src-5.3.1.tar.gz
+http://download.qt-project.org/official_releases/qt/5.4/5.4.0/single/qt-everywhere-opensource-src-5.4.0.tar.gz

-Extract to **/home/user/TBuild/Libraries**, rename **qt-everywhere-opensource-src-5.3.1** to **QtStatic** to have **/home/user/TBuild/Libraries/QtStatic/qtbase** folder
+Extract to **/home/user/TBuild/Libraries**, rename **qt-everywhere-opensource-src-5.4.0** to **QtStatic** to have **/home/user/TBuild/Libraries/QtStatic/qtbase** folder

-Apply patch – copy (with overwrite!) everything from **/home/user/TBuild/tdesktop/\_qt\_5\_3\_1\_patch/** to **/home/user/TBuild/Libraries/QtStatic/**
+Apply patch:
+
+* OR copy (with overwrite!) everything from **/home/user/TBuild/tdesktop/\_qt\_5\_4\_0\_patch/** to **/home/user/TBuild/Libraries/QtStatic/**
+* OR copy **/home/user/TBuild/tdesktop/\_qt\_5\_4\_0\_patch.diff** to **/home/user/TBuild/Libraries/QtStatic/**, go there in Terminal and run
+
+    git apply _qt_5_4_0_patch.diff

 #####Building library

 Install some packages for Qt (see **/home/user/TBuild/Libraries/QtStatic/qtbase/src/plugins/platforms/xcb/README**)

-    sudo apt-get install libxcb1-dev libxcb-image0-dev libxcb-keysyms1-dev libxcb-icccm4-dev libxcb-render-util0-dev libxcb-util0-dev libxrender-dev libasound-dev libpulse-dev libxcb-sync0-dev libxcb-xfixes0-dev libxcb-randr0-dev libx11-xcb-dev
+    sudo apt-get install libxcb1-dev libxcb-image0-dev libxcb-keysyms1-dev libxcb-icccm4-dev libxcb-render-util0-dev libxcb-util0-dev libxrender-dev libasound-dev libpulse-dev libxcb-sync0-dev libxcb-xfixes0-dev libxcb-randr0-dev libx11-xcb-dev libffi-dev

 In Terminal go to **/home/user/TBuild/Libraries/QtStatic** and there run

-    ./configure -release -opensource -confirm-license -qt-xcb -no-opengl -static -nomake examples -skip qtquick1 -skip qtdeclarative
-    make
-    sudo make install
+    ./configure -release -opensource -confirm-license -qt-xcb -no-opengl -static -nomake examples -nomake tests -skip qtquick1 -skip qtdeclarative
+    make module-qtbase module-qtimageformats
+    sudo make module-qtbase-install_subtargets module-qtimageformats-install_subtargets

 building (**make** command) will take really long time.

 ###Building Telegram Desktop

 * Launch Qt Creator, all projects will be taken from **/home/user/TBuild/tdesktop/Telegram**
-* Tools > Options > Build & Run > Qt Versions tab > Add > File System /usr/local/Qt-5.3.1/bin/qmake > **Qt 5.3.1 (Qt-5.3.1)** > Apply
-* Tools > Options > Build & Run > Kits tab > Desktop (default) > change **Qt version** to **Qt 5.3.1 (Qt-5.3.1)** > Apply
+* Tools > Options > Build & Run > Qt Versions tab > Add > File System /usr/local/Qt-5.4.0/bin/qmake > **Qt 5.4.0 (Qt-5.4.0)** > Apply
+* Tools > Options > Build & Run > Kits tab > Desktop (default) > change **Qt version** to **Qt 5.4.0 (Qt-5.4.0)** > Apply
 * Open MetaStyle.pro, configure project with paths **/home/user/TBuild/tdesktop/Linux/DebugIntermediateStyle** and **/home/user/TBuild/tdesktop/Linux/ReleaseIntermediateStyle** and build for Debug
 * Open MetaEmoji.pro, configure project with paths **/home/user/TBuild/tdesktop/Linux/DebugIntermediateEmoji** and **/home/user/TBuild/tdesktop/Linux/ReleaseIntermediateEmoji** and build for Debug
 * Open MetaLang.pro, configure project with paths **/home/user/TBuild/tdesktop/Linux/DebugIntermediateLang** and **/home/user/TBuild/tdesktop/Linux/ReleaseIntermediateLang** and build for Debug
--- a/README.md
+++ b/README.md
@@ -20,7 +20,7 @@ Source code is published under GPL v3, license is available [here](https://githu

 ###Third-party

-* Qt 5.3.1, slightly patched ([LGPL](http://qt-project.org/doc/qt-5/lgpl.html))
+* Qt 5.4.0, slightly patched ([LGPL](http://qt-project.org/doc/qt-5/lgpl.html))
 * OpenSSL 1.0.1g ([OpenSSL License](https://www.openssl.org/source/license.html))
 * zlib 1.2.8 ([zlib License](http://www.zlib.net/zlib_license.html))
 * libexif 0.6.20 ([LGPL](https://www.gnu.org/licenses/old-licenses/lgpl-2.1.en.html))
@@ -30,8 +30,6 @@ Source code is published under GPL v3, license is available [here](https://githu
 * Opus codec, opusfile ([BSD license](http://www.opus-codec.org/license/))
 * libogg ([BSD license](http://www.xiph.org/downloads/))
 * Open Sans font ([Apache License](http://www.apache.org/licenses/LICENSE-2.0.html))
-* DejaVu Sans font ([Free license](http://dejavu-fonts.org/wiki/License))
-* Nanum Myeongjo font ([SIL Open Font License](http://fonts.gstatic.com/ea/nanummyeongjo/v4/OFL.txt))

 ###[Build instructions for Visual Studio 2013](https://github.com/telegramdesktop/tdesktop/blob/master/MSVC.md)

--- a/Telegram.sln
+++ b/Telegram.sln
@@ -1,7 +1,7 @@

 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 2013
-VisualStudioVersion = 12.0.30110.0
+VisualStudioVersion = 12.0.30501.0
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Telegram", "Telegram\Telegram.vcxproj", "{B12702AD-ABFB-343A-A199-8E24837244A3}"
 	ProjectSection(ProjectDependencies) = postProject
@@ -16,8 +16,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MetaEmoji", "Telegram\MetaE
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Updater", "Telegram\Updater.vcxproj", "{6B4BA3BE-7B15-4B4C-B200-81ABFDEF2C76}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Prepare", "Telegram\Prepare.vcxproj", "{88AB1138-143A-4CFB-A0E6-79B646B5E1B0}"
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MetaLang", "Telegram\MetaLang.vcxproj", "{E417CAA4-259B-4C99-88E3-805F1300E8EB}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{2F863EAD-33C9-4014-A573-93F085BA9CB1}"
@@ -54,13 +52,10 @@ Global
 		{6F483617-7C84-4E7E-91D8-1FF28A4CE3A0}.Release|Win32.Build.0 = Release|Win32
 		{6F483617-7C84-4E7E-91D8-1FF28A4CE3A0}.Release|x64.ActiveCfg = Release|Win32
 		{EB7D16AC-EACF-4577-B05A-F28E5F356794}.Debug|Win32.ActiveCfg = Debug|Win32
-		{EB7D16AC-EACF-4577-B05A-F28E5F356794}.Debug|Win32.Build.0 = Debug|Win32
 		{EB7D16AC-EACF-4577-B05A-F28E5F356794}.Debug|x64.ActiveCfg = Debug|Win32
 		{EB7D16AC-EACF-4577-B05A-F28E5F356794}.Deploy|Win32.ActiveCfg = Deploy|Win32
-		{EB7D16AC-EACF-4577-B05A-F28E5F356794}.Deploy|Win32.Build.0 = Deploy|Win32
 		{EB7D16AC-EACF-4577-B05A-F28E5F356794}.Deploy|x64.ActiveCfg = Release|Win32
 		{EB7D16AC-EACF-4577-B05A-F28E5F356794}.Release|Win32.ActiveCfg = Release|Win32
-		{EB7D16AC-EACF-4577-B05A-F28E5F356794}.Release|Win32.Build.0 = Release|Win32
 		{EB7D16AC-EACF-4577-B05A-F28E5F356794}.Release|x64.ActiveCfg = Release|Win32
 		{6B4BA3BE-7B15-4B4C-B200-81ABFDEF2C76}.Debug|Win32.ActiveCfg = Debug|Win32
 		{6B4BA3BE-7B15-4B4C-B200-81ABFDEF2C76}.Debug|Win32.Build.0 = Debug|Win32
@@ -71,15 +66,6 @@ Global
 		{6B4BA3BE-7B15-4B4C-B200-81ABFDEF2C76}.Release|Win32.ActiveCfg = Release|Win32
 		{6B4BA3BE-7B15-4B4C-B200-81ABFDEF2C76}.Release|Win32.Build.0 = Release|Win32
 		{6B4BA3BE-7B15-4B4C-B200-81ABFDEF2C76}.Release|x64.ActiveCfg = Release|Win32
-		{88AB1138-143A-4CFB-A0E6-79B646B5E1B0}.Debug|Win32.ActiveCfg = Debug|Win32
-		{88AB1138-143A-4CFB-A0E6-79B646B5E1B0}.Debug|Win32.Build.0 = Debug|Win32
-		{88AB1138-143A-4CFB-A0E6-79B646B5E1B0}.Debug|x64.ActiveCfg = Debug|Win32
-		{88AB1138-143A-4CFB-A0E6-79B646B5E1B0}.Deploy|Win32.ActiveCfg = Deploy|Win32
-		{88AB1138-143A-4CFB-A0E6-79B646B5E1B0}.Deploy|Win32.Build.0 = Deploy|Win32
-		{88AB1138-143A-4CFB-A0E6-79B646B5E1B0}.Deploy|x64.ActiveCfg = Release|Win32
-		{88AB1138-143A-4CFB-A0E6-79B646B5E1B0}.Release|Win32.ActiveCfg = Release|Win32
-		{88AB1138-143A-4CFB-A0E6-79B646B5E1B0}.Release|Win32.Build.0 = Release|Win32
-		{88AB1138-143A-4CFB-A0E6-79B646B5E1B0}.Release|x64.ActiveCfg = Release|Win32
 		{E417CAA4-259B-4C99-88E3-805F1300E8EB}.Debug|Win32.ActiveCfg = Debug|Win32
 		{E417CAA4-259B-4C99-88E3-805F1300E8EB}.Debug|Win32.Build.0 = Debug|Win32
 		{E417CAA4-259B-4C99-88E3-805F1300E8EB}.Debug|x64.ActiveCfg = Debug|Win32
--- a/Telegram/DeployLinux.sh
+++ b/Telegram/DeployLinux.sh
@@ -1,15 +1,20 @@
 AppVersion=`./Version.sh | awk -F " " '{print $1}'`
 AppVersionStr=`./Version.sh | awk -F " " '{print $2}'`
+DevChannel=`./Version.sh | awk -F " " '{print $3}'`
+DevPostfix=''
+if [ "$DevChannel" != "0" ]; then
+  DevPostfix='.dev'
+fi

-if [ ! -f "./../Linux/Release/deploy/$AppVersionStr/tlinuxupd$AppVersion" ]; then
+if [ ! -f "./../Linux/Release/deploy/$AppVersionStr$DevPostfix/tlinuxupd$AppVersion" ]; then
    echo "tlinuxupd$AppVersion not found!";
    exit 1
 fi

-if [ ! -f "./../Linux/Release/deploy/$AppVersionStr/tsetup.$AppVersionStr.tar.xz" ]; then
-    echo "tsetup.$AppVersionStr.tar.xz not found!"
+if [ ! -f "./../Linux/Release/deploy/$AppVersionStr$DevPostfix/tsetup.$AppVersionStr$DevPostfix.tar.xz" ]; then
+    echo "tsetup.$AppVersionStr$DevPostfix.tar.xz not found!"
    exit 1
 fi

-scp ./../Linux/Release/deploy/$AppVersionStr/tlinuxupd$AppVersion tmaster:tdesktop/www/tlinux/
-scp ./../Linux/Release/deploy/$AppVersionStr/tsetup.$AppVersionStr.tar.xz tmaster:tdesktop/www/tlinux/
+scp ./../Linux/Release/deploy/$AppVersionStr$DevPostfix/tlinuxupd$AppVersion tmaster:tdesktop/www/tlinux/
+scp ./../Linux/Release/deploy/$AppVersionStr$DevPostfix/tsetup.$AppVersionStr$DevPostfix.tar.xz tmaster:tdesktop/www/tlinux/
--- a/Telegram/DeployLinux32.sh
+++ b/Telegram/DeployLinux32.sh
@@ -1,16 +1,21 @@
 AppVersion=`./Version.sh | awk -F " " '{print $1}'`
 AppVersionStr=`./Version.sh | awk -F " " '{print $2}'`
+DevChannel=`./Version.sh | awk -F " " '{print $3}'`
+DevPostfix=''
+if [ "$DevChannel" != "0" ]; then
+  DevPostfix='.dev'
+fi

-if [ ! -f "./../Linux/Release/deploy/$AppVersionStr/tlinux32upd$AppVersion" ]; then
+if [ ! -f "./../Linux/Release/deploy/$AppVersionStr$DevPostfix/tlinux32upd$AppVersion" ]; then
    echo "tlinux32upd$AppVersion not found!"
    exit 1
 fi

-if [ ! -f "./../Linux/Release/deploy/$AppVersionStr/tsetup32.$AppVersionStr.tar.xz" ]; then
-    echo "tsetup32.$AppVersionStr.zip not found!"
+if [ ! -f "./../Linux/Release/deploy/$AppVersionStr$DevPostfix/tsetup32.$AppVersionStr$DevPostfix.tar.xz" ]; then
+    echo "tsetup32.$AppVersionStr$DevPostfix.zip not found!"
    exit 1
 fi

-scp ./../Linux/Release/deploy/$AppVersionStr/tlinux32upd$AppVersion tmaster:tdesktop/www/tlinux32/
-scp ./../Linux/Release/deploy/$AppVersionStr/tsetup32.$AppVersionStr.tar.xz tmaster:tdesktop/www/tlinux32/
+scp ./../Linux/Release/deploy/$AppVersionStr$DevPostfix/tlinux32upd$AppVersion tmaster:tdesktop/www/tlinux32/
+scp ./../Linux/Release/deploy/$AppVersionStr$DevPostfix/tsetup32.$AppVersionStr$DevPostfix.tar.xz tmaster:tdesktop/www/tlinux32/

--- a/Telegram/DeployMacWin.sh
+++ b/Telegram/DeployMacWin.sh
@@ -1,13 +1,18 @@
 AppVersion=`./Version.sh | awk -F " " '{print $1}'`
 AppVersionStr=`./Version.sh | awk -F " " '{print $2}'`
+DevChannel=`./Version.sh | awk -F " " '{print $3}'`
+DevPostfix=''
+if [ "$DevChannel" != "0" ]; then
+  DevPostfix='.dev'
+fi

-if [ ! -f "./../Mac/Release/deploy/$AppVersionStr/tmacupd$AppVersion" ]; then
+if [ ! -f "./../Mac/Release/deploy/$AppVersionStr$DevPostfix/tmacupd$AppVersion" ]; then
    echo "tmacupd$AppVersion not found!"
    exit 1
 fi

-if [ ! -f "./../Mac/Release/deploy/$AppVersionStr/tsetup.$AppVersionStr.dmg" ]; then
-    echo "tsetup.$AppVersionStr.dmg not found!"
+if [ ! -f "./../Mac/Release/deploy/$AppVersionStr$DevPostfix/tsetup.$AppVersionStr$DevPostfix.dmg" ]; then
+    echo "tsetup.$AppVersionStr$DevPostfix.dmg not found!"
    exit 1
 fi

@@ -16,18 +21,18 @@ if [ ! -f "./../../tother/tsetup/tupdate$AppVersion" ]; then
    exit 1
 fi

-if [ ! -f "./../../tother/tsetup/tportable.$AppVersionStr.zip" ]; then
-    echo "tportable.$AppVersionStr.zip not found!"
+if [ ! -f "./../../tother/tsetup/tportable.$AppVersionStr$DevPostfix.zip" ]; then
+    echo "tportable.$AppVersionStr$DevPostfix.zip not found!"
    exit 1
 fi

-if [ ! -f "./../../tother/tsetup/tsetup.$AppVersionStr.exe" ]; then
-    echo "tsetup.$AppVersionStr.exe not found!"
+if [ ! -f "./../../tother/tsetup/tsetup.$AppVersionStr$DevPostfix.exe" ]; then
+    echo "tsetup.$AppVersionStr$DevPostfix.exe not found!"
    exit 1
 fi

-scp ./../Mac/Release/deploy/$AppVersionStr/tmacupd$AppVersion tmaster:tdesktop/www/tmac/
-scp ./../Mac/Release/deploy/$AppVersionStr/tsetup.$AppVersionStr.dmg tmaster:tdesktop/www/tmac/
+scp ./../Mac/Release/deploy/$AppVersionStr$DevPostfix/tmacupd$AppVersion tmaster:tdesktop/www/tmac/
+scp ./../Mac/Release/deploy/$AppVersionStr$DevPostfix/tsetup.$AppVersionStr$DevPostfix.dmg tmaster:tdesktop/www/tmac/
 scp ./../../tother/tsetup/tupdate$AppVersion tmaster:tdesktop/www/tsetup/
-scp ./../../tother/tsetup/tportable.$AppVersionStr.zip tmaster:tdesktop/www/tsetup/
-scp ./../../tother/tsetup/tsetup.$AppVersionStr.exe tmaster:tdesktop/www/tsetup/
+scp ./../../tother/tsetup/tportable.$AppVersionStr$DevPostfix.zip tmaster:tdesktop/www/tsetup/
+scp ./../../tother/tsetup/tsetup.$AppVersionStr$DevPostfix.exe tmaster:tdesktop/www/tsetup/
--- a/Telegram/DeployWin.sh
+++ b/Telegram/DeployWin.sh
@@ -1,21 +1,26 @@
 AppVersion=`./Version.sh | awk -F " " '{print $1}'`
 AppVersionStr=`./Version.sh | awk -F " " '{print $2}'`
+DevChannel=`./Version.sh | awk -F " " '{print $3}'`
+DevPostfix=''
+if [ "$DevChannel" != "0" ]; then
+  DevPostfix='.dev'
+fi

-if [ ! -f "./../Win32/Deploy/deploy/$AppVersionStr/tupdate$AppVersion" ]; then
+if [ ! -f "./../Win32/Deploy/deploy/$AppVersionStr$DevPostfix/tupdate$AppVersion" ]; then
    echo "tupdate$AppVersion not found!"
    exit 1
 fi

-if [ ! -f "./../Win32/Deploy/deploy/$AppVersionStr/tportable.$AppVersionStr.zip" ]; then
-    echo "tportable.$AppVersionStr.zip not found!"
+if [ ! -f "./../Win32/Deploy/deploy/$AppVersionStr$DevPostfix/tportable.$AppVersionStr$DevPostfix.zip" ]; then
+    echo "tportable.$AppVersionStr$DevPostfix.zip not found!"
    exit 1
 fi

-if [ ! -f "./../Win32/Deploy/deploy/$AppVersionStr/tsetup.$AppVersionStr.exe" ]; then
-    echo "tsetup.$AppVersionStr.exe not found!"
+if [ ! -f "./../Win32/Deploy/deploy/$AppVersionStr$DevPostfix/tsetup.$AppVersionStr$DevPostfix.exe" ]; then
+    echo "tsetup.$AppVersionStr$DevPostfix.exe not found!"
    exit 1
 fi

-cp -v ./../Win32/Deploy/deploy/$AppVersionStr/tupdate$AppVersion /z/TBuild/tother/tsetup/
-cp -v ./../Win32/Deploy/deploy/$AppVersionStr/tportable.$AppVersionStr.zip /z/TBuild/tother/tsetup/
-cp -v ./../Win32/Deploy/deploy/$AppVersionStr/tsetup.$AppVersionStr.exe /z/TBuild/tother/tsetup/
+cp -v ./../Win32/Deploy/deploy/$AppVersionStr$DevPostfix/tupdate$AppVersion /z/TBuild/tother/tsetup/
+cp -v ./../Win32/Deploy/deploy/$AppVersionStr$DevPostfix/tportable.$AppVersionStr$DevPostfix.zip /z/TBuild/tother/tsetup/
+cp -v ./../Win32/Deploy/deploy/$AppVersionStr$DevPostfix/tsetup.$AppVersionStr$DevPostfix.exe /z/TBuild/tother/tsetup/
--- a/Telegram/FixMake.sh
+++ b/Telegram/FixMake.sh
@@ -1,20 +1,29 @@
-sed -i 's/\-lxcb\-render\-util/\/usr\/lib\/x86_64\-linux\-gnu\/libxcb\-render\-util\.a/g' Makefile
-sed -i 's/\-lxcb\-render/\/usr\/lib\/x86_64\-linux\-gnu\/libxcb\-render\.a/g' Makefile
-sed -i 's/\-lxcb\-sync/\/usr\/lib\/x86_64\-linux\-gnu\/libxcb\-sync\.a/g' Makefile
-sed -i 's/\-lxcb\-keysyms/\/usr\/lib\/x86_64\-linux\-gnu\/libxcb\-keysyms\.a/g' Makefile
-sed -i 's/\-lxcb\-icccm/\/usr\/lib\/x86_64\-linux\-gnu\/libxcb\-icccm\.a/g' Makefile
-sed -i 's/\-lxcb\-xfixes/\/usr\/lib\/x86_64\-linux\-gnu\/libxcb\-xfixes\.a/g' Makefile
-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\/lib\/x86_64\-linux\-gnu\/liblzma\.a/g' Makefile
-sed -i 's/\-lz/\/usr\/lib\/x86_64\-linux\-gnu\/libz\.a/g' Makefile
-sed -i 's/\-lssl/\/usr\/lib\/x86_64\-linux\-gnu\/libssl\.a/g' Makefile
-sed -i 's/\-lcrypto/\/usr\/lib\/x86_64\-linux\-gnu\/libcrypto\.a/g' Makefile
-sed -i 's/\-lexif/\/usr\/lib\/x86_64\-linux\-gnu\/libexif\.a/g' Makefile
-sed -i 's/\-lglib\-2\.0/\/usr\/lib\/x86_64\-linux\-gnu\/libglib\-2\.0\.a/g' Makefile
-sed -i 's/\-lopusfile/\/usr\/local\/lib\/libopusfile\.a/g' Makefile
-sed -i 's/\-lopus/\/usr\/local\/lib\/libopus\.a/g' Makefile
-sed -i 's/\-lopenal/\/usr\/local\/lib\/libopenal\.a/g' Makefile
-sed -i 's/\-logg/\/usr\/local\/lib\/libogg\.a/g' Makefile
+Replace () {
+    CheckCommand="grep -ci '$1' Makefile"
+    CheckCount=$(eval $CheckCommand)
+    if [ "$CheckCount" -gt 0 ]; then
+        echo "Requested '$1' to '$2', found - replacing.."
+        ReplaceCommand="sed -i 's/$1/$2/g' Makefile"
+        eval $ReplaceCommand
+    else
+        echo "Skipping '$1' to '$2'"
+    fi
+}
+
+Replace '\-llzma' '\/usr\/lib\/x86_64\-linux\-gnu\/liblzma\.a'
+Replace '\-lz' '\/usr\/lib\/x86_64\-linux\-gnu\/libz\.a'
+Replace '\-lssl' '\/usr\/lib\/x86_64\-linux\-gnu\/libssl\.a'
+Replace '\-lcrypto' '\/usr\/lib\/x86_64\-linux\-gnu\/libcrypto\.a'
+Replace '\-lexif' '\/usr\/lib\/x86_64\-linux\-gnu\/libexif\.a'
+Replace '\-lgobject\-2\.0' '\/usr\/lib\/x86_64\-linux\-gnu\/libgobject\-2\.0\.a \/usr\/lib\/x86_64\-linux\-gnu\/libffi\.a'
+Replace '\-lXi' '\/usr\/lib\/x86_64\-linux\-gnu\/libXi\.a'
+Replace '\-lSM' '\/usr\/lib\/x86_64\-linux\-gnu\/libSM\.a'
+Replace '\-lICE' '\/usr\/lib\/x86_64\-linux\-gnu\/libICE\.a'
+Replace '\-lfontconfig' '\/usr\/lib\/x86_64\-linux\-gnu\/libfontconfig\.a \/usr\/lib\/x86_64\-linux\-gnu\/libexpat\.a'
+Replace '\-lfreetype' '\/usr\/lib\/x86_64\-linux\-gnu\/libfreetype\.a'
+Replace '\-lpng' '\/usr\/lib\/x86_64\-linux\-gnu\/libpng\.a'
+Replace '\-lXext' '\/usr\/lib\/x86_64\-linux\-gnu\/libXext\.a'
+Replace '\-lopusfile' '\/usr\/local\/lib\/libopusfile\.a'
+Replace '\-lopus' '\/usr\/local\/lib\/libopus\.a'
+Replace '\-lopenal' '\/usr\/local\/lib\/libopenal\.a'
+Replace '\-logg' '\/usr\/local\/lib\/libogg\.a'
--- a/Telegram/FixMake32.sh
+++ b/Telegram/FixMake32.sh
@@ -1,20 +1,29 @@
-sed -i 's/\-lxcb\-render\-util/\/usr\/lib\/i386\-linux\-gnu\/libxcb\-render\-util\.a/g' Makefile
-sed -i 's/\-lxcb\-render/\/usr\/lib\/i386\-linux\-gnu\/libxcb\-render\.a/g' Makefile
-sed -i 's/\-lxcb\-sync/\/usr\/lib\/i386\-linux\-gnu\/libxcb\-sync\.a/g' Makefile
-sed -i 's/\-lxcb\-keysyms/\/usr\/lib\/i386\-linux\-gnu\/libxcb\-keysyms\.a/g' Makefile
-sed -i 's/\-lxcb\-icccm/\/usr\/lib\/i386\-linux\-gnu\/libxcb\-icccm\.a/g' Makefile
-sed -i 's/\-lxcb\-xfixes/\/usr\/lib\/i386\-linux\-gnu\/libxcb\-xfixes\.a/g' Makefile
-sed -i 's/\-lxcb\-shm/\/usr\/lib\/i386\-linux\-gnu\/libxcb\-shm\.a/g' Makefile
-sed -i 's/\-lxcb\-randr/\/usr\/lib\/i386\-linux\-gnu\/libxcb\-randr\.a/g' Makefile
-sed -i 's/\-lxcb\-shape/\/usr\/lib\/i386\-linux\-gnu\/libxcb\-shape\.a/g' Makefile
-sed -i 's/\-lxcb\-image/\/usr\/lib\/i386\-linux\-gnu\/libxcb\-image\.a \/usr\/lib\/i386\-linux\-gnu\/libxcb\-util\.a/g' Makefile
-sed -i 's/\-llzma/\/usr\/lib\/i386\-linux\-gnu\/liblzma\.a/g' Makefile
-sed -i 's/\-lz/\/usr\/lib\/i386\-linux\-gnu\/libz\.a/g' Makefile
-sed -i 's/\-lssl/\/usr\/lib\/i386\-linux\-gnu\/libssl\.a/g' Makefile
-sed -i 's/\-lcrypto/\/usr\/lib\/i386\-linux\-gnu\/libcrypto\.a/g' Makefile
-sed -i 's/\-lexif/\/usr\/lib\/i386\-linux\-gnu\/libexif\.a/g' Makefile
-sed -i 's/\-lglib\-2\.0/\/usr\/lib\/i386\-linux\-gnu\/libglib\-2\.0\.a/g' Makefile
-sed -i 's/\-lopusfile/\/usr\/local\/lib\/libopusfile\.a/g' Makefile
-sed -i 's/\-lopus/\/usr\/local\/lib\/libopus\.a/g' Makefile
-sed -i 's/\-lopenal/\/usr\/local\/lib\/libopenal\.a/g' Makefile
-sed -i 's/\-logg/\/usr\/local\/lib\/libogg\.a/g' Makefile
+Replace () {
+    CheckCommand="grep -ci '$1' Makefile"
+    CheckCount=$(eval $CheckCommand)
+    if [ "$CheckCount" -gt 0 ]; then
+        echo "Requested '$1' to '$2', found - replacing.."
+        ReplaceCommand="sed -i 's/$1/$2/g' Makefile"
+        eval $ReplaceCommand
+    else
+        echo "Skipping '$1' to '$2'"
+    fi
+}
+
+Replace '\-llzma' '\/usr\/lib\/i386\-linux\-gnu\/liblzma\.a'
+Replace '\-lz' '\/usr\/lib\/i386\-linux\-gnu\/libz\.a'
+Replace '\-lssl' '\/usr\/lib\/i386\-linux\-gnu\/libssl\.a'
+Replace '\-lcrypto' '\/usr\/lib\/i386\-linux\-gnu\/libcrypto\.a'
+Replace '\-lexif' '\/usr\/lib\/i386\-linux\-gnu\/libexif\.a'
+Replace '\-lgobject\-2\.0' '\/usr\/lib\/i386\-linux\-gnu\/libgobject\-2\.0\.a \/usr\/lib\/i386\-linux\-gnu\/libffi\.a'
+Replace '\-lXi' '\/usr\/lib\/i386\-linux\-gnu\/libXi\.a'
+Replace '\-lSM' '\/usr\/lib\/i386\-linux\-gnu\/libSM\.a'
+Replace '\-lICE' '\/usr\/lib\/i386\-linux\-gnu\/libICE\.a'
+Replace '\-lfontconfig' '\/usr\/lib\/i386\-linux\-gnu\/libfontconfig\.a \/usr\/lib\/i386\-linux\-gnu\/libexpat\.a'
+Replace '\-lfreetype' '\/usr\/lib\/i386\-linux\-gnu\/libfreetype\.a'
+Replace '\-lpng' '\/usr\/lib\/i386\-linux\-gnu\/libpng\.a'
+Replace '\-lXext' '\/usr\/lib\/i386\-linux\-gnu\/libXext\.a'
+Replace '\-lopusfile' '\/usr\/local\/lib\/libopusfile\.a'
+Replace '\-lopus' '\/usr\/local\/lib\/libopus\.a'
+Replace '\-lopenal' '\/usr\/local\/lib\/libopenal\.a'
+Replace '\-logg' '\/usr\/local\/lib\/libogg\.a'
--- a/Telegram/MetaEmoji.pro
+++ b/Telegram/MetaEmoji.pro
@@ -27,7 +27,7 @@ HEADERS += \
    ./SourceFiles/_other/memain.h \
    ./SourceFiles/_other/genemoji.h \

-INCLUDEPATH += ./../../Libraries/QtStatic/qtbase/include/QtGui/5.3.1/QtGui\
-               ./../../Libraries/QtStatic/qtbase/include/QtCore/5.3.1/QtCore\
+INCLUDEPATH += ./../../Libraries/QtStatic/qtbase/include/QtGui/5.4.0/QtGui\
+               ./../../Libraries/QtStatic/qtbase/include/QtCore/5.4.0/QtCore\
               ./../../Libraries/QtStatic/qtbase/include\

--- a/Telegram/MetaEmoji.vcxproj
+++ b/Telegram/MetaEmoji.vcxproj
@@ -105,7 +105,7 @@
      <SubSystem>Console</SubSystem>
      <OutputFile>$(OutDir)\$(ProjectName).exe</OutputFile>
      <AdditionalLibraryDirectories>$(QTDIR)\lib;$(QTDIR)\plugins;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>kernel32.lib;user32.lib;shell32.lib;uuid.lib;ole32.lib;advapi32.lib;ws2_32.lib;imm32.lib;winmm.lib;qtmaind.lib;glu32.lib;opengl32.lib;Qt5Cored.lib;Qt5Guid.lib;Qt5PlatformSupportd.lib;platforms\qwindowsd.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>kernel32.lib;user32.lib;shell32.lib;uuid.lib;ole32.lib;advapi32.lib;ws2_32.lib;imm32.lib;winmm.lib;qtmaind.lib;glu32.lib;opengl32.lib;Qt5Cored.lib;Qt5Guid.lib;qtharfbuzzngd.lib;Qt5PlatformSupportd.lib;platforms\qwindowsd.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <GenerateDebugInformation>true</GenerateDebugInformation>
      <ProgramDatabaseFile>$(IntDir)$(TargetName).pdb</ProgramDatabaseFile>
      <ProfileGuidedDatabase>$(IntDir)$(TargetName).pgd</ProfileGuidedDatabase>
@@ -123,7 +123,7 @@
      <SubSystem>Console</SubSystem>
      <OutputFile>$(OutDir)\$(ProjectName).exe</OutputFile>
      <AdditionalLibraryDirectories>$(QTDIR)\lib;$(QTDIR)\plugins;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>kernel32.lib;user32.lib;shell32.lib;uuid.lib;ole32.lib;advapi32.lib;ws2_32.lib;qtmain.lib;glu32.lib;opengl32.lib;imm32.lib;winmm.lib;Qt5Core.lib;Qt5Gui.lib;Qt5PlatformSupport.lib;platforms\qwindows.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>kernel32.lib;user32.lib;shell32.lib;uuid.lib;ole32.lib;advapi32.lib;ws2_32.lib;qtmain.lib;glu32.lib;opengl32.lib;imm32.lib;winmm.lib;Qt5Core.lib;Qt5Gui.lib;qtharfbuzzng.lib;Qt5PlatformSupport.lib;platforms\qwindows.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <GenerateDebugInformation>false</GenerateDebugInformation>
      <ProgramDatabaseFile>$(IntDir)$(TargetName).pdb</ProgramDatabaseFile>
      <ProfileGuidedDatabase>$(IntDir)$(TargetName).pgd</ProfileGuidedDatabase>
@@ -142,7 +142,7 @@
      <SubSystem>Console</SubSystem>
      <OutputFile>$(OutDir)\$(ProjectName).exe</OutputFile>
      <AdditionalLibraryDirectories>$(QTDIR)\lib;$(QTDIR)\plugins;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>kernel32.lib;user32.lib;shell32.lib;uuid.lib;ole32.lib;advapi32.lib;ws2_32.lib;qtmain.lib;glu32.lib;opengl32.lib;imm32.lib;winmm.lib;Qt5Core.lib;Qt5Gui.lib;Qt5PlatformSupport.lib;platforms\qwindows.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>kernel32.lib;user32.lib;shell32.lib;uuid.lib;ole32.lib;advapi32.lib;ws2_32.lib;qtmain.lib;glu32.lib;opengl32.lib;imm32.lib;winmm.lib;Qt5Core.lib;Qt5Gui.lib;qtharfbuzzng.lib;Qt5PlatformSupport.lib;platforms\qwindows.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <GenerateDebugInformation>false</GenerateDebugInformation>
      <ProgramDatabaseFile>$(IntDir)$(TargetName).pdb</ProgramDatabaseFile>
      <ProfileGuidedDatabase>$(IntDir)$(TargetName).pgd</ProfileGuidedDatabase>
--- a/Telegram/MetaEmoji.xcodeproj/project.pbxproj
+++ b/Telegram/MetaEmoji.xcodeproj/project.pbxproj
@@ -62,160 +62,160 @@
 /* End PBXContainerItemProxy section */

 /* Begin PBXFileReference section */
-		04391BE7A8B9D811E255100A /* Qt5Gui */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = Qt5Gui; path = "/usr/local/Qt-5.3.1/lib/libQt5Gui$(QT_LIBRARY_SUFFIX).a"; sourceTree = "<absolute>"; };
-		060A694B42A4555240009936 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qtga.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qtga.pri"; sourceTree = "<absolute>"; };
-		075EB50EB07CF69FD62FB8DF /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_sql_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_sql_private.pri"; sourceTree = "<absolute>"; };
-		0ABCEA8D0DD45589040B0AF2 /* /usr/local/Qt-5.3.1/mkspecs/common/unix.conf */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/common/unix.conf"; sourceTree = "<absolute>"; };
-		111BBEE3D1432C3B517FD539 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qdds.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qdds.pri"; sourceTree = "<absolute>"; };
-		16DD53E17C65AC8B450CC6C3 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_quick.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_quick.pri"; sourceTree = "<absolute>"; };
+		04391BE7A8B9D811E255100A /* Qt5Gui */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = Qt5Gui; path = "/usr/local/Qt-5.4.0/lib/libQt5Gui$(QT_LIBRARY_SUFFIX).a"; sourceTree = "<absolute>"; };
+		060A694B42A4555240009936 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qtga.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qtga.pri"; sourceTree = "<absolute>"; };
+		075EB50EB07CF69FD62FB8DF /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_sql_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_sql_private.pri"; sourceTree = "<absolute>"; };
+		0ABCEA8D0DD45589040B0AF2 /* /usr/local/Qt-5.4.0/mkspecs/common/unix.conf */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/common/unix.conf"; sourceTree = "<absolute>"; };
+		111BBEE3D1432C3B517FD539 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qdds.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qdds.pri"; sourceTree = "<absolute>"; };
+		16DD53E17C65AC8B450CC6C3 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_quick.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_quick.pri"; sourceTree = "<absolute>"; };
 		1F47C130E1F45B4A5A91DB5E /* genemoji.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = genemoji.cpp; path = SourceFiles/_other/genemoji.cpp; sourceTree = "<absolute>"; };
-		1FAE75C970AA73F2DEDDB508 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qavfcamera.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qavfcamera.pri"; sourceTree = "<absolute>"; };
-		23BC8B0FC3279421D41CA268 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_gui.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_gui.pri"; sourceTree = "<absolute>"; };
-		2440CD1D4CEF80443BCA1B8B /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qgenericbearer.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qgenericbearer.pri"; sourceTree = "<absolute>"; };
-		247D8DF3B1DDB665B80BBA25 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qtaccessiblequick.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qtaccessiblequick.pri"; sourceTree = "<absolute>"; };
-		24B6929EE3952310F2DAECB1 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qtaudio_coreaudio.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qtaudio_coreaudio.pri"; sourceTree = "<absolute>"; };
-		28BD0D10214709D95B161E24 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_multimediawidgets.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_multimediawidgets.pri"; sourceTree = "<absolute>"; };
-		293C8DEEE270847AC20E70F9 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_network.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_network.pri"; sourceTree = "<absolute>"; };
-		2E48BB382B895A5ACD79AF9F /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_bluetooth_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_bluetooth_private.pri"; sourceTree = "<absolute>"; };
-		2E6D9B1D2743D24E31B0B284 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_xmlpatterns.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_xmlpatterns.pri"; sourceTree = "<absolute>"; };
-		311004331A04F3D69C98643C /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_serialport_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_serialport_private.pri"; sourceTree = "<absolute>"; };
-		31120EDB269DFF13E1D49847 /* qicns */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = qicns; path = "/usr/local/Qt-5.3.1/plugins/imageformats/libqicns$(QT_LIBRARY_SUFFIX).a"; sourceTree = "<absolute>"; };
-		33F165B1DB8CBF182C56FAB5 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_macextras_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_macextras_private.pri"; sourceTree = "<absolute>"; };
-		346287C9E754E7C458153F03 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qwbmp.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qwbmp.pri"; sourceTree = "<absolute>"; };
-		360D4B3ED25D126430DE27D4 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_enginio.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_enginio.pri"; sourceTree = "<absolute>"; };
-		3685604BDB64DD6E92169B73 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qdeclarativeview.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qdeclarativeview.pri"; sourceTree = "<absolute>"; };
-		382E89A91A34F7898C25FD0D /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_network_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_network_private.pri"; sourceTree = "<absolute>"; };
+		1FAE75C970AA73F2DEDDB508 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qavfcamera.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qavfcamera.pri"; sourceTree = "<absolute>"; };
+		23BC8B0FC3279421D41CA268 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_gui.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_gui.pri"; sourceTree = "<absolute>"; };
+		2440CD1D4CEF80443BCA1B8B /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qgenericbearer.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qgenericbearer.pri"; sourceTree = "<absolute>"; };
+		247D8DF3B1DDB665B80BBA25 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qtaccessiblequick.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qtaccessiblequick.pri"; sourceTree = "<absolute>"; };
+		24B6929EE3952310F2DAECB1 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qtaudio_coreaudio.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qtaudio_coreaudio.pri"; sourceTree = "<absolute>"; };
+		28BD0D10214709D95B161E24 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_multimediawidgets.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_multimediawidgets.pri"; sourceTree = "<absolute>"; };
+		293C8DEEE270847AC20E70F9 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_network.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_network.pri"; sourceTree = "<absolute>"; };
+		2E48BB382B895A5ACD79AF9F /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_bluetooth_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_bluetooth_private.pri"; sourceTree = "<absolute>"; };
+		2E6D9B1D2743D24E31B0B284 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_xmlpatterns.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_xmlpatterns.pri"; sourceTree = "<absolute>"; };
+		311004331A04F3D69C98643C /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_serialport_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_serialport_private.pri"; sourceTree = "<absolute>"; };
+		31120EDB269DFF13E1D49847 /* qicns */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = qicns; path = "/usr/local/Qt-5.4.0/plugins/imageformats/libqicns$(QT_LIBRARY_SUFFIX).a"; sourceTree = "<absolute>"; };
+		33F165B1DB8CBF182C56FAB5 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_macextras_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_macextras_private.pri"; sourceTree = "<absolute>"; };
+		346287C9E754E7C458153F03 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qwbmp.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qwbmp.pri"; sourceTree = "<absolute>"; };
+		360D4B3ED25D126430DE27D4 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_enginio.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_enginio.pri"; sourceTree = "<absolute>"; };
+		3685604BDB64DD6E92169B73 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qdeclarativeview.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qdeclarativeview.pri"; sourceTree = "<absolute>"; };
+		382E89A91A34F7898C25FD0D /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_network_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_network_private.pri"; sourceTree = "<absolute>"; };
 		3AC2626B26B65AA88F06BFB5 /* memain.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = memain.cpp; path = SourceFiles/_other/memain.cpp; sourceTree = "<absolute>"; };
-		3F08D430CEC8D2117735CCB4 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qmldbg_tcp_qtdeclarative.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qmldbg_tcp_qtdeclarative.pri"; sourceTree = "<absolute>"; };
-		45B95DB3B70B47A910FC847B /* /usr/local/Qt-5.3.1/mkspecs/common/gcc-base.conf */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/common/gcc-base.conf"; sourceTree = "<absolute>"; };
-		45DB132B756499D4DF38430E /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qjp2.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qjp2.pri"; sourceTree = "<absolute>"; };
-		4689C06178B60B84E7F3A3B7 /* Qt5Widgets */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = Qt5Widgets; path = "/usr/local/Qt-5.3.1/lib/libQt5Widgets$(QT_LIBRARY_SUFFIX).a"; sourceTree = "<absolute>"; };
-		4C6C71914B1926119120DACD /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_enginio_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_enginio_private.pri"; sourceTree = "<absolute>"; };
+		3F08D430CEC8D2117735CCB4 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qmldbg_tcp_qtdeclarative.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qmldbg_tcp_qtdeclarative.pri"; sourceTree = "<absolute>"; };
+		45B95DB3B70B47A910FC847B /* /usr/local/Qt-5.4.0/mkspecs/common/gcc-base.conf */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/common/gcc-base.conf"; sourceTree = "<absolute>"; };
+		45DB132B756499D4DF38430E /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qjp2.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qjp2.pri"; sourceTree = "<absolute>"; };
+		4689C06178B60B84E7F3A3B7 /* Qt5Widgets */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = Qt5Widgets; path = "/usr/local/Qt-5.4.0/lib/libQt5Widgets$(QT_LIBRARY_SUFFIX).a"; sourceTree = "<absolute>"; };
+		4C6C71914B1926119120DACD /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_enginio_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_enginio_private.pri"; sourceTree = "<absolute>"; };
 		4D765E1B1EA6C757220C63E7 /* CoreFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreFoundation.framework; path = /System/Library/Frameworks/CoreFoundation.framework; sourceTree = "<absolute>"; };
-		4FB6657DA22BC68B819B64B3 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_qmldevtools_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_qmldevtools_private.pri"; sourceTree = "<absolute>"; };
-		5597304BEC94BFB9EAAEBC4B /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_openglextensions_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_openglextensions_private.pri"; sourceTree = "<absolute>"; };
+		4FB6657DA22BC68B819B64B3 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_qmldevtools_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_qmldevtools_private.pri"; sourceTree = "<absolute>"; };
+		5597304BEC94BFB9EAAEBC4B /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_openglextensions_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_openglextensions_private.pri"; sourceTree = "<absolute>"; };
 		58308B26DE991A86E8589883 /* genemoji.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = genemoji.h; path = SourceFiles/_other/genemoji.h; sourceTree = "<absolute>"; };
-		5A80A1907B6CFFB524C1E57D /* Qt5Core */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = Qt5Core; path = "/usr/local/Qt-5.3.1/lib/libQt5Core$(QT_LIBRARY_SUFFIX).a"; sourceTree = "<absolute>"; };
-		5B22E9E4EE9AAE42ABC24AB3 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_qtmultimediaquicktools_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_qtmultimediaquicktools_private.pri"; sourceTree = "<absolute>"; };
-		5CEA7A2DB2136425A88D1254 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_opengl.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_opengl.pri"; sourceTree = "<absolute>"; };
-		5F781C7FD8422D359EA1D2FE /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_core_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_core_private.pri"; sourceTree = "<absolute>"; };
-		6102C69805B6398AF6FA5BEB /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_qml_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_qml_private.pri"; sourceTree = "<absolute>"; };
-		63E722139886C87BC82DBDF5 /* /usr/local/Qt-5.3.1/mkspecs/macx-clang/qmake.conf */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/macx-clang/qmake.conf"; sourceTree = "<absolute>"; };
-		669FB007C4A3D58424D85EC8 /* /usr/local/Qt-5.3.1/mkspecs/common/shell-unix.conf */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/common/shell-unix.conf"; sourceTree = "<absolute>"; };
-		69347C39E4D922E94D0860BF /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_designercomponents_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_designercomponents_private.pri"; sourceTree = "<absolute>"; };
-		6C08BFC27C4C303A3A5181DB /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_printsupport.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_printsupport.pri"; sourceTree = "<absolute>"; };
-		6E67D23B15FC4B628DB2E0B2 /* /usr/local/Qt-5.3.1/mkspecs/qdevice.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/qdevice.pri"; sourceTree = "<absolute>"; };
-		74C1C232DFAA71028A0412CA /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qtmultimedia_m3u.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qtmultimedia_m3u.pri"; sourceTree = "<absolute>"; };
-		77FF486B1F9BCD55A8A3F35D /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_concurrent.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_concurrent.pri"; sourceTree = "<absolute>"; };
-		7A94C7168B3FCBE5F04A013B /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_declarative.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_declarative.pri"; sourceTree = "<absolute>"; };
-		7C2F42B222EE88E26A6FED62 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_designer_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_designer_private.pri"; sourceTree = "<absolute>"; };
-		7D28E9003CE64D8A7F2E292E /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_concurrent_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_concurrent_private.pri"; sourceTree = "<absolute>"; };
-		7DE30A90667C03C4F91A2A91 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_sql.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_sql.pri"; sourceTree = "<absolute>"; };
-		7ECCC1F9442988B4F2707CC1 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_core.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_core.pri"; sourceTree = "<absolute>"; };
-		817A0F5A41B553A6DE67FDEB /* /usr/local/Qt-5.3.1/mkspecs/common/macx.conf */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/common/macx.conf"; sourceTree = "<absolute>"; };
-		82E7DCFD95559532D8FC6CDD /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_quickparticles_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_quickparticles_private.pri"; sourceTree = "<absolute>"; };
-		83D37373949868693FB7816D /* qmng */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = qmng; path = "/usr/local/Qt-5.3.1/plugins/imageformats/libqmng$(QT_LIBRARY_SUFFIX).a"; sourceTree = "<absolute>"; };
-		85061B1DA49D125991117950 /* /usr/local/Qt-5.3.1/mkspecs/macx-xcode/qmake.conf */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/macx-xcode/qmake.conf"; sourceTree = "<absolute>"; };
-		85B6936EDBE61D9BB8F8B33B /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_sensors.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_sensors.pri"; sourceTree = "<absolute>"; };
-		87A4C1983FD641360BF80A02 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qtaccessiblewidgets.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qtaccessiblewidgets.pri"; sourceTree = "<absolute>"; };
-		87EEF25EE25CF21572D1438C /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_websockets_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_websockets_private.pri"; sourceTree = "<absolute>"; };
-		8849E60AEC7DB97A475C17EA /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_testlib_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_testlib_private.pri"; sourceTree = "<absolute>"; };
-		892D36BEF797BA4AF48D378A /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qtsensors_dummy.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qtsensors_dummy.pri"; sourceTree = "<absolute>"; };
-		89863CCAF1D29037AE95755D /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_declarative_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_declarative_private.pri"; sourceTree = "<absolute>"; };
-		8A04A4A3625204D12A1207F6 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_nfc.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_nfc.pri"; sourceTree = "<absolute>"; };
-		8B4BB4E74F8A4442EF563D7D /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qtsensorgestures_shakeplugin.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qtsensorgestures_shakeplugin.pri"; sourceTree = "<absolute>"; };
-		8C31D89BDFCDF466DAED19A0 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_quick_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_quick_private.pri"; sourceTree = "<absolute>"; };
-		8C5164D4E37556D40C5E6AA2 /* /usr/local/Qt-5.3.1/mkspecs/common/clang.conf */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/common/clang.conf"; sourceTree = "<absolute>"; };
-		8CF51323544B886B8F4A2232 /* qwbmp */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = qwbmp; path = "/usr/local/Qt-5.3.1/plugins/imageformats/libqwbmp$(QT_LIBRARY_SUFFIX).a"; sourceTree = "<absolute>"; };
+		5A80A1907B6CFFB524C1E57D /* Qt5Core */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = Qt5Core; path = "/usr/local/Qt-5.4.0/lib/libQt5Core$(QT_LIBRARY_SUFFIX).a"; sourceTree = "<absolute>"; };
+		5B22E9E4EE9AAE42ABC24AB3 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_qtmultimediaquicktools_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_qtmultimediaquicktools_private.pri"; sourceTree = "<absolute>"; };
+		5CEA7A2DB2136425A88D1254 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_opengl.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_opengl.pri"; sourceTree = "<absolute>"; };
+		5F781C7FD8422D359EA1D2FE /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_core_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_core_private.pri"; sourceTree = "<absolute>"; };
+		6102C69805B6398AF6FA5BEB /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_qml_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_qml_private.pri"; sourceTree = "<absolute>"; };
+		63E722139886C87BC82DBDF5 /* /usr/local/Qt-5.4.0/mkspecs/macx-clang/qmake.conf */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/macx-clang/qmake.conf"; sourceTree = "<absolute>"; };
+		669FB007C4A3D58424D85EC8 /* /usr/local/Qt-5.4.0/mkspecs/common/shell-unix.conf */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/common/shell-unix.conf"; sourceTree = "<absolute>"; };
+		69347C39E4D922E94D0860BF /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_designercomponents_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_designercomponents_private.pri"; sourceTree = "<absolute>"; };
+		6C08BFC27C4C303A3A5181DB /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_printsupport.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_printsupport.pri"; sourceTree = "<absolute>"; };
+		6E67D23B15FC4B628DB2E0B2 /* /usr/local/Qt-5.4.0/mkspecs/qdevice.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/qdevice.pri"; sourceTree = "<absolute>"; };
+		74C1C232DFAA71028A0412CA /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qtmultimedia_m3u.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qtmultimedia_m3u.pri"; sourceTree = "<absolute>"; };
+		77FF486B1F9BCD55A8A3F35D /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_concurrent.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_concurrent.pri"; sourceTree = "<absolute>"; };
+		7A94C7168B3FCBE5F04A013B /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_declarative.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_declarative.pri"; sourceTree = "<absolute>"; };
+		7C2F42B222EE88E26A6FED62 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_designer_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_designer_private.pri"; sourceTree = "<absolute>"; };
+		7D28E9003CE64D8A7F2E292E /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_concurrent_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_concurrent_private.pri"; sourceTree = "<absolute>"; };
+		7DE30A90667C03C4F91A2A91 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_sql.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_sql.pri"; sourceTree = "<absolute>"; };
+		7ECCC1F9442988B4F2707CC1 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_core.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_core.pri"; sourceTree = "<absolute>"; };
+		817A0F5A41B553A6DE67FDEB /* /usr/local/Qt-5.4.0/mkspecs/common/macx.conf */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/common/macx.conf"; sourceTree = "<absolute>"; };
+		82E7DCFD95559532D8FC6CDD /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_quickparticles_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_quickparticles_private.pri"; sourceTree = "<absolute>"; };
+		83D37373949868693FB7816D /* qmng */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = qmng; path = "/usr/local/Qt-5.4.0/plugins/imageformats/libqmng$(QT_LIBRARY_SUFFIX).a"; sourceTree = "<absolute>"; };
+		85061B1DA49D125991117950 /* /usr/local/Qt-5.4.0/mkspecs/macx-xcode/qmake.conf */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/macx-xcode/qmake.conf"; sourceTree = "<absolute>"; };
+		85B6936EDBE61D9BB8F8B33B /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_sensors.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_sensors.pri"; sourceTree = "<absolute>"; };
+		87A4C1983FD641360BF80A02 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qtaccessiblewidgets.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qtaccessiblewidgets.pri"; sourceTree = "<absolute>"; };
+		87EEF25EE25CF21572D1438C /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_websockets_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_websockets_private.pri"; sourceTree = "<absolute>"; };
+		8849E60AEC7DB97A475C17EA /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_testlib_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_testlib_private.pri"; sourceTree = "<absolute>"; };
+		892D36BEF797BA4AF48D378A /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qtsensors_dummy.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qtsensors_dummy.pri"; sourceTree = "<absolute>"; };
+		89863CCAF1D29037AE95755D /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_declarative_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_declarative_private.pri"; sourceTree = "<absolute>"; };
+		8A04A4A3625204D12A1207F6 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_nfc.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_nfc.pri"; sourceTree = "<absolute>"; };
+		8B4BB4E74F8A4442EF563D7D /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qtsensorgestures_shakeplugin.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qtsensorgestures_shakeplugin.pri"; sourceTree = "<absolute>"; };
+		8C31D89BDFCDF466DAED19A0 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_quick_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_quick_private.pri"; sourceTree = "<absolute>"; };
+		8C5164D4E37556D40C5E6AA2 /* /usr/local/Qt-5.4.0/mkspecs/common/clang.conf */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/common/clang.conf"; sourceTree = "<absolute>"; };
+		8CF51323544B886B8F4A2232 /* qwbmp */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = qwbmp; path = "/usr/local/Qt-5.4.0/plugins/imageformats/libqwbmp$(QT_LIBRARY_SUFFIX).a"; sourceTree = "<absolute>"; };
 		8D9815BDB5BD9F90D2BC05C5 /* AGL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AGL.framework; path = /System/Library/Frameworks/AGL.framework; sourceTree = "<absolute>"; };
-		8DDE1D26B3206CDB8B57FABE /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_svg_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_svg_private.pri"; sourceTree = "<absolute>"; };
-		8E9136256AFFBA6EF048AA55 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_widgets_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_widgets_private.pri"; sourceTree = "<absolute>"; };
-		8F500B5166907B6D9A7C3E3D /* qico */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = qico; path = "/usr/local/Qt-5.3.1/plugins/imageformats/libqico$(QT_LIBRARY_SUFFIX).a"; sourceTree = "<absolute>"; };
-		8F572030CE9AB8CC5F672201 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_platformsupport_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_platformsupport_private.pri"; sourceTree = "<absolute>"; };
-		8F97C9CAE38CA3AFAC0B3953 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_websockets.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_websockets.pri"; sourceTree = "<absolute>"; };
+		8DDE1D26B3206CDB8B57FABE /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_svg_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_svg_private.pri"; sourceTree = "<absolute>"; };
+		8E9136256AFFBA6EF048AA55 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_widgets_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_widgets_private.pri"; sourceTree = "<absolute>"; };
+		8F500B5166907B6D9A7C3E3D /* qico */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = qico; path = "/usr/local/Qt-5.4.0/plugins/imageformats/libqico$(QT_LIBRARY_SUFFIX).a"; sourceTree = "<absolute>"; };
+		8F572030CE9AB8CC5F672201 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_platformsupport_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_platformsupport_private.pri"; sourceTree = "<absolute>"; };
+		8F97C9CAE38CA3AFAC0B3953 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_websockets.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_websockets.pri"; sourceTree = "<absolute>"; };
 		93E4BE1A02365B73BAF00B73 /* moc_genemoji.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = moc_genemoji.cpp; path = GeneratedFiles/Debug/moc_genemoji.cpp; sourceTree = "<absolute>"; };
-		946BEA667170DC1A7A8F9DB0 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qmng.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qmng.pri"; sourceTree = "<absolute>"; };
+		946BEA667170DC1A7A8F9DB0 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qmng.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qmng.pri"; sourceTree = "<absolute>"; };
 		9742F24EE18EA44D52824F1E /* CoreServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreServices.framework; path = /System/Library/Frameworks/CoreServices.framework; sourceTree = "<absolute>"; };
-		9A0BDF67E013BB4FFB8685B0 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qqt7engine.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qqt7engine.pri"; sourceTree = "<absolute>"; };
+		9A0BDF67E013BB4FFB8685B0 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qqt7engine.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qqt7engine.pri"; sourceTree = "<absolute>"; };
 		9DFF62A901D70814B8A323D4 /* Carbon.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Carbon.framework; path = /System/Library/Frameworks/Carbon.framework; sourceTree = "<absolute>"; };
-		A022AF919D1977534CA66BB8 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_widgets.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_widgets.pri"; sourceTree = "<absolute>"; };
+		A022AF919D1977534CA66BB8 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_widgets.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_widgets.pri"; sourceTree = "<absolute>"; };
 		A1A67BEAA744704B29168D39 /* IOKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = IOKit.framework; path = /System/Library/Frameworks/IOKit.framework; sourceTree = "<absolute>"; };
-		A4D8AC60897F435C1C3B9D02 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qtsensors_generic.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qtsensors_generic.pri"; sourceTree = "<absolute>"; };
-		A59F74CD76FDC2B4B9910E18 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_scripttools_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_scripttools_private.pri"; sourceTree = "<absolute>"; };
-		A5B17ABEFBA1C2F43443D644 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_macextras.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_macextras.pri"; sourceTree = "<absolute>"; };
-		A9E30FA27827990C5F182223 /* /usr/local/Qt-5.3.1/mkspecs/common/gcc-base-mac.conf */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/common/gcc-base-mac.conf"; sourceTree = "<absolute>"; };
-		AA73DC3C2901E2979FE8AD5B /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_xml.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_xml.pri"; sourceTree = "<absolute>"; };
-		AB1C02DDBD8E88DD9A9AFDDD /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qtsensorgestures_plugin.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qtsensorgestures_plugin.pri"; sourceTree = "<absolute>"; };
+		A4D8AC60897F435C1C3B9D02 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qtsensors_generic.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qtsensors_generic.pri"; sourceTree = "<absolute>"; };
+		A59F74CD76FDC2B4B9910E18 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_scripttools_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_scripttools_private.pri"; sourceTree = "<absolute>"; };
+		A5B17ABEFBA1C2F43443D644 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_macextras.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_macextras.pri"; sourceTree = "<absolute>"; };
+		A9E30FA27827990C5F182223 /* /usr/local/Qt-5.4.0/mkspecs/common/gcc-base-mac.conf */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/common/gcc-base-mac.conf"; sourceTree = "<absolute>"; };
+		AA73DC3C2901E2979FE8AD5B /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_xml.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_xml.pri"; sourceTree = "<absolute>"; };
+		AB1C02DDBD8E88DD9A9AFDDD /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qtsensorgestures_plugin.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qtsensorgestures_plugin.pri"; sourceTree = "<absolute>"; };
 		AB745978DF0F41D1801ABDA6 /* .qmake.stash */ = {isa = PBXFileReference; lastKnownFileType = file; path = .qmake.stash; sourceTree = "<absolute>"; };
-		ABA9AB4619F09DCFD2D4A27F /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_qmltest_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_qmltest_private.pri"; sourceTree = "<absolute>"; };
-		ACC8A73268E5D9AF64E97AF4 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_bluetooth.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_bluetooth.pri"; sourceTree = "<absolute>"; };
-		ADC6308023253CEA51F86E21 /* qwebp */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = qwebp; path = "/usr/local/Qt-5.3.1/plugins/imageformats/libqwebp$(QT_LIBRARY_SUFFIX).a"; sourceTree = "<absolute>"; };
-		ADFC79902C14A612AE93A89A /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_svg.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_svg.pri"; sourceTree = "<absolute>"; };
+		ABA9AB4619F09DCFD2D4A27F /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_qmltest_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_qmltest_private.pri"; sourceTree = "<absolute>"; };
+		ACC8A73268E5D9AF64E97AF4 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_bluetooth.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_bluetooth.pri"; sourceTree = "<absolute>"; };
+		ADC6308023253CEA51F86E21 /* qwebp */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = qwebp; path = "/usr/local/Qt-5.4.0/plugins/imageformats/libqwebp$(QT_LIBRARY_SUFFIX).a"; sourceTree = "<absolute>"; };
+		ADFC79902C14A612AE93A89A /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_svg.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_svg.pri"; sourceTree = "<absolute>"; };
 		AEA456A2F75ED9F5CDA7BCBE /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = /System/Library/Frameworks/Cocoa.framework; sourceTree = "<absolute>"; };
-		AFD721AA33A2F785E77B1698 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qcocoa.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qcocoa.pri"; sourceTree = "<absolute>"; };
-		B064BF3B496A7BF7A449CA1E /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qsqlite.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qsqlite.pri"; sourceTree = "<absolute>"; };
-		B2246267D4C0D789259A86B0 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_quickwidgets_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_quickwidgets_private.pri"; sourceTree = "<absolute>"; };
-		B26239063A068F800A2C95F4 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qwebp.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qwebp.pri"; sourceTree = "<absolute>"; };
-		B382B645B34234E451AE5D94 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_qml.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_qml.pri"; sourceTree = "<absolute>"; };
-		B518DA4EE7376002AFC71FD5 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_uitools_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_uitools_private.pri"; sourceTree = "<absolute>"; };
-		B51B01657BFE9EAEF5590561 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_nfc_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_nfc_private.pri"; sourceTree = "<absolute>"; };
-		B678DA730B4ECE863AD631AE /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qminimal.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qminimal.pri"; sourceTree = "<absolute>"; };
-		B8525798C5AA7D7C6D68E1B3 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qmldbg_qtquick2.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qmldbg_qtquick2.pri"; sourceTree = "<absolute>"; };
-		B8C1F6C965A7A14FBA8D4518 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qtmedia_audioengine.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qtmedia_audioengine.pri"; sourceTree = "<absolute>"; };
-		BD22EFEFCC02644B1883CE19 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qtiff.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qtiff.pri"; sourceTree = "<absolute>"; };
-		BD4D97801B547471B37A4CDC /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_bootstrap_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_bootstrap_private.pri"; sourceTree = "<absolute>"; };
-		BDC9ECADEE40D11E3C2EA93F /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_sensors_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_sensors_private.pri"; sourceTree = "<absolute>"; };
-		BFF0C38FB0EC140C5F0304AE /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_serialport.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_serialport.pri"; sourceTree = "<absolute>"; };
+		AFD721AA33A2F785E77B1698 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qcocoa.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qcocoa.pri"; sourceTree = "<absolute>"; };
+		B064BF3B496A7BF7A449CA1E /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qsqlite.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qsqlite.pri"; sourceTree = "<absolute>"; };
+		B2246267D4C0D789259A86B0 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_quickwidgets_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_quickwidgets_private.pri"; sourceTree = "<absolute>"; };
+		B26239063A068F800A2C95F4 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qwebp.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qwebp.pri"; sourceTree = "<absolute>"; };
+		B382B645B34234E451AE5D94 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_qml.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_qml.pri"; sourceTree = "<absolute>"; };
+		B518DA4EE7376002AFC71FD5 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_uitools_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_uitools_private.pri"; sourceTree = "<absolute>"; };
+		B51B01657BFE9EAEF5590561 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_nfc_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_nfc_private.pri"; sourceTree = "<absolute>"; };
+		B678DA730B4ECE863AD631AE /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qminimal.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qminimal.pri"; sourceTree = "<absolute>"; };
+		B8525798C5AA7D7C6D68E1B3 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qmldbg_qtquick2.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qmldbg_qtquick2.pri"; sourceTree = "<absolute>"; };
+		B8C1F6C965A7A14FBA8D4518 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qtmedia_audioengine.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qtmedia_audioengine.pri"; sourceTree = "<absolute>"; };
+		BD22EFEFCC02644B1883CE19 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qtiff.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qtiff.pri"; sourceTree = "<absolute>"; };
+		BD4D97801B547471B37A4CDC /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_bootstrap_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_bootstrap_private.pri"; sourceTree = "<absolute>"; };
+		BDC9ECADEE40D11E3C2EA93F /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_sensors_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_sensors_private.pri"; sourceTree = "<absolute>"; };
+		BFF0C38FB0EC140C5F0304AE /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_serialport.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_serialport.pri"; sourceTree = "<absolute>"; };
 		C3345709A0BD182590087379 /* MetaEmoji.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = MetaEmoji.app; sourceTree = BUILT_PRODUCTS_DIR; };
-		C4295BE59CCEBCDD16268349 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qico.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qico.pri"; sourceTree = "<absolute>"; };
-		C505A18319B9B63C63877858 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_script_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_script_private.pri"; sourceTree = "<absolute>"; };
-		C84546C18DCBB04166195DCF /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qtposition_positionpoll.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qtposition_positionpoll.pri"; sourceTree = "<absolute>"; };
-		CCF75CFFB857487FB18F99F9 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qoffscreen.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qoffscreen.pri"; sourceTree = "<absolute>"; };
-		CE829DD126DD2B97E8D70A7A /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_scripttools.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_scripttools.pri"; sourceTree = "<absolute>"; };
-		CF86CD5BB01B9011E6B6FD3E /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_clucene_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_clucene_private.pri"; sourceTree = "<absolute>"; };
-		CFCB992BEC24B71BFB8A2F30 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_script.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_script.pri"; sourceTree = "<absolute>"; };
-		CFFBE05DB004895080314289 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qsvgicon.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qsvgicon.pri"; sourceTree = "<absolute>"; };
-		D0CDC87DAFDA7F18A7AF450F /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_printsupport_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_printsupport_private.pri"; sourceTree = "<absolute>"; };
-		D1FA7CAB5ACC09D563AE569F /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_multimediawidgets_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_multimediawidgets_private.pri"; sourceTree = "<absolute>"; };
-		D2FE4D909926A0D1656068C4 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_multimedia.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_multimedia.pri"; sourceTree = "<absolute>"; };
-		D3D1BE0BEA3AEE0551AD39AC /* qdds */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = qdds; path = "/usr/local/Qt-5.3.1/plugins/imageformats/libqdds$(QT_LIBRARY_SUFFIX).a"; sourceTree = "<absolute>"; };
+		C4295BE59CCEBCDD16268349 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qico.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qico.pri"; sourceTree = "<absolute>"; };
+		C505A18319B9B63C63877858 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_script_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_script_private.pri"; sourceTree = "<absolute>"; };
+		C84546C18DCBB04166195DCF /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qtposition_positionpoll.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qtposition_positionpoll.pri"; sourceTree = "<absolute>"; };
+		CCF75CFFB857487FB18F99F9 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qoffscreen.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qoffscreen.pri"; sourceTree = "<absolute>"; };
+		CE829DD126DD2B97E8D70A7A /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_scripttools.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_scripttools.pri"; sourceTree = "<absolute>"; };
+		CF86CD5BB01B9011E6B6FD3E /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_clucene_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_clucene_private.pri"; sourceTree = "<absolute>"; };
+		CFCB992BEC24B71BFB8A2F30 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_script.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_script.pri"; sourceTree = "<absolute>"; };
+		CFFBE05DB004895080314289 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qsvgicon.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qsvgicon.pri"; sourceTree = "<absolute>"; };
+		D0CDC87DAFDA7F18A7AF450F /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_printsupport_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_printsupport_private.pri"; sourceTree = "<absolute>"; };
+		D1FA7CAB5ACC09D563AE569F /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_multimediawidgets_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_multimediawidgets_private.pri"; sourceTree = "<absolute>"; };
+		D2FE4D909926A0D1656068C4 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_multimedia.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_multimedia.pri"; sourceTree = "<absolute>"; };
+		D3D1BE0BEA3AEE0551AD39AC /* qdds */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = qdds; path = "/usr/local/Qt-5.4.0/plugins/imageformats/libqdds$(QT_LIBRARY_SUFFIX).a"; sourceTree = "<absolute>"; };
 		D4B32C2222F82AC56BADEB21 /* OpenGL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGL.framework; path = /System/Library/Frameworks/OpenGL.framework; sourceTree = "<absolute>"; };
-		D4DE537C1FBBD48BD989FAD1 /* /usr/local/Qt-5.3.1/mkspecs/qconfig.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/qconfig.pri"; sourceTree = "<absolute>"; };
-		D5141F795670589C8CC41CBC /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_cocoaprintersupport.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_cocoaprintersupport.pri"; sourceTree = "<absolute>"; };
-		D53D8E6A188E05078A114294 /* qcocoa */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = qcocoa; path = "/usr/local/Qt-5.3.1/plugins/platforms/libqcocoa$(QT_LIBRARY_SUFFIX).a"; sourceTree = "<absolute>"; };
-		D6193B79CECC9DD0142D1200 /* qtharfbuzzng */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = qtharfbuzzng; path = "/usr/local/Qt-5.3.1/lib/libqtharfbuzzng$(QT_LIBRARY_SUFFIX).a"; sourceTree = "<absolute>"; };
-		D7A0618DE39A427EBF41940E /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_help_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_help_private.pri"; sourceTree = "<absolute>"; };
-		D81E3D9A18202BE8EC3D0E2C /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_gui_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_gui_private.pri"; sourceTree = "<absolute>"; };
-		D948D4D8F949D45158F8DE35 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_quickwidgets.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_quickwidgets.pri"; sourceTree = "<absolute>"; };
-		DB0A26DDC377B2004F61BFE3 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_testlib.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_testlib.pri"; sourceTree = "<absolute>"; };
-		DBF506D10449BFABD45B82DA /* Qt5PrintSupport */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = Qt5PrintSupport; path = "/usr/local/Qt-5.3.1/lib/libQt5PrintSupport$(QT_LIBRARY_SUFFIX).a"; sourceTree = "<absolute>"; };
-		DCEFD9167C239650120B0145 /* qtga */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = qtga; path = "/usr/local/Qt-5.3.1/plugins/imageformats/libqtga$(QT_LIBRARY_SUFFIX).a"; sourceTree = "<absolute>"; };
-		DF8188E30892A4654B984221 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_qmltest.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_qmltest.pri"; sourceTree = "<absolute>"; };
+		D4DE537C1FBBD48BD989FAD1 /* /usr/local/Qt-5.4.0/mkspecs/qconfig.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/qconfig.pri"; sourceTree = "<absolute>"; };
+		D5141F795670589C8CC41CBC /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_cocoaprintersupport.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_cocoaprintersupport.pri"; sourceTree = "<absolute>"; };
+		D53D8E6A188E05078A114294 /* qcocoa */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = qcocoa; path = "/usr/local/Qt-5.4.0/plugins/platforms/libqcocoa$(QT_LIBRARY_SUFFIX).a"; sourceTree = "<absolute>"; };
+		D6193B79CECC9DD0142D1200 /* qtharfbuzzng */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = qtharfbuzzng; path = "/usr/local/Qt-5.4.0/lib/libqtharfbuzzng$(QT_LIBRARY_SUFFIX).a"; sourceTree = "<absolute>"; };
+		D7A0618DE39A427EBF41940E /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_help_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_help_private.pri"; sourceTree = "<absolute>"; };
+		D81E3D9A18202BE8EC3D0E2C /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_gui_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_gui_private.pri"; sourceTree = "<absolute>"; };
+		D948D4D8F949D45158F8DE35 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_quickwidgets.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_quickwidgets.pri"; sourceTree = "<absolute>"; };
+		DB0A26DDC377B2004F61BFE3 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_testlib.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_testlib.pri"; sourceTree = "<absolute>"; };
+		DBF506D10449BFABD45B82DA /* Qt5PrintSupport */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = Qt5PrintSupport; path = "/usr/local/Qt-5.4.0/lib/libQt5PrintSupport$(QT_LIBRARY_SUFFIX).a"; sourceTree = "<absolute>"; };
+		DCEFD9167C239650120B0145 /* qtga */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = qtga; path = "/usr/local/Qt-5.4.0/plugins/imageformats/libqtga$(QT_LIBRARY_SUFFIX).a"; sourceTree = "<absolute>"; };
+		DF8188E30892A4654B984221 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_qmltest.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_qmltest.pri"; sourceTree = "<absolute>"; };
 		DFD7912080BC557230093752 /* ApplicationServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ApplicationServices.framework; path = /System/Library/Frameworks/ApplicationServices.framework; sourceTree = "<absolute>"; };
-		E0F4563EA350EB65112A0EF4 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_opengl_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_opengl_private.pri"; sourceTree = "<absolute>"; };
-		E37365B4489B4918BEBB707D /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_xml_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_xml_private.pri"; sourceTree = "<absolute>"; };
-		E432DA897A5F027987342E8F /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_openglextensions.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_openglextensions.pri"; sourceTree = "<absolute>"; };
-		E50FA73B8A23BC179A642B27 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_uitools.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_uitools.pri"; sourceTree = "<absolute>"; };
-		E66B9EC81C285CA9A7FB6A2E /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_positioning_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_positioning_private.pri"; sourceTree = "<absolute>"; };
-		E7B2F248E3F7970788F35BF5 /* Qt5PlatformSupport */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = Qt5PlatformSupport; path = "/usr/local/Qt-5.3.1/lib/libQt5PlatformSupport$(QT_LIBRARY_SUFFIX).a"; sourceTree = "<absolute>"; };
-		E7D67CB158408BB7DEA74764 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_multimedia_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_multimedia_private.pri"; sourceTree = "<absolute>"; };
+		E0F4563EA350EB65112A0EF4 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_opengl_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_opengl_private.pri"; sourceTree = "<absolute>"; };
+		E37365B4489B4918BEBB707D /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_xml_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_xml_private.pri"; sourceTree = "<absolute>"; };
+		E432DA897A5F027987342E8F /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_openglextensions.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_openglextensions.pri"; sourceTree = "<absolute>"; };
+		E50FA73B8A23BC179A642B27 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_uitools.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_uitools.pri"; sourceTree = "<absolute>"; };
+		E66B9EC81C285CA9A7FB6A2E /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_positioning_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_positioning_private.pri"; sourceTree = "<absolute>"; };
+		E7B2F248E3F7970788F35BF5 /* Qt5PlatformSupport */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = Qt5PlatformSupport; path = "/usr/local/Qt-5.4.0/lib/libQt5PlatformSupport$(QT_LIBRARY_SUFFIX).a"; sourceTree = "<absolute>"; };
+		E7D67CB158408BB7DEA74764 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_multimedia_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_multimedia_private.pri"; sourceTree = "<absolute>"; };
 		E981470FA003A8DCE3C52E59 /* memain.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = memain.h; path = SourceFiles/_other/memain.h; sourceTree = "<absolute>"; };
-		EA5D4FF9DE4AC4215D7DCE0D /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qcorewlanbearer.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qcorewlanbearer.pri"; sourceTree = "<absolute>"; };
-		EB1F99FD112917157F3C3F6E /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qicns.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qicns.pri"; sourceTree = "<absolute>"; };
-		EB29AC635054C09EFA749AE1 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qmldbg_tcp.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qmldbg_tcp.pri"; sourceTree = "<absolute>"; };
-		EBD39B69F368CEEAC360A16D /* /usr/local/Qt-5.3.1/mkspecs/common/mac.conf */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/common/mac.conf"; sourceTree = "<absolute>"; };
-		F0681BC551FC8A2B132FC646 /* qjp2 */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = qjp2; path = "/usr/local/Qt-5.3.1/plugins/imageformats/libqjp2$(QT_LIBRARY_SUFFIX).a"; sourceTree = "<absolute>"; };
-		F0A58515945747E36783CC21 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qmldbg_inspector.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qmldbg_inspector.pri"; sourceTree = "<absolute>"; };
+		EA5D4FF9DE4AC4215D7DCE0D /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qcorewlanbearer.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qcorewlanbearer.pri"; sourceTree = "<absolute>"; };
+		EB1F99FD112917157F3C3F6E /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qicns.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qicns.pri"; sourceTree = "<absolute>"; };
+		EB29AC635054C09EFA749AE1 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qmldbg_tcp.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qmldbg_tcp.pri"; sourceTree = "<absolute>"; };
+		EBD39B69F368CEEAC360A16D /* /usr/local/Qt-5.4.0/mkspecs/common/mac.conf */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/common/mac.conf"; sourceTree = "<absolute>"; };
+		F0681BC551FC8A2B132FC646 /* qjp2 */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = qjp2; path = "/usr/local/Qt-5.4.0/plugins/imageformats/libqjp2$(QT_LIBRARY_SUFFIX).a"; sourceTree = "<absolute>"; };
+		F0A58515945747E36783CC21 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qmldbg_inspector.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qmldbg_inspector.pri"; sourceTree = "<absolute>"; };
 		F13124A218B58585B027D96A /* MetaEmoji.pro */ = {isa = PBXFileReference; lastKnownFileType = text; path = MetaEmoji.pro; sourceTree = "<absolute>"; };
-		F2453BA07315EB9F34F1CD57 /* qtiff */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = qtiff; path = "/usr/local/Qt-5.3.1/plugins/imageformats/libqtiff$(QT_LIBRARY_SUFFIX).a"; sourceTree = "<absolute>"; };
-		F2F823087EA182CCBD5748B8 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_designer.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_designer.pri"; sourceTree = "<absolute>"; };
-		F33BE16353DD1557A9AB3558 /* /usr/local/Qt-5.3.1/mkspecs/common/clang-mac.conf */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/common/clang-mac.conf"; sourceTree = "<absolute>"; };
-		F4EB01857048DCFCFFAAC4D0 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qavfmediaplayer.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qavfmediaplayer.pri"; sourceTree = "<absolute>"; };
-		F7ADBF552F6B9A5982915164 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_positioning.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_positioning.pri"; sourceTree = "<absolute>"; };
-		F83F87F8A60C9DF666911D42 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qsvg.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qsvg.pri"; sourceTree = "<absolute>"; };
-		F9BEAA743A908603687DA204 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_xmlpatterns_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_xmlpatterns_private.pri"; sourceTree = "<absolute>"; };
+		F2453BA07315EB9F34F1CD57 /* qtiff */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = qtiff; path = "/usr/local/Qt-5.4.0/plugins/imageformats/libqtiff$(QT_LIBRARY_SUFFIX).a"; sourceTree = "<absolute>"; };
+		F2F823087EA182CCBD5748B8 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_designer.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_designer.pri"; sourceTree = "<absolute>"; };
+		F33BE16353DD1557A9AB3558 /* /usr/local/Qt-5.4.0/mkspecs/common/clang-mac.conf */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/common/clang-mac.conf"; sourceTree = "<absolute>"; };
+		F4EB01857048DCFCFFAAC4D0 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qavfmediaplayer.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qavfmediaplayer.pri"; sourceTree = "<absolute>"; };
+		F7ADBF552F6B9A5982915164 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_positioning.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_positioning.pri"; sourceTree = "<absolute>"; };
+		F83F87F8A60C9DF666911D42 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qsvg.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qsvg.pri"; sourceTree = "<absolute>"; };
+		F9BEAA743A908603687DA204 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_xmlpatterns_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_xmlpatterns_private.pri"; sourceTree = "<absolute>"; };
 		FCC237CA5AD60B9BA4447615 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = /System/Library/Frameworks/Foundation.framework; sourceTree = "<absolute>"; };
-		FD944B80F033DFE737D401A2 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_help.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_help.pri"; sourceTree = "<absolute>"; };
+		FD944B80F033DFE737D401A2 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_help.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_help.pri"; sourceTree = "<absolute>"; };
 /* End PBXFileReference section */

 /* Begin PBXFrameworksBuildPhase section */
@@ -294,127 +294,127 @@
 			isa = PBXGroup;
 			children = (
 				F13124A218B58585B027D96A /* MetaEmoji.pro */,
-				6E67D23B15FC4B628DB2E0B2 /* /usr/local/Qt-5.3.1/mkspecs/qdevice.pri */,
-				669FB007C4A3D58424D85EC8 /* /usr/local/Qt-5.3.1/mkspecs/common/shell-unix.conf */,
-				0ABCEA8D0DD45589040B0AF2 /* /usr/local/Qt-5.3.1/mkspecs/common/unix.conf */,
-				EBD39B69F368CEEAC360A16D /* /usr/local/Qt-5.3.1/mkspecs/common/mac.conf */,
-				817A0F5A41B553A6DE67FDEB /* /usr/local/Qt-5.3.1/mkspecs/common/macx.conf */,
-				45B95DB3B70B47A910FC847B /* /usr/local/Qt-5.3.1/mkspecs/common/gcc-base.conf */,
-				A9E30FA27827990C5F182223 /* /usr/local/Qt-5.3.1/mkspecs/common/gcc-base-mac.conf */,
-				8C5164D4E37556D40C5E6AA2 /* /usr/local/Qt-5.3.1/mkspecs/common/clang.conf */,
-				F33BE16353DD1557A9AB3558 /* /usr/local/Qt-5.3.1/mkspecs/common/clang-mac.conf */,
-				D4DE537C1FBBD48BD989FAD1 /* /usr/local/Qt-5.3.1/mkspecs/qconfig.pri */,
-				ACC8A73268E5D9AF64E97AF4 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_bluetooth.pri */,
-				2E48BB382B895A5ACD79AF9F /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_bluetooth_private.pri */,
-				BD4D97801B547471B37A4CDC /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_bootstrap_private.pri */,
-				CF86CD5BB01B9011E6B6FD3E /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_clucene_private.pri */,
-				77FF486B1F9BCD55A8A3F35D /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_concurrent.pri */,
-				7D28E9003CE64D8A7F2E292E /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_concurrent_private.pri */,
-				7ECCC1F9442988B4F2707CC1 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_core.pri */,
-				5F781C7FD8422D359EA1D2FE /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_core_private.pri */,
-				7A94C7168B3FCBE5F04A013B /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_declarative.pri */,
-				89863CCAF1D29037AE95755D /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_declarative_private.pri */,
-				F2F823087EA182CCBD5748B8 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_designer.pri */,
-				7C2F42B222EE88E26A6FED62 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_designer_private.pri */,
-				69347C39E4D922E94D0860BF /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_designercomponents_private.pri */,
-				360D4B3ED25D126430DE27D4 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_enginio.pri */,
-				4C6C71914B1926119120DACD /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_enginio_private.pri */,
-				23BC8B0FC3279421D41CA268 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_gui.pri */,
-				D81E3D9A18202BE8EC3D0E2C /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_gui_private.pri */,
-				FD944B80F033DFE737D401A2 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_help.pri */,
-				D7A0618DE39A427EBF41940E /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_help_private.pri */,
-				A5B17ABEFBA1C2F43443D644 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_macextras.pri */,
-				33F165B1DB8CBF182C56FAB5 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_macextras_private.pri */,
-				D2FE4D909926A0D1656068C4 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_multimedia.pri */,
-				E7D67CB158408BB7DEA74764 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_multimedia_private.pri */,
-				28BD0D10214709D95B161E24 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_multimediawidgets.pri */,
-				D1FA7CAB5ACC09D563AE569F /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_multimediawidgets_private.pri */,
-				293C8DEEE270847AC20E70F9 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_network.pri */,
-				382E89A91A34F7898C25FD0D /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_network_private.pri */,
-				8A04A4A3625204D12A1207F6 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_nfc.pri */,
-				B51B01657BFE9EAEF5590561 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_nfc_private.pri */,
-				5CEA7A2DB2136425A88D1254 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_opengl.pri */,
-				E0F4563EA350EB65112A0EF4 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_opengl_private.pri */,
-				E432DA897A5F027987342E8F /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_openglextensions.pri */,
-				5597304BEC94BFB9EAAEBC4B /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_openglextensions_private.pri */,
-				8F572030CE9AB8CC5F672201 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_platformsupport_private.pri */,
-				F7ADBF552F6B9A5982915164 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_positioning.pri */,
-				E66B9EC81C285CA9A7FB6A2E /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_positioning_private.pri */,
-				6C08BFC27C4C303A3A5181DB /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_printsupport.pri */,
-				D0CDC87DAFDA7F18A7AF450F /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_printsupport_private.pri */,
-				B382B645B34234E451AE5D94 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_qml.pri */,
-				6102C69805B6398AF6FA5BEB /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_qml_private.pri */,
-				4FB6657DA22BC68B819B64B3 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_qmldevtools_private.pri */,
-				DF8188E30892A4654B984221 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_qmltest.pri */,
-				ABA9AB4619F09DCFD2D4A27F /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_qmltest_private.pri */,
-				5B22E9E4EE9AAE42ABC24AB3 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_qtmultimediaquicktools_private.pri */,
-				16DD53E17C65AC8B450CC6C3 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_quick.pri */,
-				8C31D89BDFCDF466DAED19A0 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_quick_private.pri */,
-				82E7DCFD95559532D8FC6CDD /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_quickparticles_private.pri */,
-				D948D4D8F949D45158F8DE35 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_quickwidgets.pri */,
-				B2246267D4C0D789259A86B0 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_quickwidgets_private.pri */,
-				CFCB992BEC24B71BFB8A2F30 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_script.pri */,
-				C505A18319B9B63C63877858 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_script_private.pri */,
-				CE829DD126DD2B97E8D70A7A /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_scripttools.pri */,
-				A59F74CD76FDC2B4B9910E18 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_scripttools_private.pri */,
-				85B6936EDBE61D9BB8F8B33B /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_sensors.pri */,
-				BDC9ECADEE40D11E3C2EA93F /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_sensors_private.pri */,
-				BFF0C38FB0EC140C5F0304AE /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_serialport.pri */,
-				311004331A04F3D69C98643C /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_serialport_private.pri */,
-				7DE30A90667C03C4F91A2A91 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_sql.pri */,
-				075EB50EB07CF69FD62FB8DF /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_sql_private.pri */,
-				ADFC79902C14A612AE93A89A /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_svg.pri */,
-				8DDE1D26B3206CDB8B57FABE /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_svg_private.pri */,
-				DB0A26DDC377B2004F61BFE3 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_testlib.pri */,
-				8849E60AEC7DB97A475C17EA /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_testlib_private.pri */,
-				E50FA73B8A23BC179A642B27 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_uitools.pri */,
-				B518DA4EE7376002AFC71FD5 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_uitools_private.pri */,
-				8F97C9CAE38CA3AFAC0B3953 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_websockets.pri */,
-				87EEF25EE25CF21572D1438C /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_websockets_private.pri */,
-				A022AF919D1977534CA66BB8 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_widgets.pri */,
-				8E9136256AFFBA6EF048AA55 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_widgets_private.pri */,
-				AA73DC3C2901E2979FE8AD5B /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_xml.pri */,
-				E37365B4489B4918BEBB707D /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_xml_private.pri */,
-				2E6D9B1D2743D24E31B0B284 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_xmlpatterns.pri */,
-				F9BEAA743A908603687DA204 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_xmlpatterns_private.pri */,
-				D5141F795670589C8CC41CBC /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_cocoaprintersupport.pri */,
-				1FAE75C970AA73F2DEDDB508 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qavfcamera.pri */,
-				F4EB01857048DCFCFFAAC4D0 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qavfmediaplayer.pri */,
-				AFD721AA33A2F785E77B1698 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qcocoa.pri */,
-				EA5D4FF9DE4AC4215D7DCE0D /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qcorewlanbearer.pri */,
-				111BBEE3D1432C3B517FD539 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qdds.pri */,
-				3685604BDB64DD6E92169B73 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qdeclarativeview.pri */,
-				2440CD1D4CEF80443BCA1B8B /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qgenericbearer.pri */,
-				EB1F99FD112917157F3C3F6E /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qicns.pri */,
-				C4295BE59CCEBCDD16268349 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qico.pri */,
-				45DB132B756499D4DF38430E /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qjp2.pri */,
-				B678DA730B4ECE863AD631AE /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qminimal.pri */,
-				F0A58515945747E36783CC21 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qmldbg_inspector.pri */,
-				B8525798C5AA7D7C6D68E1B3 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qmldbg_qtquick2.pri */,
-				EB29AC635054C09EFA749AE1 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qmldbg_tcp.pri */,
-				3F08D430CEC8D2117735CCB4 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qmldbg_tcp_qtdeclarative.pri */,
-				946BEA667170DC1A7A8F9DB0 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qmng.pri */,
-				CCF75CFFB857487FB18F99F9 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qoffscreen.pri */,
-				9A0BDF67E013BB4FFB8685B0 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qqt7engine.pri */,
-				B064BF3B496A7BF7A449CA1E /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qsqlite.pri */,
-				F83F87F8A60C9DF666911D42 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qsvg.pri */,
-				CFFBE05DB004895080314289 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qsvgicon.pri */,
-				247D8DF3B1DDB665B80BBA25 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qtaccessiblequick.pri */,
-				87A4C1983FD641360BF80A02 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qtaccessiblewidgets.pri */,
-				24B6929EE3952310F2DAECB1 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qtaudio_coreaudio.pri */,
-				060A694B42A4555240009936 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qtga.pri */,
-				BD22EFEFCC02644B1883CE19 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qtiff.pri */,
-				B8C1F6C965A7A14FBA8D4518 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qtmedia_audioengine.pri */,
-				74C1C232DFAA71028A0412CA /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qtmultimedia_m3u.pri */,
-				C84546C18DCBB04166195DCF /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qtposition_positionpoll.pri */,
-				AB1C02DDBD8E88DD9A9AFDDD /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qtsensorgestures_plugin.pri */,
-				8B4BB4E74F8A4442EF563D7D /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qtsensorgestures_shakeplugin.pri */,
-				892D36BEF797BA4AF48D378A /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qtsensors_dummy.pri */,
-				A4D8AC60897F435C1C3B9D02 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qtsensors_generic.pri */,
-				346287C9E754E7C458153F03 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qwbmp.pri */,
-				B26239063A068F800A2C95F4 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qwebp.pri */,
-				63E722139886C87BC82DBDF5 /* /usr/local/Qt-5.3.1/mkspecs/macx-clang/qmake.conf */,
-				85061B1DA49D125991117950 /* /usr/local/Qt-5.3.1/mkspecs/macx-xcode/qmake.conf */,
+				6E67D23B15FC4B628DB2E0B2 /* /usr/local/Qt-5.4.0/mkspecs/qdevice.pri */,
+				669FB007C4A3D58424D85EC8 /* /usr/local/Qt-5.4.0/mkspecs/common/shell-unix.conf */,
+				0ABCEA8D0DD45589040B0AF2 /* /usr/local/Qt-5.4.0/mkspecs/common/unix.conf */,
+				EBD39B69F368CEEAC360A16D /* /usr/local/Qt-5.4.0/mkspecs/common/mac.conf */,
+				817A0F5A41B553A6DE67FDEB /* /usr/local/Qt-5.4.0/mkspecs/common/macx.conf */,
+				45B95DB3B70B47A910FC847B /* /usr/local/Qt-5.4.0/mkspecs/common/gcc-base.conf */,
+				A9E30FA27827990C5F182223 /* /usr/local/Qt-5.4.0/mkspecs/common/gcc-base-mac.conf */,
+				8C5164D4E37556D40C5E6AA2 /* /usr/local/Qt-5.4.0/mkspecs/common/clang.conf */,
+				F33BE16353DD1557A9AB3558 /* /usr/local/Qt-5.4.0/mkspecs/common/clang-mac.conf */,
+				D4DE537C1FBBD48BD989FAD1 /* /usr/local/Qt-5.4.0/mkspecs/qconfig.pri */,
+				ACC8A73268E5D9AF64E97AF4 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_bluetooth.pri */,
+				2E48BB382B895A5ACD79AF9F /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_bluetooth_private.pri */,
+				BD4D97801B547471B37A4CDC /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_bootstrap_private.pri */,
+				CF86CD5BB01B9011E6B6FD3E /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_clucene_private.pri */,
+				77FF486B1F9BCD55A8A3F35D /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_concurrent.pri */,
+				7D28E9003CE64D8A7F2E292E /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_concurrent_private.pri */,
+				7ECCC1F9442988B4F2707CC1 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_core.pri */,
+				5F781C7FD8422D359EA1D2FE /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_core_private.pri */,
+				7A94C7168B3FCBE5F04A013B /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_declarative.pri */,
+				89863CCAF1D29037AE95755D /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_declarative_private.pri */,
+				F2F823087EA182CCBD5748B8 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_designer.pri */,
+				7C2F42B222EE88E26A6FED62 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_designer_private.pri */,
+				69347C39E4D922E94D0860BF /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_designercomponents_private.pri */,
+				360D4B3ED25D126430DE27D4 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_enginio.pri */,
+				4C6C71914B1926119120DACD /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_enginio_private.pri */,
+				23BC8B0FC3279421D41CA268 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_gui.pri */,
+				D81E3D9A18202BE8EC3D0E2C /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_gui_private.pri */,
+				FD944B80F033DFE737D401A2 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_help.pri */,
+				D7A0618DE39A427EBF41940E /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_help_private.pri */,
+				A5B17ABEFBA1C2F43443D644 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_macextras.pri */,
+				33F165B1DB8CBF182C56FAB5 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_macextras_private.pri */,
+				D2FE4D909926A0D1656068C4 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_multimedia.pri */,
+				E7D67CB158408BB7DEA74764 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_multimedia_private.pri */,
+				28BD0D10214709D95B161E24 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_multimediawidgets.pri */,
+				D1FA7CAB5ACC09D563AE569F /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_multimediawidgets_private.pri */,
+				293C8DEEE270847AC20E70F9 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_network.pri */,
+				382E89A91A34F7898C25FD0D /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_network_private.pri */,
+				8A04A4A3625204D12A1207F6 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_nfc.pri */,
+				B51B01657BFE9EAEF5590561 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_nfc_private.pri */,
+				5CEA7A2DB2136425A88D1254 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_opengl.pri */,
+				E0F4563EA350EB65112A0EF4 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_opengl_private.pri */,
+				E432DA897A5F027987342E8F /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_openglextensions.pri */,
+				5597304BEC94BFB9EAAEBC4B /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_openglextensions_private.pri */,
+				8F572030CE9AB8CC5F672201 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_platformsupport_private.pri */,
+				F7ADBF552F6B9A5982915164 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_positioning.pri */,
+				E66B9EC81C285CA9A7FB6A2E /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_positioning_private.pri */,
+				6C08BFC27C4C303A3A5181DB /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_printsupport.pri */,
+				D0CDC87DAFDA7F18A7AF450F /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_printsupport_private.pri */,
+				B382B645B34234E451AE5D94 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_qml.pri */,
+				6102C69805B6398AF6FA5BEB /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_qml_private.pri */,
+				4FB6657DA22BC68B819B64B3 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_qmldevtools_private.pri */,
+				DF8188E30892A4654B984221 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_qmltest.pri */,
+				ABA9AB4619F09DCFD2D4A27F /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_qmltest_private.pri */,
+				5B22E9E4EE9AAE42ABC24AB3 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_qtmultimediaquicktools_private.pri */,
+				16DD53E17C65AC8B450CC6C3 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_quick.pri */,
+				8C31D89BDFCDF466DAED19A0 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_quick_private.pri */,
+				82E7DCFD95559532D8FC6CDD /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_quickparticles_private.pri */,
+				D948D4D8F949D45158F8DE35 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_quickwidgets.pri */,
+				B2246267D4C0D789259A86B0 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_quickwidgets_private.pri */,
+				CFCB992BEC24B71BFB8A2F30 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_script.pri */,
+				C505A18319B9B63C63877858 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_script_private.pri */,
+				CE829DD126DD2B97E8D70A7A /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_scripttools.pri */,
+				A59F74CD76FDC2B4B9910E18 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_scripttools_private.pri */,
+				85B6936EDBE61D9BB8F8B33B /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_sensors.pri */,
+				BDC9ECADEE40D11E3C2EA93F /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_sensors_private.pri */,
+				BFF0C38FB0EC140C5F0304AE /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_serialport.pri */,
+				311004331A04F3D69C98643C /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_serialport_private.pri */,
+				7DE30A90667C03C4F91A2A91 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_sql.pri */,
+				075EB50EB07CF69FD62FB8DF /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_sql_private.pri */,
+				ADFC79902C14A612AE93A89A /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_svg.pri */,
+				8DDE1D26B3206CDB8B57FABE /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_svg_private.pri */,
+				DB0A26DDC377B2004F61BFE3 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_testlib.pri */,
+				8849E60AEC7DB97A475C17EA /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_testlib_private.pri */,
+				E50FA73B8A23BC179A642B27 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_uitools.pri */,
+				B518DA4EE7376002AFC71FD5 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_uitools_private.pri */,
+				8F97C9CAE38CA3AFAC0B3953 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_websockets.pri */,
+				87EEF25EE25CF21572D1438C /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_websockets_private.pri */,
+				A022AF919D1977534CA66BB8 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_widgets.pri */,
+				8E9136256AFFBA6EF048AA55 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_widgets_private.pri */,
+				AA73DC3C2901E2979FE8AD5B /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_xml.pri */,
+				E37365B4489B4918BEBB707D /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_xml_private.pri */,
+				2E6D9B1D2743D24E31B0B284 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_xmlpatterns.pri */,
+				F9BEAA743A908603687DA204 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_xmlpatterns_private.pri */,
+				D5141F795670589C8CC41CBC /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_cocoaprintersupport.pri */,
+				1FAE75C970AA73F2DEDDB508 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qavfcamera.pri */,
+				F4EB01857048DCFCFFAAC4D0 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qavfmediaplayer.pri */,
+				AFD721AA33A2F785E77B1698 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qcocoa.pri */,
+				EA5D4FF9DE4AC4215D7DCE0D /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qcorewlanbearer.pri */,
+				111BBEE3D1432C3B517FD539 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qdds.pri */,
+				3685604BDB64DD6E92169B73 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qdeclarativeview.pri */,
+				2440CD1D4CEF80443BCA1B8B /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qgenericbearer.pri */,
+				EB1F99FD112917157F3C3F6E /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qicns.pri */,
+				C4295BE59CCEBCDD16268349 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qico.pri */,
+				45DB132B756499D4DF38430E /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qjp2.pri */,
+				B678DA730B4ECE863AD631AE /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qminimal.pri */,
+				F0A58515945747E36783CC21 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qmldbg_inspector.pri */,
+				B8525798C5AA7D7C6D68E1B3 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qmldbg_qtquick2.pri */,
+				EB29AC635054C09EFA749AE1 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qmldbg_tcp.pri */,
+				3F08D430CEC8D2117735CCB4 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qmldbg_tcp_qtdeclarative.pri */,
+				946BEA667170DC1A7A8F9DB0 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qmng.pri */,
+				CCF75CFFB857487FB18F99F9 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qoffscreen.pri */,
+				9A0BDF67E013BB4FFB8685B0 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qqt7engine.pri */,
+				B064BF3B496A7BF7A449CA1E /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qsqlite.pri */,
+				F83F87F8A60C9DF666911D42 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qsvg.pri */,
+				CFFBE05DB004895080314289 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qsvgicon.pri */,
+				247D8DF3B1DDB665B80BBA25 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qtaccessiblequick.pri */,
+				87A4C1983FD641360BF80A02 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qtaccessiblewidgets.pri */,
+				24B6929EE3952310F2DAECB1 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qtaudio_coreaudio.pri */,
+				060A694B42A4555240009936 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qtga.pri */,
+				BD22EFEFCC02644B1883CE19 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qtiff.pri */,
+				B8C1F6C965A7A14FBA8D4518 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qtmedia_audioengine.pri */,
+				74C1C232DFAA71028A0412CA /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qtmultimedia_m3u.pri */,
+				C84546C18DCBB04166195DCF /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qtposition_positionpoll.pri */,
+				AB1C02DDBD8E88DD9A9AFDDD /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qtsensorgestures_plugin.pri */,
+				8B4BB4E74F8A4442EF563D7D /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qtsensorgestures_shakeplugin.pri */,
+				892D36BEF797BA4AF48D378A /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qtsensors_dummy.pri */,
+				A4D8AC60897F435C1C3B9D02 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qtsensors_generic.pri */,
+				346287C9E754E7C458153F03 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qwbmp.pri */,
+				B26239063A068F800A2C95F4 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qwebp.pri */,
+				63E722139886C87BC82DBDF5 /* /usr/local/Qt-5.4.0/mkspecs/macx-clang/qmake.conf */,
+				85061B1DA49D125991117950 /* /usr/local/Qt-5.4.0/mkspecs/macx-xcode/qmake.conf */,
 				AB745978DF0F41D1801ABDA6 /* .qmake.stash */,
 			);
 			name = "Supporting Files";
@@ -515,7 +515,7 @@
 		6DB9C3763D02B1415CD9D565 /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 0610;
+				LastUpgradeCheck = 0630;
 			};
 			buildConfigurationList = DAC4C1AA5EDEA1C85E9CA5E6 /* Build configuration list for PBXProject "MetaEmoji" */;
 			compatibilityVersion = "Xcode 3.2";
@@ -589,6 +589,7 @@
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				FRAMEWORK_SEARCH_PATHS = "";
 				GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
+				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
 				GCC_WARN_64_TO_32_BIT_CONVERSION = NO;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
@@ -597,25 +598,25 @@
 				GCC_WARN_UNUSED_FUNCTION = NO;
 				GCC_WARN_UNUSED_VARIABLE = NO;
 				HEADER_SEARCH_PATHS = (
-					../../Libraries/QtStatic/qtbase/include/QtGui/5.3.1/QtGui,
-					../../Libraries/QtStatic/qtbase/include/QtCore/5.3.1/QtCore,
+					../../Libraries/QtStatic/qtbase/include/QtGui/5.4.0/QtGui,
+					../../Libraries/QtStatic/qtbase/include/QtCore/5.4.0/QtCore,
 					../../Libraries/QtStatic/qtbase/include,
-					"/usr/local/Qt-5.3.1/include",
-					"/usr/local/Qt-5.3.1/include/QtGui",
-					"/usr/local/Qt-5.3.1/include/QtCore",
+					"/usr/local/Qt-5.4.0/include",
+					"/usr/local/Qt-5.4.0/include/QtGui",
+					"/usr/local/Qt-5.4.0/include/QtCore",
 					GeneratedFiles/Debug,
 					/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.9.sdk/System/Library/Frameworks/OpenGL.framework/Versions/A/Headers,
 					/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.9.sdk/System/Library/Frameworks/AGL.framework/Headers,
-					"/usr/local/Qt-5.3.1/mkspecs/macx-clang",
+					"/usr/local/Qt-5.4.0/mkspecs/macx-clang",
 				);
 				INFOPLIST_FILE = Emoji.plist;
 				INSTALL_DIR = ../Mac/ReleaseEmoji/;
 				LDPLUSPLUS = "/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang++";
 				LIBRARY_SEARCH_PATHS = (
 					/System/Library/Frameworks/,
-					"/usr/local/Qt-5.3.1/lib",
-					"/usr/local/Qt-5.3.1/plugins/platforms",
-					"/usr/local/Qt-5.3.1/plugins/imageformats",
+					"/usr/local/Qt-5.4.0/lib",
+					"/usr/local/Qt-5.4.0/plugins/platforms",
+					"/usr/local/Qt-5.4.0/plugins/imageformats",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 10.7;
 				OBJROOT = ./../Mac/ReleaseIntermediateEmoji/;
@@ -644,10 +645,10 @@
 				OTHER_LDFLAGS = (
 					"-headerpad_max_install_names",
 					"-stdlib=libc++",
-					"-L/usr/local/Qt-5.3.1/lib",
-					"-L/usr/local/Qt-5.3.1/plugins/platforms",
+					"-L/usr/local/Qt-5.4.0/lib",
+					"-L/usr/local/Qt-5.4.0/plugins/platforms",
 					"-lcups",
-					"-L/usr/local/Qt-5.3.1/plugins/imageformats",
+					"-L/usr/local/Qt-5.4.0/plugins/imageformats",
 					"-lz",
 					"-lm",
 				);
@@ -677,6 +678,7 @@
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				FRAMEWORK_SEARCH_PATHS = "";
 				GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
+				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_OPTIMIZATION_LEVEL = 0;
 				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
 				GCC_WARN_64_TO_32_BIT_CONVERSION = NO;
@@ -686,25 +688,25 @@
 				GCC_WARN_UNUSED_FUNCTION = NO;
 				GCC_WARN_UNUSED_VARIABLE = NO;
 				HEADER_SEARCH_PATHS = (
-					../../Libraries/QtStatic/qtbase/include/QtGui/5.3.1/QtGui,
-					../../Libraries/QtStatic/qtbase/include/QtCore/5.3.1/QtCore,
+					../../Libraries/QtStatic/qtbase/include/QtGui/5.4.0/QtGui,
+					../../Libraries/QtStatic/qtbase/include/QtCore/5.4.0/QtCore,
 					../../Libraries/QtStatic/qtbase/include,
-					"/usr/local/Qt-5.3.1/include",
-					"/usr/local/Qt-5.3.1/include/QtGui",
-					"/usr/local/Qt-5.3.1/include/QtCore",
+					"/usr/local/Qt-5.4.0/include",
+					"/usr/local/Qt-5.4.0/include/QtGui",
+					"/usr/local/Qt-5.4.0/include/QtCore",
 					GeneratedFiles/Debug,
 					/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.9.sdk/System/Library/Frameworks/OpenGL.framework/Versions/A/Headers,
 					/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.9.sdk/System/Library/Frameworks/AGL.framework/Headers,
-					"/usr/local/Qt-5.3.1/mkspecs/macx-clang",
+					"/usr/local/Qt-5.4.0/mkspecs/macx-clang",
 				);
 				INFOPLIST_FILE = Emoji.plist;
 				INSTALL_DIR = ../Mac/DebugEmoji/;
 				LDPLUSPLUS = "/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang++";
 				LIBRARY_SEARCH_PATHS = (
 					/System/Library/Frameworks/,
-					"/usr/local/Qt-5.3.1/lib",
-					"/usr/local/Qt-5.3.1/plugins/platforms",
-					"/usr/local/Qt-5.3.1/plugins/imageformats",
+					"/usr/local/Qt-5.4.0/lib",
+					"/usr/local/Qt-5.4.0/plugins/platforms",
+					"/usr/local/Qt-5.4.0/plugins/imageformats",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 10.7;
 				OBJROOT = ./../Mac/DebugIntermediateEmoji/;
@@ -734,10 +736,10 @@
 				OTHER_LDFLAGS = (
 					"-headerpad_max_install_names",
 					"-stdlib=libc++",
-					"-L/usr/local/Qt-5.3.1/lib",
-					"-L/usr/local/Qt-5.3.1/plugins/platforms",
+					"-L/usr/local/Qt-5.4.0/lib",
+					"-L/usr/local/Qt-5.4.0/plugins/platforms",
 					"-lcups",
-					"-L/usr/local/Qt-5.3.1/plugins/imageformats",
+					"-L/usr/local/Qt-5.4.0/plugins/imageformats",
 					"-lz",
 					"-lm",
 				);
--- a/Telegram/MetaEmoji.xcodeproj/qt_preprocess.mak
+++ b/Telegram/MetaEmoji.xcodeproj/qt_preprocess.mak
@@ -1,21 +1,21 @@
 #############################################################################
 # Makefile for building: ../Mac/DebugEmoji/MetaEmoji.app/Contents/MacOS/MetaEmoji
-# Generated by qmake (3.0) (Qt 5.3.1)
+# Generated by qmake (3.0) (Qt 5.4.0)
 # Project:  MetaEmoji.pro
 # Template: app
-# Command: /usr/local/Qt-5.3.1/bin/qmake -spec macx-xcode -o MetaEmoji.xcodeproj/project.pbxproj MetaEmoji.pro
+# Command: /usr/local/Qt-5.4.0/bin/qmake -spec macx-xcode -o MetaEmoji.xcodeproj/project.pbxproj MetaEmoji.pro
 #############################################################################

 MAKEFILE      = project.pbxproj

-MOC       = /usr/local/Qt-5.3.1/bin/moc
+MOC       = /usr/local/Qt-5.4.0/bin/moc
 UIC       = 
 LEX       = flex
 LEXFLAGS  = 
 YACC      = yacc
 YACCFLAGS = -d
 DEFINES       = -D_DEBUG -DQT_GUI_LIB -DQT_CORE_LIB
-INCPATH       = -I/usr/local/Qt-5.3.1/mkspecs/macx-clang -I. -I../../Libraries/QtStatic/qtbase/include/QtGui/5.3.1/QtGui -I../../Libraries/QtStatic/qtbase/include/QtCore/5.3.1/QtCore -I../../Libraries/QtStatic/qtbase/include -I/usr/local/Qt-5.3.1/include -I/usr/local/Qt-5.3.1/include/QtGui -I/usr/local/Qt-5.3.1/include/QtCore -IGeneratedFiles/Debug -I/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.9.sdk/System/Library/Frameworks/OpenGL.framework/Versions/A/Headers -I/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.9.sdk/System/Library/Frameworks/AGL.framework/Headers
+INCPATH       = -I/usr/local/Qt-5.4.0/mkspecs/macx-clang -I. -I../../Libraries/QtStatic/qtbase/include/QtGui/5.4.0/QtGui -I../../Libraries/QtStatic/qtbase/include/QtCore/5.4.0/QtCore -I../../Libraries/QtStatic/qtbase/include -I/usr/local/Qt-5.4.0/include -I/usr/local/Qt-5.4.0/include/QtGui -I/usr/local/Qt-5.4.0/include/QtCore -IGeneratedFiles/Debug -I/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.9.sdk/System/Library/Frameworks/OpenGL.framework/Versions/A/Headers -I/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.9.sdk/System/Library/Frameworks/AGL.framework/Headers
 DEL_FILE  = rm -f
 MOVE      = mv -f

@@ -54,7 +54,7 @@ GeneratedFiles/Debug/moc_genemoji.cpp: ../../Libraries/QtStatic/qtbase/include/Q
 		../../Libraries/QtStatic/qtbase/include/QtCore/QCoreApplication \
 		../../Libraries/QtStatic/qtbase/include/QtGui/QGuiApplication \
 		SourceFiles/_other/genemoji.h
-	/usr/local/Qt-5.3.1/bin/moc $(DEFINES) -D__APPLE__ -D__GNUC__=4 -I/usr/local/Qt-5.3.1/mkspecs/macx-clang -I. -I/usr/local/Qt-5.3.1/include/QtGui/5.3.1/QtGui -I/usr/local/Qt-5.3.1/include/QtCore/5.3.1/QtCore -I/usr/local/Qt-5.3.1/include -I/usr/local/Qt-5.3.1/include/QtGui -I/usr/local/Qt-5.3.1/include/QtCore -I/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.9.sdk/usr/include/c++/4.2.1 -I/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.9.sdk/usr/include/c++/4.2.1/backward -I/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/lib/clang/5.1/include -I/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include -I/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.9.sdk/usr/include SourceFiles/_other/genemoji.h -o GeneratedFiles/Debug/moc_genemoji.cpp
+	/usr/local/Qt-5.4.0/bin/moc $(DEFINES) -D__APPLE__ -D__GNUC__=4 -I/usr/local/Qt-5.4.0/mkspecs/macx-clang -I. -I/usr/local/Qt-5.4.0/include/QtGui/5.4.0/QtGui -I/usr/local/Qt-5.4.0/include/QtCore/5.4.0/QtCore -I/usr/local/Qt-5.4.0/include -I/usr/local/Qt-5.4.0/include/QtGui -I/usr/local/Qt-5.4.0/include/QtCore -I/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.9.sdk/usr/include/c++/4.2.1 -I/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.9.sdk/usr/include/c++/4.2.1/backward -I/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/lib/clang/5.1/include -I/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include -I/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.9.sdk/usr/include SourceFiles/_other/genemoji.h -o GeneratedFiles/Debug/moc_genemoji.cpp

 compiler_moc_source_make_all:
 compiler_moc_source_clean:
--- a/Telegram/MetaLang.pro
+++ b/Telegram/MetaLang.pro
@@ -27,7 +27,7 @@ HEADERS += \
    ./SourceFiles/_other/mlmain.h \
    ./SourceFiles/_other/genlang.h \

-INCLUDEPATH += ./../../Libraries/QtStatic/qtbase/include/QtGui/5.3.1/QtGui\
-               ./../../Libraries/QtStatic/qtbase/include/QtCore/5.3.1/QtCore\
+INCLUDEPATH += ./../../Libraries/QtStatic/qtbase/include/QtGui/5.4.0/QtGui\
+               ./../../Libraries/QtStatic/qtbase/include/QtCore/5.4.0/QtCore\
               ./../../Libraries/QtStatic/qtbase/include\

--- a/Telegram/MetaLang.vcxproj
+++ b/Telegram/MetaLang.vcxproj
@@ -105,7 +105,7 @@
      <SubSystem>Console</SubSystem>
      <OutputFile>$(OutDir)\$(ProjectName).exe</OutputFile>
      <AdditionalLibraryDirectories>$(QTDIR)\lib;$(QTDIR)\plugins;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>kernel32.lib;user32.lib;shell32.lib;uuid.lib;ole32.lib;advapi32.lib;ws2_32.lib;imm32.lib;winmm.lib;qtmaind.lib;glu32.lib;opengl32.lib;Qt5Cored.lib;Qt5Guid.lib;Qt5Widgetsd.lib;Qt5Networkd.lib;Qt5PlatformSupportd.lib;platforms\qwindowsd.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>kernel32.lib;user32.lib;shell32.lib;uuid.lib;ole32.lib;advapi32.lib;ws2_32.lib;imm32.lib;winmm.lib;qtmaind.lib;glu32.lib;opengl32.lib;Qt5Cored.lib;Qt5Guid.lib;qtharfbuzzngd.lib;Qt5Widgetsd.lib;Qt5Networkd.lib;Qt5PlatformSupportd.lib;platforms\qwindowsd.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <GenerateDebugInformation>true</GenerateDebugInformation>
      <ProgramDatabaseFile>$(IntDir)$(TargetName).pdb</ProgramDatabaseFile>
      <ProfileGuidedDatabase>$(IntDir)$(TargetName).pgd</ProfileGuidedDatabase>
@@ -123,7 +123,7 @@
      <SubSystem>Console</SubSystem>
      <OutputFile>$(OutDir)\$(ProjectName).exe</OutputFile>
      <AdditionalLibraryDirectories>$(QTDIR)\lib;$(QTDIR)\plugins;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>kernel32.lib;user32.lib;shell32.lib;uuid.lib;ole32.lib;advapi32.lib;ws2_32.lib;qtmain.lib;opengl32.lib;imm32.lib;winmm.lib;Qt5Core.lib;Qt5Gui.lib;Qt5PlatformSupport.lib;platforms\qwindows.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>kernel32.lib;user32.lib;shell32.lib;uuid.lib;ole32.lib;advapi32.lib;ws2_32.lib;qtmain.lib;opengl32.lib;imm32.lib;winmm.lib;Qt5Core.lib;Qt5Gui.lib;qtharfbuzzng.lib;Qt5PlatformSupport.lib;platforms\qwindows.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <GenerateDebugInformation>false</GenerateDebugInformation>
    </Link>
  </ItemDefinitionGroup>
@@ -140,7 +140,7 @@
      <SubSystem>Console</SubSystem>
      <OutputFile>$(OutDir)\$(ProjectName).exe</OutputFile>
      <AdditionalLibraryDirectories>$(QTDIR)\lib;$(QTDIR)\plugins;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>kernel32.lib;user32.lib;shell32.lib;uuid.lib;ole32.lib;advapi32.lib;ws2_32.lib;qtmain.lib;opengl32.lib;imm32.lib;winmm.lib;Qt5Core.lib;Qt5Gui.lib;Qt5PlatformSupport.lib;platforms\qwindows.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>kernel32.lib;user32.lib;shell32.lib;uuid.lib;ole32.lib;advapi32.lib;ws2_32.lib;qtmain.lib;opengl32.lib;imm32.lib;winmm.lib;Qt5Core.lib;Qt5Gui.lib;qtharfbuzzng.lib;Qt5PlatformSupport.lib;platforms\qwindows.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <GenerateDebugInformation>false</GenerateDebugInformation>
    </Link>
  </ItemDefinitionGroup>
--- a/Telegram/MetaLang.xcodeproj/project.pbxproj
+++ b/Telegram/MetaLang.xcodeproj/project.pbxproj
@@ -63,160 +63,160 @@
 /* End PBXContainerItemProxy section */

 /* Begin PBXFileReference section */
-		04391BE7A8B9D811E255100A /* Qt5Gui */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = Qt5Gui; path = "/usr/local/Qt-5.3.1/lib/libQt5Gui$(QT_LIBRARY_SUFFIX).a"; sourceTree = "<absolute>"; };
-		060A694B42A4555240009936 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qtga.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qtga.pri"; sourceTree = "<absolute>"; };
-		075EB50EB07CF69FD62FB8DF /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_sql_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_sql_private.pri"; sourceTree = "<absolute>"; };
-		0ABCEA8D0DD45589040B0AF2 /* /usr/local/Qt-5.3.1/mkspecs/common/unix.conf */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/common/unix.conf"; sourceTree = "<absolute>"; };
-		111BBEE3D1432C3B517FD539 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qdds.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qdds.pri"; sourceTree = "<absolute>"; };
-		16DD53E17C65AC8B450CC6C3 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_quick.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_quick.pri"; sourceTree = "<absolute>"; };
-		1FAE75C970AA73F2DEDDB508 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qavfcamera.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qavfcamera.pri"; sourceTree = "<absolute>"; };
-		23BC8B0FC3279421D41CA268 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_gui.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_gui.pri"; sourceTree = "<absolute>"; };
-		2440CD1D4CEF80443BCA1B8B /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qgenericbearer.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qgenericbearer.pri"; sourceTree = "<absolute>"; };
-		247D8DF3B1DDB665B80BBA25 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qtaccessiblequick.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qtaccessiblequick.pri"; sourceTree = "<absolute>"; };
-		24B6929EE3952310F2DAECB1 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qtaudio_coreaudio.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qtaudio_coreaudio.pri"; sourceTree = "<absolute>"; };
-		28BD0D10214709D95B161E24 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_multimediawidgets.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_multimediawidgets.pri"; sourceTree = "<absolute>"; };
-		293C8DEEE270847AC20E70F9 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_network.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_network.pri"; sourceTree = "<absolute>"; };
-		2E48BB382B895A5ACD79AF9F /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_bluetooth_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_bluetooth_private.pri"; sourceTree = "<absolute>"; };
-		2E6D9B1D2743D24E31B0B284 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_xmlpatterns.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_xmlpatterns.pri"; sourceTree = "<absolute>"; };
-		311004331A04F3D69C98643C /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_serialport_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_serialport_private.pri"; sourceTree = "<absolute>"; };
-		31120EDB269DFF13E1D49847 /* qicns */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = qicns; path = "/usr/local/Qt-5.3.1/plugins/imageformats/libqicns$(QT_LIBRARY_SUFFIX).a"; sourceTree = "<absolute>"; };
+		04391BE7A8B9D811E255100A /* Qt5Gui */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = Qt5Gui; path = "/usr/local/Qt-5.4.0/lib/libQt5Gui$(QT_LIBRARY_SUFFIX).a"; sourceTree = "<absolute>"; };
+		060A694B42A4555240009936 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qtga.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qtga.pri"; sourceTree = "<absolute>"; };
+		075EB50EB07CF69FD62FB8DF /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_sql_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_sql_private.pri"; sourceTree = "<absolute>"; };
+		0ABCEA8D0DD45589040B0AF2 /* /usr/local/Qt-5.4.0/mkspecs/common/unix.conf */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/common/unix.conf"; sourceTree = "<absolute>"; };
+		111BBEE3D1432C3B517FD539 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qdds.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qdds.pri"; sourceTree = "<absolute>"; };
+		16DD53E17C65AC8B450CC6C3 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_quick.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_quick.pri"; sourceTree = "<absolute>"; };
+		1FAE75C970AA73F2DEDDB508 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qavfcamera.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qavfcamera.pri"; sourceTree = "<absolute>"; };
+		23BC8B0FC3279421D41CA268 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_gui.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_gui.pri"; sourceTree = "<absolute>"; };
+		2440CD1D4CEF80443BCA1B8B /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qgenericbearer.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qgenericbearer.pri"; sourceTree = "<absolute>"; };
+		247D8DF3B1DDB665B80BBA25 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qtaccessiblequick.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qtaccessiblequick.pri"; sourceTree = "<absolute>"; };
+		24B6929EE3952310F2DAECB1 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qtaudio_coreaudio.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qtaudio_coreaudio.pri"; sourceTree = "<absolute>"; };
+		28BD0D10214709D95B161E24 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_multimediawidgets.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_multimediawidgets.pri"; sourceTree = "<absolute>"; };
+		293C8DEEE270847AC20E70F9 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_network.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_network.pri"; sourceTree = "<absolute>"; };
+		2E48BB382B895A5ACD79AF9F /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_bluetooth_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_bluetooth_private.pri"; sourceTree = "<absolute>"; };
+		2E6D9B1D2743D24E31B0B284 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_xmlpatterns.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_xmlpatterns.pri"; sourceTree = "<absolute>"; };
+		311004331A04F3D69C98643C /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_serialport_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_serialport_private.pri"; sourceTree = "<absolute>"; };
+		31120EDB269DFF13E1D49847 /* qicns */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = qicns; path = "/usr/local/Qt-5.4.0/plugins/imageformats/libqicns$(QT_LIBRARY_SUFFIX).a"; sourceTree = "<absolute>"; };
 		33A9E861B2FAD8C39E154E7C /* MetaLang.pro */ = {isa = PBXFileReference; lastKnownFileType = text; path = MetaLang.pro; sourceTree = "<absolute>"; };
-		33F165B1DB8CBF182C56FAB5 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_macextras_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_macextras_private.pri"; sourceTree = "<absolute>"; };
-		346287C9E754E7C458153F03 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qwbmp.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qwbmp.pri"; sourceTree = "<absolute>"; };
-		360D4B3ED25D126430DE27D4 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_enginio.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_enginio.pri"; sourceTree = "<absolute>"; };
-		3685604BDB64DD6E92169B73 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qdeclarativeview.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qdeclarativeview.pri"; sourceTree = "<absolute>"; };
-		382E89A91A34F7898C25FD0D /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_network_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_network_private.pri"; sourceTree = "<absolute>"; };
-		3F08D430CEC8D2117735CCB4 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qmldbg_tcp_qtdeclarative.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qmldbg_tcp_qtdeclarative.pri"; sourceTree = "<absolute>"; };
-		45B95DB3B70B47A910FC847B /* /usr/local/Qt-5.3.1/mkspecs/common/gcc-base.conf */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/common/gcc-base.conf"; sourceTree = "<absolute>"; };
-		45DB132B756499D4DF38430E /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qjp2.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qjp2.pri"; sourceTree = "<absolute>"; };
-		4689C06178B60B84E7F3A3B7 /* Qt5Widgets */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = Qt5Widgets; path = "/usr/local/Qt-5.3.1/lib/libQt5Widgets$(QT_LIBRARY_SUFFIX).a"; sourceTree = "<absolute>"; };
-		4C6C71914B1926119120DACD /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_enginio_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_enginio_private.pri"; sourceTree = "<absolute>"; };
+		33F165B1DB8CBF182C56FAB5 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_macextras_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_macextras_private.pri"; sourceTree = "<absolute>"; };
+		346287C9E754E7C458153F03 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qwbmp.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qwbmp.pri"; sourceTree = "<absolute>"; };
+		360D4B3ED25D126430DE27D4 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_enginio.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_enginio.pri"; sourceTree = "<absolute>"; };
+		3685604BDB64DD6E92169B73 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qdeclarativeview.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qdeclarativeview.pri"; sourceTree = "<absolute>"; };
+		382E89A91A34F7898C25FD0D /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_network_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_network_private.pri"; sourceTree = "<absolute>"; };
+		3F08D430CEC8D2117735CCB4 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qmldbg_tcp_qtdeclarative.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qmldbg_tcp_qtdeclarative.pri"; sourceTree = "<absolute>"; };
+		45B95DB3B70B47A910FC847B /* /usr/local/Qt-5.4.0/mkspecs/common/gcc-base.conf */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/common/gcc-base.conf"; sourceTree = "<absolute>"; };
+		45DB132B756499D4DF38430E /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qjp2.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qjp2.pri"; sourceTree = "<absolute>"; };
+		4689C06178B60B84E7F3A3B7 /* Qt5Widgets */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = Qt5Widgets; path = "/usr/local/Qt-5.4.0/lib/libQt5Widgets$(QT_LIBRARY_SUFFIX).a"; sourceTree = "<absolute>"; };
+		4C6C71914B1926119120DACD /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_enginio_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_enginio_private.pri"; sourceTree = "<absolute>"; };
 		4D765E1B1EA6C757220C63E7 /* CoreFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreFoundation.framework; path = /System/Library/Frameworks/CoreFoundation.framework; sourceTree = "<absolute>"; };
-		4FB6657DA22BC68B819B64B3 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_qmldevtools_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_qmldevtools_private.pri"; sourceTree = "<absolute>"; };
+		4FB6657DA22BC68B819B64B3 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_qmldevtools_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_qmldevtools_private.pri"; sourceTree = "<absolute>"; };
 		54D6D1A7260739988F6FC406 /* genlang.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = genlang.h; path = SourceFiles/_other/genlang.h; sourceTree = "<absolute>"; };
-		5597304BEC94BFB9EAAEBC4B /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_openglextensions_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_openglextensions_private.pri"; sourceTree = "<absolute>"; };
-		5A80A1907B6CFFB524C1E57D /* Qt5Core */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = Qt5Core; path = "/usr/local/Qt-5.3.1/lib/libQt5Core$(QT_LIBRARY_SUFFIX).a"; sourceTree = "<absolute>"; };
-		5B22E9E4EE9AAE42ABC24AB3 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_qtmultimediaquicktools_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_qtmultimediaquicktools_private.pri"; sourceTree = "<absolute>"; };
-		5CEA7A2DB2136425A88D1254 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_opengl.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_opengl.pri"; sourceTree = "<absolute>"; };
-		5F781C7FD8422D359EA1D2FE /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_core_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_core_private.pri"; sourceTree = "<absolute>"; };
-		6102C69805B6398AF6FA5BEB /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_qml_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_qml_private.pri"; sourceTree = "<absolute>"; };
-		63E722139886C87BC82DBDF5 /* /usr/local/Qt-5.3.1/mkspecs/macx-clang/qmake.conf */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/macx-clang/qmake.conf"; sourceTree = "<absolute>"; };
+		5597304BEC94BFB9EAAEBC4B /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_openglextensions_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_openglextensions_private.pri"; sourceTree = "<absolute>"; };
+		5A80A1907B6CFFB524C1E57D /* Qt5Core */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = Qt5Core; path = "/usr/local/Qt-5.4.0/lib/libQt5Core$(QT_LIBRARY_SUFFIX).a"; sourceTree = "<absolute>"; };
+		5B22E9E4EE9AAE42ABC24AB3 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_qtmultimediaquicktools_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_qtmultimediaquicktools_private.pri"; sourceTree = "<absolute>"; };
+		5CEA7A2DB2136425A88D1254 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_opengl.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_opengl.pri"; sourceTree = "<absolute>"; };
+		5F781C7FD8422D359EA1D2FE /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_core_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_core_private.pri"; sourceTree = "<absolute>"; };
+		6102C69805B6398AF6FA5BEB /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_qml_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_qml_private.pri"; sourceTree = "<absolute>"; };
+		63E722139886C87BC82DBDF5 /* /usr/local/Qt-5.4.0/mkspecs/macx-clang/qmake.conf */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/macx-clang/qmake.conf"; sourceTree = "<absolute>"; };
 		669AB12AE74AC219B4669D79 /* genlang.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = genlang.cpp; path = SourceFiles/_other/genlang.cpp; sourceTree = "<absolute>"; };
-		669FB007C4A3D58424D85EC8 /* /usr/local/Qt-5.3.1/mkspecs/common/shell-unix.conf */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/common/shell-unix.conf"; sourceTree = "<absolute>"; };
+		669FB007C4A3D58424D85EC8 /* /usr/local/Qt-5.4.0/mkspecs/common/shell-unix.conf */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/common/shell-unix.conf"; sourceTree = "<absolute>"; };
 		680437016D61255E7F889A94 /* moc_genlang.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = moc_genlang.cpp; path = GeneratedFiles/Debug/moc_genlang.cpp; sourceTree = "<absolute>"; };
-		69347C39E4D922E94D0860BF /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_designercomponents_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_designercomponents_private.pri"; sourceTree = "<absolute>"; };
-		6C08BFC27C4C303A3A5181DB /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_printsupport.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_printsupport.pri"; sourceTree = "<absolute>"; };
-		6E67D23B15FC4B628DB2E0B2 /* /usr/local/Qt-5.3.1/mkspecs/qdevice.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/qdevice.pri"; sourceTree = "<absolute>"; };
-		74C1C232DFAA71028A0412CA /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qtmultimedia_m3u.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qtmultimedia_m3u.pri"; sourceTree = "<absolute>"; };
-		77FF486B1F9BCD55A8A3F35D /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_concurrent.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_concurrent.pri"; sourceTree = "<absolute>"; };
-		7A94C7168B3FCBE5F04A013B /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_declarative.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_declarative.pri"; sourceTree = "<absolute>"; };
-		7C2F42B222EE88E26A6FED62 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_designer_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_designer_private.pri"; sourceTree = "<absolute>"; };
-		7D28E9003CE64D8A7F2E292E /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_concurrent_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_concurrent_private.pri"; sourceTree = "<absolute>"; };
-		7DE30A90667C03C4F91A2A91 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_sql.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_sql.pri"; sourceTree = "<absolute>"; };
-		7ECCC1F9442988B4F2707CC1 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_core.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_core.pri"; sourceTree = "<absolute>"; };
-		817A0F5A41B553A6DE67FDEB /* /usr/local/Qt-5.3.1/mkspecs/common/macx.conf */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/common/macx.conf"; sourceTree = "<absolute>"; };
-		82E7DCFD95559532D8FC6CDD /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_quickparticles_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_quickparticles_private.pri"; sourceTree = "<absolute>"; };
-		83D37373949868693FB7816D /* qmng */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = qmng; path = "/usr/local/Qt-5.3.1/plugins/imageformats/libqmng$(QT_LIBRARY_SUFFIX).a"; sourceTree = "<absolute>"; };
+		69347C39E4D922E94D0860BF /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_designercomponents_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_designercomponents_private.pri"; sourceTree = "<absolute>"; };
+		6C08BFC27C4C303A3A5181DB /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_printsupport.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_printsupport.pri"; sourceTree = "<absolute>"; };
+		6E67D23B15FC4B628DB2E0B2 /* /usr/local/Qt-5.4.0/mkspecs/qdevice.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/qdevice.pri"; sourceTree = "<absolute>"; };
+		74C1C232DFAA71028A0412CA /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qtmultimedia_m3u.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qtmultimedia_m3u.pri"; sourceTree = "<absolute>"; };
+		77FF486B1F9BCD55A8A3F35D /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_concurrent.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_concurrent.pri"; sourceTree = "<absolute>"; };
+		7A94C7168B3FCBE5F04A013B /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_declarative.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_declarative.pri"; sourceTree = "<absolute>"; };
+		7C2F42B222EE88E26A6FED62 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_designer_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_designer_private.pri"; sourceTree = "<absolute>"; };
+		7D28E9003CE64D8A7F2E292E /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_concurrent_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_concurrent_private.pri"; sourceTree = "<absolute>"; };
+		7DE30A90667C03C4F91A2A91 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_sql.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_sql.pri"; sourceTree = "<absolute>"; };
+		7ECCC1F9442988B4F2707CC1 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_core.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_core.pri"; sourceTree = "<absolute>"; };
+		817A0F5A41B553A6DE67FDEB /* /usr/local/Qt-5.4.0/mkspecs/common/macx.conf */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/common/macx.conf"; sourceTree = "<absolute>"; };
+		82E7DCFD95559532D8FC6CDD /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_quickparticles_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_quickparticles_private.pri"; sourceTree = "<absolute>"; };
+		83D37373949868693FB7816D /* qmng */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = qmng; path = "/usr/local/Qt-5.4.0/plugins/imageformats/libqmng$(QT_LIBRARY_SUFFIX).a"; sourceTree = "<absolute>"; };
 		83FFCB79DDEB015B4A5CB301 /* MetaLang.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = MetaLang.app; sourceTree = BUILT_PRODUCTS_DIR; };
-		85061B1DA49D125991117950 /* /usr/local/Qt-5.3.1/mkspecs/macx-xcode/qmake.conf */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/macx-xcode/qmake.conf"; sourceTree = "<absolute>"; };
-		85B6936EDBE61D9BB8F8B33B /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_sensors.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_sensors.pri"; sourceTree = "<absolute>"; };
-		87A4C1983FD641360BF80A02 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qtaccessiblewidgets.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qtaccessiblewidgets.pri"; sourceTree = "<absolute>"; };
-		87EEF25EE25CF21572D1438C /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_websockets_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_websockets_private.pri"; sourceTree = "<absolute>"; };
-		8849E60AEC7DB97A475C17EA /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_testlib_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_testlib_private.pri"; sourceTree = "<absolute>"; };
-		892D36BEF797BA4AF48D378A /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qtsensors_dummy.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qtsensors_dummy.pri"; sourceTree = "<absolute>"; };
-		89863CCAF1D29037AE95755D /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_declarative_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_declarative_private.pri"; sourceTree = "<absolute>"; };
-		8A04A4A3625204D12A1207F6 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_nfc.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_nfc.pri"; sourceTree = "<absolute>"; };
-		8B4BB4E74F8A4442EF563D7D /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qtsensorgestures_shakeplugin.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qtsensorgestures_shakeplugin.pri"; sourceTree = "<absolute>"; };
-		8C31D89BDFCDF466DAED19A0 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_quick_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_quick_private.pri"; sourceTree = "<absolute>"; };
-		8C5164D4E37556D40C5E6AA2 /* /usr/local/Qt-5.3.1/mkspecs/common/clang.conf */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/common/clang.conf"; sourceTree = "<absolute>"; };
-		8CF51323544B886B8F4A2232 /* qwbmp */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = qwbmp; path = "/usr/local/Qt-5.3.1/plugins/imageformats/libqwbmp$(QT_LIBRARY_SUFFIX).a"; sourceTree = "<absolute>"; };
+		85061B1DA49D125991117950 /* /usr/local/Qt-5.4.0/mkspecs/macx-xcode/qmake.conf */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/macx-xcode/qmake.conf"; sourceTree = "<absolute>"; };
+		85B6936EDBE61D9BB8F8B33B /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_sensors.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_sensors.pri"; sourceTree = "<absolute>"; };
+		87A4C1983FD641360BF80A02 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qtaccessiblewidgets.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qtaccessiblewidgets.pri"; sourceTree = "<absolute>"; };
+		87EEF25EE25CF21572D1438C /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_websockets_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_websockets_private.pri"; sourceTree = "<absolute>"; };
+		8849E60AEC7DB97A475C17EA /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_testlib_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_testlib_private.pri"; sourceTree = "<absolute>"; };
+		892D36BEF797BA4AF48D378A /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qtsensors_dummy.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qtsensors_dummy.pri"; sourceTree = "<absolute>"; };
+		89863CCAF1D29037AE95755D /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_declarative_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_declarative_private.pri"; sourceTree = "<absolute>"; };
+		8A04A4A3625204D12A1207F6 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_nfc.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_nfc.pri"; sourceTree = "<absolute>"; };
+		8B4BB4E74F8A4442EF563D7D /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qtsensorgestures_shakeplugin.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qtsensorgestures_shakeplugin.pri"; sourceTree = "<absolute>"; };
+		8C31D89BDFCDF466DAED19A0 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_quick_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_quick_private.pri"; sourceTree = "<absolute>"; };
+		8C5164D4E37556D40C5E6AA2 /* /usr/local/Qt-5.4.0/mkspecs/common/clang.conf */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/common/clang.conf"; sourceTree = "<absolute>"; };
+		8CF51323544B886B8F4A2232 /* qwbmp */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = qwbmp; path = "/usr/local/Qt-5.4.0/plugins/imageformats/libqwbmp$(QT_LIBRARY_SUFFIX).a"; sourceTree = "<absolute>"; };
 		8D9815BDB5BD9F90D2BC05C5 /* AGL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AGL.framework; path = /System/Library/Frameworks/AGL.framework; sourceTree = "<absolute>"; };
-		8DDE1D26B3206CDB8B57FABE /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_svg_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_svg_private.pri"; sourceTree = "<absolute>"; };
-		8E9136256AFFBA6EF048AA55 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_widgets_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_widgets_private.pri"; sourceTree = "<absolute>"; };
-		8F500B5166907B6D9A7C3E3D /* qico */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = qico; path = "/usr/local/Qt-5.3.1/plugins/imageformats/libqico$(QT_LIBRARY_SUFFIX).a"; sourceTree = "<absolute>"; };
-		8F572030CE9AB8CC5F672201 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_platformsupport_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_platformsupport_private.pri"; sourceTree = "<absolute>"; };
-		8F97C9CAE38CA3AFAC0B3953 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_websockets.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_websockets.pri"; sourceTree = "<absolute>"; };
-		946BEA667170DC1A7A8F9DB0 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qmng.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qmng.pri"; sourceTree = "<absolute>"; };
+		8DDE1D26B3206CDB8B57FABE /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_svg_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_svg_private.pri"; sourceTree = "<absolute>"; };
+		8E9136256AFFBA6EF048AA55 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_widgets_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_widgets_private.pri"; sourceTree = "<absolute>"; };
+		8F500B5166907B6D9A7C3E3D /* qico */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = qico; path = "/usr/local/Qt-5.4.0/plugins/imageformats/libqico$(QT_LIBRARY_SUFFIX).a"; sourceTree = "<absolute>"; };
+		8F572030CE9AB8CC5F672201 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_platformsupport_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_platformsupport_private.pri"; sourceTree = "<absolute>"; };
+		8F97C9CAE38CA3AFAC0B3953 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_websockets.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_websockets.pri"; sourceTree = "<absolute>"; };
+		946BEA667170DC1A7A8F9DB0 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qmng.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qmng.pri"; sourceTree = "<absolute>"; };
 		9742F24EE18EA44D52824F1E /* CoreServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreServices.framework; path = /System/Library/Frameworks/CoreServices.framework; sourceTree = "<absolute>"; };
-		9A0BDF67E013BB4FFB8685B0 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qqt7engine.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qqt7engine.pri"; sourceTree = "<absolute>"; };
+		9A0BDF67E013BB4FFB8685B0 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qqt7engine.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qqt7engine.pri"; sourceTree = "<absolute>"; };
 		9DFF62A901D70814B8A323D4 /* Carbon.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Carbon.framework; path = /System/Library/Frameworks/Carbon.framework; sourceTree = "<absolute>"; };
-		A022AF919D1977534CA66BB8 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_widgets.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_widgets.pri"; sourceTree = "<absolute>"; };
+		A022AF919D1977534CA66BB8 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_widgets.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_widgets.pri"; sourceTree = "<absolute>"; };
 		A1A67BEAA744704B29168D39 /* IOKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = IOKit.framework; path = /System/Library/Frameworks/IOKit.framework; sourceTree = "<absolute>"; };
-		A4D8AC60897F435C1C3B9D02 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qtsensors_generic.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qtsensors_generic.pri"; sourceTree = "<absolute>"; };
-		A59F74CD76FDC2B4B9910E18 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_scripttools_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_scripttools_private.pri"; sourceTree = "<absolute>"; };
-		A5B17ABEFBA1C2F43443D644 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_macextras.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_macextras.pri"; sourceTree = "<absolute>"; };
+		A4D8AC60897F435C1C3B9D02 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qtsensors_generic.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qtsensors_generic.pri"; sourceTree = "<absolute>"; };
+		A59F74CD76FDC2B4B9910E18 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_scripttools_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_scripttools_private.pri"; sourceTree = "<absolute>"; };
+		A5B17ABEFBA1C2F43443D644 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_macextras.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_macextras.pri"; sourceTree = "<absolute>"; };
 		A83296E7180A28ABB0FD85D2 /* mlmain.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = mlmain.cpp; path = SourceFiles/_other/mlmain.cpp; sourceTree = "<absolute>"; };
-		A9E30FA27827990C5F182223 /* /usr/local/Qt-5.3.1/mkspecs/common/gcc-base-mac.conf */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/common/gcc-base-mac.conf"; sourceTree = "<absolute>"; };
-		AA73DC3C2901E2979FE8AD5B /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_xml.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_xml.pri"; sourceTree = "<absolute>"; };
-		AB1C02DDBD8E88DD9A9AFDDD /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qtsensorgestures_plugin.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qtsensorgestures_plugin.pri"; sourceTree = "<absolute>"; };
+		A9E30FA27827990C5F182223 /* /usr/local/Qt-5.4.0/mkspecs/common/gcc-base-mac.conf */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/common/gcc-base-mac.conf"; sourceTree = "<absolute>"; };
+		AA73DC3C2901E2979FE8AD5B /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_xml.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_xml.pri"; sourceTree = "<absolute>"; };
+		AB1C02DDBD8E88DD9A9AFDDD /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qtsensorgestures_plugin.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qtsensorgestures_plugin.pri"; sourceTree = "<absolute>"; };
 		AB745978DF0F41D1801ABDA6 /* .qmake.stash */ = {isa = PBXFileReference; lastKnownFileType = file; path = .qmake.stash; sourceTree = "<absolute>"; };
-		ABA9AB4619F09DCFD2D4A27F /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_qmltest_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_qmltest_private.pri"; sourceTree = "<absolute>"; };
-		ACC8A73268E5D9AF64E97AF4 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_bluetooth.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_bluetooth.pri"; sourceTree = "<absolute>"; };
-		ADC6308023253CEA51F86E21 /* qwebp */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = qwebp; path = "/usr/local/Qt-5.3.1/plugins/imageformats/libqwebp$(QT_LIBRARY_SUFFIX).a"; sourceTree = "<absolute>"; };
-		ADFC79902C14A612AE93A89A /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_svg.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_svg.pri"; sourceTree = "<absolute>"; };
+		ABA9AB4619F09DCFD2D4A27F /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_qmltest_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_qmltest_private.pri"; sourceTree = "<absolute>"; };
+		ACC8A73268E5D9AF64E97AF4 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_bluetooth.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_bluetooth.pri"; sourceTree = "<absolute>"; };
+		ADC6308023253CEA51F86E21 /* qwebp */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = qwebp; path = "/usr/local/Qt-5.4.0/plugins/imageformats/libqwebp$(QT_LIBRARY_SUFFIX).a"; sourceTree = "<absolute>"; };
+		ADFC79902C14A612AE93A89A /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_svg.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_svg.pri"; sourceTree = "<absolute>"; };
 		AEA456A2F75ED9F5CDA7BCBE /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = /System/Library/Frameworks/Cocoa.framework; sourceTree = "<absolute>"; };
-		AFD721AA33A2F785E77B1698 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qcocoa.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qcocoa.pri"; sourceTree = "<absolute>"; };
-		B064BF3B496A7BF7A449CA1E /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qsqlite.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qsqlite.pri"; sourceTree = "<absolute>"; };
-		B2246267D4C0D789259A86B0 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_quickwidgets_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_quickwidgets_private.pri"; sourceTree = "<absolute>"; };
-		B26239063A068F800A2C95F4 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qwebp.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qwebp.pri"; sourceTree = "<absolute>"; };
-		B382B645B34234E451AE5D94 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_qml.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_qml.pri"; sourceTree = "<absolute>"; };
-		B518DA4EE7376002AFC71FD5 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_uitools_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_uitools_private.pri"; sourceTree = "<absolute>"; };
-		B51B01657BFE9EAEF5590561 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_nfc_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_nfc_private.pri"; sourceTree = "<absolute>"; };
-		B678DA730B4ECE863AD631AE /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qminimal.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qminimal.pri"; sourceTree = "<absolute>"; };
-		B8525798C5AA7D7C6D68E1B3 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qmldbg_qtquick2.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qmldbg_qtquick2.pri"; sourceTree = "<absolute>"; };
-		B8C1F6C965A7A14FBA8D4518 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qtmedia_audioengine.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qtmedia_audioengine.pri"; sourceTree = "<absolute>"; };
-		BD22EFEFCC02644B1883CE19 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qtiff.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qtiff.pri"; sourceTree = "<absolute>"; };
-		BD4D97801B547471B37A4CDC /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_bootstrap_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_bootstrap_private.pri"; sourceTree = "<absolute>"; };
-		BDC9ECADEE40D11E3C2EA93F /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_sensors_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_sensors_private.pri"; sourceTree = "<absolute>"; };
-		BFF0C38FB0EC140C5F0304AE /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_serialport.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_serialport.pri"; sourceTree = "<absolute>"; };
-		C4295BE59CCEBCDD16268349 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qico.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qico.pri"; sourceTree = "<absolute>"; };
-		C505A18319B9B63C63877858 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_script_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_script_private.pri"; sourceTree = "<absolute>"; };
-		C84546C18DCBB04166195DCF /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qtposition_positionpoll.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qtposition_positionpoll.pri"; sourceTree = "<absolute>"; };
-		CCF75CFFB857487FB18F99F9 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qoffscreen.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qoffscreen.pri"; sourceTree = "<absolute>"; };
-		CE829DD126DD2B97E8D70A7A /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_scripttools.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_scripttools.pri"; sourceTree = "<absolute>"; };
-		CF86CD5BB01B9011E6B6FD3E /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_clucene_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_clucene_private.pri"; sourceTree = "<absolute>"; };
-		CFCB992BEC24B71BFB8A2F30 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_script.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_script.pri"; sourceTree = "<absolute>"; };
-		CFFBE05DB004895080314289 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qsvgicon.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qsvgicon.pri"; sourceTree = "<absolute>"; };
-		D0CDC87DAFDA7F18A7AF450F /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_printsupport_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_printsupport_private.pri"; sourceTree = "<absolute>"; };
-		D1FA7CAB5ACC09D563AE569F /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_multimediawidgets_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_multimediawidgets_private.pri"; sourceTree = "<absolute>"; };
-		D2FE4D909926A0D1656068C4 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_multimedia.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_multimedia.pri"; sourceTree = "<absolute>"; };
-		D3D1BE0BEA3AEE0551AD39AC /* qdds */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = qdds; path = "/usr/local/Qt-5.3.1/plugins/imageformats/libqdds$(QT_LIBRARY_SUFFIX).a"; sourceTree = "<absolute>"; };
+		AFD721AA33A2F785E77B1698 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qcocoa.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qcocoa.pri"; sourceTree = "<absolute>"; };
+		B064BF3B496A7BF7A449CA1E /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qsqlite.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qsqlite.pri"; sourceTree = "<absolute>"; };
+		B2246267D4C0D789259A86B0 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_quickwidgets_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_quickwidgets_private.pri"; sourceTree = "<absolute>"; };
+		B26239063A068F800A2C95F4 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qwebp.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qwebp.pri"; sourceTree = "<absolute>"; };
+		B382B645B34234E451AE5D94 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_qml.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_qml.pri"; sourceTree = "<absolute>"; };
+		B518DA4EE7376002AFC71FD5 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_uitools_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_uitools_private.pri"; sourceTree = "<absolute>"; };
+		B51B01657BFE9EAEF5590561 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_nfc_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_nfc_private.pri"; sourceTree = "<absolute>"; };
+		B678DA730B4ECE863AD631AE /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qminimal.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qminimal.pri"; sourceTree = "<absolute>"; };
+		B8525798C5AA7D7C6D68E1B3 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qmldbg_qtquick2.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qmldbg_qtquick2.pri"; sourceTree = "<absolute>"; };
+		B8C1F6C965A7A14FBA8D4518 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qtmedia_audioengine.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qtmedia_audioengine.pri"; sourceTree = "<absolute>"; };
+		BD22EFEFCC02644B1883CE19 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qtiff.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qtiff.pri"; sourceTree = "<absolute>"; };
+		BD4D97801B547471B37A4CDC /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_bootstrap_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_bootstrap_private.pri"; sourceTree = "<absolute>"; };
+		BDC9ECADEE40D11E3C2EA93F /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_sensors_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_sensors_private.pri"; sourceTree = "<absolute>"; };
+		BFF0C38FB0EC140C5F0304AE /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_serialport.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_serialport.pri"; sourceTree = "<absolute>"; };
+		C4295BE59CCEBCDD16268349 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qico.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qico.pri"; sourceTree = "<absolute>"; };
+		C505A18319B9B63C63877858 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_script_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_script_private.pri"; sourceTree = "<absolute>"; };
+		C84546C18DCBB04166195DCF /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qtposition_positionpoll.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qtposition_positionpoll.pri"; sourceTree = "<absolute>"; };
+		CCF75CFFB857487FB18F99F9 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qoffscreen.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qoffscreen.pri"; sourceTree = "<absolute>"; };
+		CE829DD126DD2B97E8D70A7A /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_scripttools.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_scripttools.pri"; sourceTree = "<absolute>"; };
+		CF86CD5BB01B9011E6B6FD3E /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_clucene_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_clucene_private.pri"; sourceTree = "<absolute>"; };
+		CFCB992BEC24B71BFB8A2F30 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_script.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_script.pri"; sourceTree = "<absolute>"; };
+		CFFBE05DB004895080314289 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qsvgicon.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qsvgicon.pri"; sourceTree = "<absolute>"; };
+		D0CDC87DAFDA7F18A7AF450F /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_printsupport_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_printsupport_private.pri"; sourceTree = "<absolute>"; };
+		D1FA7CAB5ACC09D563AE569F /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_multimediawidgets_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_multimediawidgets_private.pri"; sourceTree = "<absolute>"; };
+		D2FE4D909926A0D1656068C4 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_multimedia.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_multimedia.pri"; sourceTree = "<absolute>"; };
+		D3D1BE0BEA3AEE0551AD39AC /* qdds */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = qdds; path = "/usr/local/Qt-5.4.0/plugins/imageformats/libqdds$(QT_LIBRARY_SUFFIX).a"; sourceTree = "<absolute>"; };
 		D4B32C2222F82AC56BADEB21 /* OpenGL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGL.framework; path = /System/Library/Frameworks/OpenGL.framework; sourceTree = "<absolute>"; };
-		D4DE537C1FBBD48BD989FAD1 /* /usr/local/Qt-5.3.1/mkspecs/qconfig.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/qconfig.pri"; sourceTree = "<absolute>"; };
-		D5141F795670589C8CC41CBC /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_cocoaprintersupport.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_cocoaprintersupport.pri"; sourceTree = "<absolute>"; };
-		D53D8E6A188E05078A114294 /* qcocoa */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = qcocoa; path = "/usr/local/Qt-5.3.1/plugins/platforms/libqcocoa$(QT_LIBRARY_SUFFIX).a"; sourceTree = "<absolute>"; };
-		D6193B79CECC9DD0142D1200 /* qtharfbuzzng */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = qtharfbuzzng; path = "/usr/local/Qt-5.3.1/lib/libqtharfbuzzng$(QT_LIBRARY_SUFFIX).a"; sourceTree = "<absolute>"; };
-		D7A0618DE39A427EBF41940E /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_help_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_help_private.pri"; sourceTree = "<absolute>"; };
+		D4DE537C1FBBD48BD989FAD1 /* /usr/local/Qt-5.4.0/mkspecs/qconfig.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/qconfig.pri"; sourceTree = "<absolute>"; };
+		D5141F795670589C8CC41CBC /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_cocoaprintersupport.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_cocoaprintersupport.pri"; sourceTree = "<absolute>"; };
+		D53D8E6A188E05078A114294 /* qcocoa */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = qcocoa; path = "/usr/local/Qt-5.4.0/plugins/platforms/libqcocoa$(QT_LIBRARY_SUFFIX).a"; sourceTree = "<absolute>"; };
+		D6193B79CECC9DD0142D1200 /* qtharfbuzzng */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = qtharfbuzzng; path = "/usr/local/Qt-5.4.0/lib/libqtharfbuzzng$(QT_LIBRARY_SUFFIX).a"; sourceTree = "<absolute>"; };
+		D7A0618DE39A427EBF41940E /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_help_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_help_private.pri"; sourceTree = "<absolute>"; };
 		D7D645CBFF3B86CF39CEF3DA /* mlmain.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = mlmain.h; path = SourceFiles/_other/mlmain.h; sourceTree = "<absolute>"; };
-		D81E3D9A18202BE8EC3D0E2C /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_gui_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_gui_private.pri"; sourceTree = "<absolute>"; };
-		D948D4D8F949D45158F8DE35 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_quickwidgets.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_quickwidgets.pri"; sourceTree = "<absolute>"; };
-		DB0A26DDC377B2004F61BFE3 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_testlib.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_testlib.pri"; sourceTree = "<absolute>"; };
-		DBF506D10449BFABD45B82DA /* Qt5PrintSupport */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = Qt5PrintSupport; path = "/usr/local/Qt-5.3.1/lib/libQt5PrintSupport$(QT_LIBRARY_SUFFIX).a"; sourceTree = "<absolute>"; };
-		DCEFD9167C239650120B0145 /* qtga */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = qtga; path = "/usr/local/Qt-5.3.1/plugins/imageformats/libqtga$(QT_LIBRARY_SUFFIX).a"; sourceTree = "<absolute>"; };
-		DF8188E30892A4654B984221 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_qmltest.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_qmltest.pri"; sourceTree = "<absolute>"; };
+		D81E3D9A18202BE8EC3D0E2C /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_gui_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_gui_private.pri"; sourceTree = "<absolute>"; };
+		D948D4D8F949D45158F8DE35 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_quickwidgets.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_quickwidgets.pri"; sourceTree = "<absolute>"; };
+		DB0A26DDC377B2004F61BFE3 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_testlib.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_testlib.pri"; sourceTree = "<absolute>"; };
+		DBF506D10449BFABD45B82DA /* Qt5PrintSupport */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = Qt5PrintSupport; path = "/usr/local/Qt-5.4.0/lib/libQt5PrintSupport$(QT_LIBRARY_SUFFIX).a"; sourceTree = "<absolute>"; };
+		DCEFD9167C239650120B0145 /* qtga */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = qtga; path = "/usr/local/Qt-5.4.0/plugins/imageformats/libqtga$(QT_LIBRARY_SUFFIX).a"; sourceTree = "<absolute>"; };
+		DF8188E30892A4654B984221 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_qmltest.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_qmltest.pri"; sourceTree = "<absolute>"; };
 		DFD7912080BC557230093752 /* ApplicationServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ApplicationServices.framework; path = /System/Library/Frameworks/ApplicationServices.framework; sourceTree = "<absolute>"; };
-		E0F4563EA350EB65112A0EF4 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_opengl_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_opengl_private.pri"; sourceTree = "<absolute>"; };
-		E37365B4489B4918BEBB707D /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_xml_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_xml_private.pri"; sourceTree = "<absolute>"; };
-		E432DA897A5F027987342E8F /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_openglextensions.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_openglextensions.pri"; sourceTree = "<absolute>"; };
-		E50FA73B8A23BC179A642B27 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_uitools.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_uitools.pri"; sourceTree = "<absolute>"; };
-		E66B9EC81C285CA9A7FB6A2E /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_positioning_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_positioning_private.pri"; sourceTree = "<absolute>"; };
-		E7B2F248E3F7970788F35BF5 /* Qt5PlatformSupport */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = Qt5PlatformSupport; path = "/usr/local/Qt-5.3.1/lib/libQt5PlatformSupport$(QT_LIBRARY_SUFFIX).a"; sourceTree = "<absolute>"; };
-		E7D67CB158408BB7DEA74764 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_multimedia_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_multimedia_private.pri"; sourceTree = "<absolute>"; };
-		EA5D4FF9DE4AC4215D7DCE0D /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qcorewlanbearer.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qcorewlanbearer.pri"; sourceTree = "<absolute>"; };
-		EB1F99FD112917157F3C3F6E /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qicns.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qicns.pri"; sourceTree = "<absolute>"; };
-		EB29AC635054C09EFA749AE1 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qmldbg_tcp.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qmldbg_tcp.pri"; sourceTree = "<absolute>"; };
-		EBD39B69F368CEEAC360A16D /* /usr/local/Qt-5.3.1/mkspecs/common/mac.conf */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/common/mac.conf"; sourceTree = "<absolute>"; };
-		F0681BC551FC8A2B132FC646 /* qjp2 */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = qjp2; path = "/usr/local/Qt-5.3.1/plugins/imageformats/libqjp2$(QT_LIBRARY_SUFFIX).a"; sourceTree = "<absolute>"; };
-		F0A58515945747E36783CC21 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qmldbg_inspector.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qmldbg_inspector.pri"; sourceTree = "<absolute>"; };
-		F2453BA07315EB9F34F1CD57 /* qtiff */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = qtiff; path = "/usr/local/Qt-5.3.1/plugins/imageformats/libqtiff$(QT_LIBRARY_SUFFIX).a"; sourceTree = "<absolute>"; };
-		F2F823087EA182CCBD5748B8 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_designer.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_designer.pri"; sourceTree = "<absolute>"; };
-		F33BE16353DD1557A9AB3558 /* /usr/local/Qt-5.3.1/mkspecs/common/clang-mac.conf */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/common/clang-mac.conf"; sourceTree = "<absolute>"; };
-		F4EB01857048DCFCFFAAC4D0 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qavfmediaplayer.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qavfmediaplayer.pri"; sourceTree = "<absolute>"; };
-		F7ADBF552F6B9A5982915164 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_positioning.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_positioning.pri"; sourceTree = "<absolute>"; };
-		F83F87F8A60C9DF666911D42 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qsvg.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qsvg.pri"; sourceTree = "<absolute>"; };
-		F9BEAA743A908603687DA204 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_xmlpatterns_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_xmlpatterns_private.pri"; sourceTree = "<absolute>"; };
+		E0F4563EA350EB65112A0EF4 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_opengl_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_opengl_private.pri"; sourceTree = "<absolute>"; };
+		E37365B4489B4918BEBB707D /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_xml_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_xml_private.pri"; sourceTree = "<absolute>"; };
+		E432DA897A5F027987342E8F /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_openglextensions.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_openglextensions.pri"; sourceTree = "<absolute>"; };
+		E50FA73B8A23BC179A642B27 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_uitools.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_uitools.pri"; sourceTree = "<absolute>"; };
+		E66B9EC81C285CA9A7FB6A2E /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_positioning_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_positioning_private.pri"; sourceTree = "<absolute>"; };
+		E7B2F248E3F7970788F35BF5 /* Qt5PlatformSupport */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = Qt5PlatformSupport; path = "/usr/local/Qt-5.4.0/lib/libQt5PlatformSupport$(QT_LIBRARY_SUFFIX).a"; sourceTree = "<absolute>"; };
+		E7D67CB158408BB7DEA74764 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_multimedia_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_multimedia_private.pri"; sourceTree = "<absolute>"; };
+		EA5D4FF9DE4AC4215D7DCE0D /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qcorewlanbearer.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qcorewlanbearer.pri"; sourceTree = "<absolute>"; };
+		EB1F99FD112917157F3C3F6E /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qicns.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qicns.pri"; sourceTree = "<absolute>"; };
+		EB29AC635054C09EFA749AE1 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qmldbg_tcp.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qmldbg_tcp.pri"; sourceTree = "<absolute>"; };
+		EBD39B69F368CEEAC360A16D /* /usr/local/Qt-5.4.0/mkspecs/common/mac.conf */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/common/mac.conf"; sourceTree = "<absolute>"; };
+		F0681BC551FC8A2B132FC646 /* qjp2 */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = qjp2; path = "/usr/local/Qt-5.4.0/plugins/imageformats/libqjp2$(QT_LIBRARY_SUFFIX).a"; sourceTree = "<absolute>"; };
+		F0A58515945747E36783CC21 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qmldbg_inspector.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qmldbg_inspector.pri"; sourceTree = "<absolute>"; };
+		F2453BA07315EB9F34F1CD57 /* qtiff */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = qtiff; path = "/usr/local/Qt-5.4.0/plugins/imageformats/libqtiff$(QT_LIBRARY_SUFFIX).a"; sourceTree = "<absolute>"; };
+		F2F823087EA182CCBD5748B8 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_designer.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_designer.pri"; sourceTree = "<absolute>"; };
+		F33BE16353DD1557A9AB3558 /* /usr/local/Qt-5.4.0/mkspecs/common/clang-mac.conf */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/common/clang-mac.conf"; sourceTree = "<absolute>"; };
+		F4EB01857048DCFCFFAAC4D0 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qavfmediaplayer.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qavfmediaplayer.pri"; sourceTree = "<absolute>"; };
+		F7ADBF552F6B9A5982915164 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_positioning.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_positioning.pri"; sourceTree = "<absolute>"; };
+		F83F87F8A60C9DF666911D42 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qsvg.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qsvg.pri"; sourceTree = "<absolute>"; };
+		F9BEAA743A908603687DA204 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_xmlpatterns_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_xmlpatterns_private.pri"; sourceTree = "<absolute>"; };
 		FCC237CA5AD60B9BA4447615 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = /System/Library/Frameworks/Foundation.framework; sourceTree = "<absolute>"; };
-		FD944B80F033DFE737D401A2 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_help.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_help.pri"; sourceTree = "<absolute>"; };
+		FD944B80F033DFE737D401A2 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_help.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_help.pri"; sourceTree = "<absolute>"; };
 /* End PBXFileReference section */

 /* Begin PBXFrameworksBuildPhase section */
@@ -295,127 +295,127 @@
 			isa = PBXGroup;
 			children = (
 				33A9E861B2FAD8C39E154E7C /* MetaLang.pro */,
-				6E67D23B15FC4B628DB2E0B2 /* /usr/local/Qt-5.3.1/mkspecs/qdevice.pri */,
-				669FB007C4A3D58424D85EC8 /* /usr/local/Qt-5.3.1/mkspecs/common/shell-unix.conf */,
-				0ABCEA8D0DD45589040B0AF2 /* /usr/local/Qt-5.3.1/mkspecs/common/unix.conf */,
-				EBD39B69F368CEEAC360A16D /* /usr/local/Qt-5.3.1/mkspecs/common/mac.conf */,
-				817A0F5A41B553A6DE67FDEB /* /usr/local/Qt-5.3.1/mkspecs/common/macx.conf */,
-				45B95DB3B70B47A910FC847B /* /usr/local/Qt-5.3.1/mkspecs/common/gcc-base.conf */,
-				A9E30FA27827990C5F182223 /* /usr/local/Qt-5.3.1/mkspecs/common/gcc-base-mac.conf */,
-				8C5164D4E37556D40C5E6AA2 /* /usr/local/Qt-5.3.1/mkspecs/common/clang.conf */,
-				F33BE16353DD1557A9AB3558 /* /usr/local/Qt-5.3.1/mkspecs/common/clang-mac.conf */,
-				D4DE537C1FBBD48BD989FAD1 /* /usr/local/Qt-5.3.1/mkspecs/qconfig.pri */,
-				ACC8A73268E5D9AF64E97AF4 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_bluetooth.pri */,
-				2E48BB382B895A5ACD79AF9F /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_bluetooth_private.pri */,
-				BD4D97801B547471B37A4CDC /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_bootstrap_private.pri */,
-				CF86CD5BB01B9011E6B6FD3E /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_clucene_private.pri */,
-				77FF486B1F9BCD55A8A3F35D /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_concurrent.pri */,
-				7D28E9003CE64D8A7F2E292E /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_concurrent_private.pri */,
-				7ECCC1F9442988B4F2707CC1 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_core.pri */,
-				5F781C7FD8422D359EA1D2FE /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_core_private.pri */,
-				7A94C7168B3FCBE5F04A013B /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_declarative.pri */,
-				89863CCAF1D29037AE95755D /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_declarative_private.pri */,
-				F2F823087EA182CCBD5748B8 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_designer.pri */,
-				7C2F42B222EE88E26A6FED62 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_designer_private.pri */,
-				69347C39E4D922E94D0860BF /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_designercomponents_private.pri */,
-				360D4B3ED25D126430DE27D4 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_enginio.pri */,
-				4C6C71914B1926119120DACD /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_enginio_private.pri */,
-				23BC8B0FC3279421D41CA268 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_gui.pri */,
-				D81E3D9A18202BE8EC3D0E2C /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_gui_private.pri */,
-				FD944B80F033DFE737D401A2 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_help.pri */,
-				D7A0618DE39A427EBF41940E /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_help_private.pri */,
-				A5B17ABEFBA1C2F43443D644 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_macextras.pri */,
-				33F165B1DB8CBF182C56FAB5 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_macextras_private.pri */,
-				D2FE4D909926A0D1656068C4 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_multimedia.pri */,
-				E7D67CB158408BB7DEA74764 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_multimedia_private.pri */,
-				28BD0D10214709D95B161E24 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_multimediawidgets.pri */,
-				D1FA7CAB5ACC09D563AE569F /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_multimediawidgets_private.pri */,
-				293C8DEEE270847AC20E70F9 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_network.pri */,
-				382E89A91A34F7898C25FD0D /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_network_private.pri */,
-				8A04A4A3625204D12A1207F6 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_nfc.pri */,
-				B51B01657BFE9EAEF5590561 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_nfc_private.pri */,
-				5CEA7A2DB2136425A88D1254 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_opengl.pri */,
-				E0F4563EA350EB65112A0EF4 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_opengl_private.pri */,
-				E432DA897A5F027987342E8F /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_openglextensions.pri */,
-				5597304BEC94BFB9EAAEBC4B /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_openglextensions_private.pri */,
-				8F572030CE9AB8CC5F672201 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_platformsupport_private.pri */,
-				F7ADBF552F6B9A5982915164 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_positioning.pri */,
-				E66B9EC81C285CA9A7FB6A2E /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_positioning_private.pri */,
-				6C08BFC27C4C303A3A5181DB /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_printsupport.pri */,
-				D0CDC87DAFDA7F18A7AF450F /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_printsupport_private.pri */,
-				B382B645B34234E451AE5D94 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_qml.pri */,
-				6102C69805B6398AF6FA5BEB /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_qml_private.pri */,
-				4FB6657DA22BC68B819B64B3 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_qmldevtools_private.pri */,
-				DF8188E30892A4654B984221 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_qmltest.pri */,
-				ABA9AB4619F09DCFD2D4A27F /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_qmltest_private.pri */,
-				5B22E9E4EE9AAE42ABC24AB3 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_qtmultimediaquicktools_private.pri */,
-				16DD53E17C65AC8B450CC6C3 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_quick.pri */,
-				8C31D89BDFCDF466DAED19A0 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_quick_private.pri */,
-				82E7DCFD95559532D8FC6CDD /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_quickparticles_private.pri */,
-				D948D4D8F949D45158F8DE35 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_quickwidgets.pri */,
-				B2246267D4C0D789259A86B0 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_quickwidgets_private.pri */,
-				CFCB992BEC24B71BFB8A2F30 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_script.pri */,
-				C505A18319B9B63C63877858 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_script_private.pri */,
-				CE829DD126DD2B97E8D70A7A /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_scripttools.pri */,
-				A59F74CD76FDC2B4B9910E18 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_scripttools_private.pri */,
-				85B6936EDBE61D9BB8F8B33B /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_sensors.pri */,
-				BDC9ECADEE40D11E3C2EA93F /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_sensors_private.pri */,
-				BFF0C38FB0EC140C5F0304AE /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_serialport.pri */,
-				311004331A04F3D69C98643C /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_serialport_private.pri */,
-				7DE30A90667C03C4F91A2A91 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_sql.pri */,
-				075EB50EB07CF69FD62FB8DF /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_sql_private.pri */,
-				ADFC79902C14A612AE93A89A /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_svg.pri */,
-				8DDE1D26B3206CDB8B57FABE /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_svg_private.pri */,
-				DB0A26DDC377B2004F61BFE3 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_testlib.pri */,
-				8849E60AEC7DB97A475C17EA /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_testlib_private.pri */,
-				E50FA73B8A23BC179A642B27 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_uitools.pri */,
-				B518DA4EE7376002AFC71FD5 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_uitools_private.pri */,
-				8F97C9CAE38CA3AFAC0B3953 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_websockets.pri */,
-				87EEF25EE25CF21572D1438C /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_websockets_private.pri */,
-				A022AF919D1977534CA66BB8 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_widgets.pri */,
-				8E9136256AFFBA6EF048AA55 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_widgets_private.pri */,
-				AA73DC3C2901E2979FE8AD5B /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_xml.pri */,
-				E37365B4489B4918BEBB707D /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_xml_private.pri */,
-				2E6D9B1D2743D24E31B0B284 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_xmlpatterns.pri */,
-				F9BEAA743A908603687DA204 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_xmlpatterns_private.pri */,
-				D5141F795670589C8CC41CBC /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_cocoaprintersupport.pri */,
-				1FAE75C970AA73F2DEDDB508 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qavfcamera.pri */,
-				F4EB01857048DCFCFFAAC4D0 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qavfmediaplayer.pri */,
-				AFD721AA33A2F785E77B1698 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qcocoa.pri */,
-				EA5D4FF9DE4AC4215D7DCE0D /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qcorewlanbearer.pri */,
-				111BBEE3D1432C3B517FD539 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qdds.pri */,
-				3685604BDB64DD6E92169B73 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qdeclarativeview.pri */,
-				2440CD1D4CEF80443BCA1B8B /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qgenericbearer.pri */,
-				EB1F99FD112917157F3C3F6E /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qicns.pri */,
-				C4295BE59CCEBCDD16268349 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qico.pri */,
-				45DB132B756499D4DF38430E /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qjp2.pri */,
-				B678DA730B4ECE863AD631AE /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qminimal.pri */,
-				F0A58515945747E36783CC21 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qmldbg_inspector.pri */,
-				B8525798C5AA7D7C6D68E1B3 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qmldbg_qtquick2.pri */,
-				EB29AC635054C09EFA749AE1 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qmldbg_tcp.pri */,
-				3F08D430CEC8D2117735CCB4 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qmldbg_tcp_qtdeclarative.pri */,
-				946BEA667170DC1A7A8F9DB0 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qmng.pri */,
-				CCF75CFFB857487FB18F99F9 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qoffscreen.pri */,
-				9A0BDF67E013BB4FFB8685B0 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qqt7engine.pri */,
-				B064BF3B496A7BF7A449CA1E /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qsqlite.pri */,
-				F83F87F8A60C9DF666911D42 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qsvg.pri */,
-				CFFBE05DB004895080314289 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qsvgicon.pri */,
-				247D8DF3B1DDB665B80BBA25 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qtaccessiblequick.pri */,
-				87A4C1983FD641360BF80A02 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qtaccessiblewidgets.pri */,
-				24B6929EE3952310F2DAECB1 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qtaudio_coreaudio.pri */,
-				060A694B42A4555240009936 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qtga.pri */,
-				BD22EFEFCC02644B1883CE19 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qtiff.pri */,
-				B8C1F6C965A7A14FBA8D4518 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qtmedia_audioengine.pri */,
-				74C1C232DFAA71028A0412CA /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qtmultimedia_m3u.pri */,
-				C84546C18DCBB04166195DCF /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qtposition_positionpoll.pri */,
-				AB1C02DDBD8E88DD9A9AFDDD /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qtsensorgestures_plugin.pri */,
-				8B4BB4E74F8A4442EF563D7D /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qtsensorgestures_shakeplugin.pri */,
-				892D36BEF797BA4AF48D378A /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qtsensors_dummy.pri */,
-				A4D8AC60897F435C1C3B9D02 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qtsensors_generic.pri */,
-				346287C9E754E7C458153F03 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qwbmp.pri */,
-				B26239063A068F800A2C95F4 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qwebp.pri */,
-				63E722139886C87BC82DBDF5 /* /usr/local/Qt-5.3.1/mkspecs/macx-clang/qmake.conf */,
-				85061B1DA49D125991117950 /* /usr/local/Qt-5.3.1/mkspecs/macx-xcode/qmake.conf */,
+				6E67D23B15FC4B628DB2E0B2 /* /usr/local/Qt-5.4.0/mkspecs/qdevice.pri */,
+				669FB007C4A3D58424D85EC8 /* /usr/local/Qt-5.4.0/mkspecs/common/shell-unix.conf */,
+				0ABCEA8D0DD45589040B0AF2 /* /usr/local/Qt-5.4.0/mkspecs/common/unix.conf */,
+				EBD39B69F368CEEAC360A16D /* /usr/local/Qt-5.4.0/mkspecs/common/mac.conf */,
+				817A0F5A41B553A6DE67FDEB /* /usr/local/Qt-5.4.0/mkspecs/common/macx.conf */,
+				45B95DB3B70B47A910FC847B /* /usr/local/Qt-5.4.0/mkspecs/common/gcc-base.conf */,
+				A9E30FA27827990C5F182223 /* /usr/local/Qt-5.4.0/mkspecs/common/gcc-base-mac.conf */,
+				8C5164D4E37556D40C5E6AA2 /* /usr/local/Qt-5.4.0/mkspecs/common/clang.conf */,
+				F33BE16353DD1557A9AB3558 /* /usr/local/Qt-5.4.0/mkspecs/common/clang-mac.conf */,
+				D4DE537C1FBBD48BD989FAD1 /* /usr/local/Qt-5.4.0/mkspecs/qconfig.pri */,
+				ACC8A73268E5D9AF64E97AF4 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_bluetooth.pri */,
+				2E48BB382B895A5ACD79AF9F /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_bluetooth_private.pri */,
+				BD4D97801B547471B37A4CDC /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_bootstrap_private.pri */,
+				CF86CD5BB01B9011E6B6FD3E /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_clucene_private.pri */,
+				77FF486B1F9BCD55A8A3F35D /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_concurrent.pri */,
+				7D28E9003CE64D8A7F2E292E /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_concurrent_private.pri */,
+				7ECCC1F9442988B4F2707CC1 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_core.pri */,
+				5F781C7FD8422D359EA1D2FE /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_core_private.pri */,
+				7A94C7168B3FCBE5F04A013B /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_declarative.pri */,
+				89863CCAF1D29037AE95755D /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_declarative_private.pri */,
+				F2F823087EA182CCBD5748B8 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_designer.pri */,
+				7C2F42B222EE88E26A6FED62 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_designer_private.pri */,
+				69347C39E4D922E94D0860BF /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_designercomponents_private.pri */,
+				360D4B3ED25D126430DE27D4 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_enginio.pri */,
+				4C6C71914B1926119120DACD /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_enginio_private.pri */,
+				23BC8B0FC3279421D41CA268 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_gui.pri */,
+				D81E3D9A18202BE8EC3D0E2C /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_gui_private.pri */,
+				FD944B80F033DFE737D401A2 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_help.pri */,
+				D7A0618DE39A427EBF41940E /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_help_private.pri */,
+				A5B17ABEFBA1C2F43443D644 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_macextras.pri */,
+				33F165B1DB8CBF182C56FAB5 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_macextras_private.pri */,
+				D2FE4D909926A0D1656068C4 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_multimedia.pri */,
+				E7D67CB158408BB7DEA74764 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_multimedia_private.pri */,
+				28BD0D10214709D95B161E24 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_multimediawidgets.pri */,
+				D1FA7CAB5ACC09D563AE569F /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_multimediawidgets_private.pri */,
+				293C8DEEE270847AC20E70F9 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_network.pri */,
+				382E89A91A34F7898C25FD0D /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_network_private.pri */,
+				8A04A4A3625204D12A1207F6 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_nfc.pri */,
+				B51B01657BFE9EAEF5590561 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_nfc_private.pri */,
+				5CEA7A2DB2136425A88D1254 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_opengl.pri */,
+				E0F4563EA350EB65112A0EF4 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_opengl_private.pri */,
+				E432DA897A5F027987342E8F /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_openglextensions.pri */,
+				5597304BEC94BFB9EAAEBC4B /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_openglextensions_private.pri */,
+				8F572030CE9AB8CC5F672201 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_platformsupport_private.pri */,
+				F7ADBF552F6B9A5982915164 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_positioning.pri */,
+				E66B9EC81C285CA9A7FB6A2E /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_positioning_private.pri */,
+				6C08BFC27C4C303A3A5181DB /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_printsupport.pri */,
+				D0CDC87DAFDA7F18A7AF450F /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_printsupport_private.pri */,
+				B382B645B34234E451AE5D94 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_qml.pri */,
+				6102C69805B6398AF6FA5BEB /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_qml_private.pri */,
+				4FB6657DA22BC68B819B64B3 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_qmldevtools_private.pri */,
+				DF8188E30892A4654B984221 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_qmltest.pri */,
+				ABA9AB4619F09DCFD2D4A27F /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_qmltest_private.pri */,
+				5B22E9E4EE9AAE42ABC24AB3 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_qtmultimediaquicktools_private.pri */,
+				16DD53E17C65AC8B450CC6C3 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_quick.pri */,
+				8C31D89BDFCDF466DAED19A0 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_quick_private.pri */,
+				82E7DCFD95559532D8FC6CDD /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_quickparticles_private.pri */,
+				D948D4D8F949D45158F8DE35 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_quickwidgets.pri */,
+				B2246267D4C0D789259A86B0 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_quickwidgets_private.pri */,
+				CFCB992BEC24B71BFB8A2F30 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_script.pri */,
+				C505A18319B9B63C63877858 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_script_private.pri */,
+				CE829DD126DD2B97E8D70A7A /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_scripttools.pri */,
+				A59F74CD76FDC2B4B9910E18 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_scripttools_private.pri */,
+				85B6936EDBE61D9BB8F8B33B /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_sensors.pri */,
+				BDC9ECADEE40D11E3C2EA93F /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_sensors_private.pri */,
+				BFF0C38FB0EC140C5F0304AE /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_serialport.pri */,
+				311004331A04F3D69C98643C /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_serialport_private.pri */,
+				7DE30A90667C03C4F91A2A91 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_sql.pri */,
+				075EB50EB07CF69FD62FB8DF /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_sql_private.pri */,
+				ADFC79902C14A612AE93A89A /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_svg.pri */,
+				8DDE1D26B3206CDB8B57FABE /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_svg_private.pri */,
+				DB0A26DDC377B2004F61BFE3 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_testlib.pri */,
+				8849E60AEC7DB97A475C17EA /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_testlib_private.pri */,
+				E50FA73B8A23BC179A642B27 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_uitools.pri */,
+				B518DA4EE7376002AFC71FD5 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_uitools_private.pri */,
+				8F97C9CAE38CA3AFAC0B3953 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_websockets.pri */,
+				87EEF25EE25CF21572D1438C /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_websockets_private.pri */,
+				A022AF919D1977534CA66BB8 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_widgets.pri */,
+				8E9136256AFFBA6EF048AA55 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_widgets_private.pri */,
+				AA73DC3C2901E2979FE8AD5B /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_xml.pri */,
+				E37365B4489B4918BEBB707D /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_xml_private.pri */,
+				2E6D9B1D2743D24E31B0B284 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_xmlpatterns.pri */,
+				F9BEAA743A908603687DA204 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_xmlpatterns_private.pri */,
+				D5141F795670589C8CC41CBC /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_cocoaprintersupport.pri */,
+				1FAE75C970AA73F2DEDDB508 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qavfcamera.pri */,
+				F4EB01857048DCFCFFAAC4D0 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qavfmediaplayer.pri */,
+				AFD721AA33A2F785E77B1698 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qcocoa.pri */,
+				EA5D4FF9DE4AC4215D7DCE0D /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qcorewlanbearer.pri */,
+				111BBEE3D1432C3B517FD539 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qdds.pri */,
+				3685604BDB64DD6E92169B73 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qdeclarativeview.pri */,
+				2440CD1D4CEF80443BCA1B8B /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qgenericbearer.pri */,
+				EB1F99FD112917157F3C3F6E /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qicns.pri */,
+				C4295BE59CCEBCDD16268349 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qico.pri */,
+				45DB132B756499D4DF38430E /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qjp2.pri */,
+				B678DA730B4ECE863AD631AE /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qminimal.pri */,
+				F0A58515945747E36783CC21 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qmldbg_inspector.pri */,
+				B8525798C5AA7D7C6D68E1B3 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qmldbg_qtquick2.pri */,
+				EB29AC635054C09EFA749AE1 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qmldbg_tcp.pri */,
+				3F08D430CEC8D2117735CCB4 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qmldbg_tcp_qtdeclarative.pri */,
+				946BEA667170DC1A7A8F9DB0 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qmng.pri */,
+				CCF75CFFB857487FB18F99F9 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qoffscreen.pri */,
+				9A0BDF67E013BB4FFB8685B0 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qqt7engine.pri */,
+				B064BF3B496A7BF7A449CA1E /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qsqlite.pri */,
+				F83F87F8A60C9DF666911D42 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qsvg.pri */,
+				CFFBE05DB004895080314289 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qsvgicon.pri */,
+				247D8DF3B1DDB665B80BBA25 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qtaccessiblequick.pri */,
+				87A4C1983FD641360BF80A02 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qtaccessiblewidgets.pri */,
+				24B6929EE3952310F2DAECB1 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qtaudio_coreaudio.pri */,
+				060A694B42A4555240009936 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qtga.pri */,
+				BD22EFEFCC02644B1883CE19 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qtiff.pri */,
+				B8C1F6C965A7A14FBA8D4518 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qtmedia_audioengine.pri */,
+				74C1C232DFAA71028A0412CA /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qtmultimedia_m3u.pri */,
+				C84546C18DCBB04166195DCF /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qtposition_positionpoll.pri */,
+				AB1C02DDBD8E88DD9A9AFDDD /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qtsensorgestures_plugin.pri */,
+				8B4BB4E74F8A4442EF563D7D /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qtsensorgestures_shakeplugin.pri */,
+				892D36BEF797BA4AF48D378A /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qtsensors_dummy.pri */,
+				A4D8AC60897F435C1C3B9D02 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qtsensors_generic.pri */,
+				346287C9E754E7C458153F03 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qwbmp.pri */,
+				B26239063A068F800A2C95F4 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qwebp.pri */,
+				63E722139886C87BC82DBDF5 /* /usr/local/Qt-5.4.0/mkspecs/macx-clang/qmake.conf */,
+				85061B1DA49D125991117950 /* /usr/local/Qt-5.4.0/mkspecs/macx-xcode/qmake.conf */,
 				AB745978DF0F41D1801ABDA6 /* .qmake.stash */,
 			);
 			name = "Supporting Files";
@@ -611,25 +611,25 @@
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				HEADER_SEARCH_PATHS = (
-					../../Libraries/QtStatic/qtbase/include/QtGui/5.3.1/QtGui,
-					../../Libraries/QtStatic/qtbase/include/QtCore/5.3.1/QtCore,
+					../../Libraries/QtStatic/qtbase/include/QtGui/5.4.0/QtGui,
+					../../Libraries/QtStatic/qtbase/include/QtCore/5.4.0/QtCore,
 					../../Libraries/QtStatic/qtbase/include,
-					"/usr/local/Qt-5.3.1/include",
-					"/usr/local/Qt-5.3.1/include/QtGui",
-					"/usr/local/Qt-5.3.1/include/QtCore",
+					"/usr/local/Qt-5.4.0/include",
+					"/usr/local/Qt-5.4.0/include/QtGui",
+					"/usr/local/Qt-5.4.0/include/QtCore",
 					GeneratedFiles/Debug,
 					/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.9.sdk/System/Library/Frameworks/OpenGL.framework/Versions/A/Headers,
 					/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.9.sdk/System/Library/Frameworks/AGL.framework/Headers,
-					"/usr/local/Qt-5.3.1/mkspecs/macx-clang",
+					"/usr/local/Qt-5.4.0/mkspecs/macx-clang",
 				);
 				INFOPLIST_FILE = Lang.plist;
 				INSTALL_DIR = ../Mac/ReleaseLang/;
 				LDPLUSPLUS = "/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang++";
 				LIBRARY_SEARCH_PATHS = (
 					/System/Library/Frameworks/,
-					"/usr/local/Qt-5.3.1/lib",
-					"/usr/local/Qt-5.3.1/plugins/platforms",
-					"/usr/local/Qt-5.3.1/plugins/imageformats",
+					"/usr/local/Qt-5.4.0/lib",
+					"/usr/local/Qt-5.4.0/plugins/platforms",
+					"/usr/local/Qt-5.4.0/plugins/imageformats",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 10.7;
 				OBJROOT = ./../Mac/ReleaseIntermediateLang;
@@ -658,10 +658,10 @@
 				OTHER_LDFLAGS = (
 					"-headerpad_max_install_names",
 					"-stdlib=libc++",
-					"-L/usr/local/Qt-5.3.1/lib",
-					"-L/usr/local/Qt-5.3.1/plugins/platforms",
+					"-L/usr/local/Qt-5.4.0/lib",
+					"-L/usr/local/Qt-5.4.0/plugins/platforms",
 					"-lcups",
-					"-L/usr/local/Qt-5.3.1/plugins/imageformats",
+					"-L/usr/local/Qt-5.4.0/plugins/imageformats",
 					"-lz",
 					"-lm",
 				);
@@ -700,25 +700,25 @@
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				HEADER_SEARCH_PATHS = (
-					../../Libraries/QtStatic/qtbase/include/QtGui/5.3.1/QtGui,
-					../../Libraries/QtStatic/qtbase/include/QtCore/5.3.1/QtCore,
+					../../Libraries/QtStatic/qtbase/include/QtGui/5.4.0/QtGui,
+					../../Libraries/QtStatic/qtbase/include/QtCore/5.4.0/QtCore,
 					../../Libraries/QtStatic/qtbase/include,
-					"/usr/local/Qt-5.3.1/include",
-					"/usr/local/Qt-5.3.1/include/QtGui",
-					"/usr/local/Qt-5.3.1/include/QtCore",
+					"/usr/local/Qt-5.4.0/include",
+					"/usr/local/Qt-5.4.0/include/QtGui",
+					"/usr/local/Qt-5.4.0/include/QtCore",
 					GeneratedFiles/Debug,
 					/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.9.sdk/System/Library/Frameworks/OpenGL.framework/Versions/A/Headers,
 					/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.9.sdk/System/Library/Frameworks/AGL.framework/Headers,
-					"/usr/local/Qt-5.3.1/mkspecs/macx-clang",
+					"/usr/local/Qt-5.4.0/mkspecs/macx-clang",
 				);
 				INFOPLIST_FILE = Lang.plist;
 				INSTALL_DIR = ../Mac/DebugLang/;
 				LDPLUSPLUS = "/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang++";
 				LIBRARY_SEARCH_PATHS = (
 					/System/Library/Frameworks/,
-					"/usr/local/Qt-5.3.1/lib",
-					"/usr/local/Qt-5.3.1/plugins/platforms",
-					"/usr/local/Qt-5.3.1/plugins/imageformats",
+					"/usr/local/Qt-5.4.0/lib",
+					"/usr/local/Qt-5.4.0/plugins/platforms",
+					"/usr/local/Qt-5.4.0/plugins/imageformats",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 10.7;
 				OBJROOT = ./../Mac/DebugIntermediateLang;
@@ -748,10 +748,10 @@
 				OTHER_LDFLAGS = (
 					"-headerpad_max_install_names",
 					"-stdlib=libc++",
-					"-L/usr/local/Qt-5.3.1/lib",
-					"-L/usr/local/Qt-5.3.1/plugins/platforms",
+					"-L/usr/local/Qt-5.4.0/lib",
+					"-L/usr/local/Qt-5.4.0/plugins/platforms",
 					"-lcups",
-					"-L/usr/local/Qt-5.3.1/plugins/imageformats",
+					"-L/usr/local/Qt-5.4.0/plugins/imageformats",
 					"-lz",
 					"-lm",
 				);
@@ -769,15 +769,15 @@
 				COPY_PHASE_STRIP = YES;
 				GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
 				HEADER_SEARCH_PATHS = (
-					./../../Libraries/QtStatic/qtbase/include/QtGui/5.3.1/QtGui,
-					./../../Libraries/QtStatic/qtbase/include/QtCore/5.3.1/QtCore,
+					./../../Libraries/QtStatic/qtbase/include/QtGui/5.4.0/QtGui,
+					./../../Libraries/QtStatic/qtbase/include/QtCore/5.4.0/QtCore,
 					./../../Libraries/QtStatic/qtbase/include,
-					"/usr/local/Qt-5.3.1/include",
-					"/usr/local/Qt-5.3.1/include/QtGui",
-					"/usr/local/Qt-5.3.1/include/QtCore",
+					"/usr/local/Qt-5.4.0/include",
+					"/usr/local/Qt-5.4.0/include/QtGui",
+					"/usr/local/Qt-5.4.0/include/QtCore",
 					/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.9.sdk/System/Library/Frameworks/OpenGL.framework/Versions/A/Headers,
 					/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.9.sdk/System/Library/Frameworks/AGL.framework/Headers,
-					"/usr/local/Qt-5.3.1/mkspecs/macx-clang",
+					"/usr/local/Qt-5.4.0/mkspecs/macx-clang",
 				);
 				INSTALL_DIR = ../Mac/ReleaseLang/;
 				PRODUCT_NAME = MetaLang;
@@ -795,15 +795,15 @@
 				GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
 				GCC_OPTIMIZATION_LEVEL = 0;
 				HEADER_SEARCH_PATHS = (
-					./../../Libraries/QtStatic/qtbase/include/QtGui/5.3.1/QtGui,
-					./../../Libraries/QtStatic/qtbase/include/QtCore/5.3.1/QtCore,
+					./../../Libraries/QtStatic/qtbase/include/QtGui/5.4.0/QtGui,
+					./../../Libraries/QtStatic/qtbase/include/QtCore/5.4.0/QtCore,
 					./../../Libraries/QtStatic/qtbase/include,
-					"/usr/local/Qt-5.3.1/include",
-					"/usr/local/Qt-5.3.1/include/QtGui",
-					"/usr/local/Qt-5.3.1/include/QtCore",
+					"/usr/local/Qt-5.4.0/include",
+					"/usr/local/Qt-5.4.0/include/QtGui",
+					"/usr/local/Qt-5.4.0/include/QtCore",
 					/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.9.sdk/System/Library/Frameworks/OpenGL.framework/Versions/A/Headers,
 					/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.9.sdk/System/Library/Frameworks/AGL.framework/Headers,
-					"/usr/local/Qt-5.3.1/mkspecs/macx-clang",
+					"/usr/local/Qt-5.4.0/mkspecs/macx-clang",
 				);
 				INSTALL_DIR = ../Mac/DebugLang/;
 				PRODUCT_NAME = MetaLang;
--- a/Telegram/MetaLang.xcodeproj/qt_preprocess.mak
+++ b/Telegram/MetaLang.xcodeproj/qt_preprocess.mak
@@ -1,21 +1,21 @@
 #############################################################################
 # Makefile for building: ../Mac/DebugLang/MetaLang.app/Contents/MacOS/MetaLang
-# Generated by qmake (3.0) (Qt 5.3.1)
+# Generated by qmake (3.0) (Qt 5.4.0)
 # Project:  MetaLang.pro
 # Template: app
-# Command: /usr/local/Qt-5.3.1/bin/qmake -spec macx-xcode -o MetaLang.xcodeproj/project.pbxproj MetaLang.pro
+# Command: /usr/local/Qt-5.4.0/bin/qmake -spec macx-xcode -o MetaLang.xcodeproj/project.pbxproj MetaLang.pro
 #############################################################################

 MAKEFILE      = project.pbxproj

-MOC       = /usr/local/Qt-5.3.1/bin/moc
+MOC       = /usr/local/Qt-5.4.0/bin/moc
 UIC       = 
 LEX       = flex
 LEXFLAGS  = 
 YACC      = yacc
 YACCFLAGS = -d
 DEFINES       = -D_DEBUG -DQT_GUI_LIB -DQT_CORE_LIB
-INCPATH       = -I/usr/local/Qt-5.3.1/mkspecs/macx-clang -I. -I../../Libraries/QtStatic/qtbase/include/QtGui/5.3.1/QtGui -I../../Libraries/QtStatic/qtbase/include/QtCore/5.3.1/QtCore -I../../Libraries/QtStatic/qtbase/include -I/usr/local/Qt-5.3.1/include -I/usr/local/Qt-5.3.1/include/QtGui -I/usr/local/Qt-5.3.1/include/QtCore -IGeneratedFiles/Debug -I/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.9.sdk/System/Library/Frameworks/OpenGL.framework/Versions/A/Headers -I/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.9.sdk/System/Library/Frameworks/AGL.framework/Headers
+INCPATH       = -I/usr/local/Qt-5.4.0/mkspecs/macx-clang -I. -I../../Libraries/QtStatic/qtbase/include/QtGui/5.4.0/QtGui -I../../Libraries/QtStatic/qtbase/include/QtCore/5.4.0/QtCore -I../../Libraries/QtStatic/qtbase/include -I/usr/local/Qt-5.4.0/include -I/usr/local/Qt-5.4.0/include/QtGui -I/usr/local/Qt-5.4.0/include/QtCore -IGeneratedFiles/Debug -I/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.9.sdk/System/Library/Frameworks/OpenGL.framework/Versions/A/Headers -I/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.9.sdk/System/Library/Frameworks/AGL.framework/Headers
 DEL_FILE  = rm -f
 MOVE      = mv -f

@@ -52,7 +52,7 @@ GeneratedFiles/Debug/moc_genlang.cpp: ../../Libraries/QtStatic/qtbase/include/Qt
 		../../Libraries/QtStatic/qtbase/include/QtCore/QCoreApplication \
 		../../Libraries/QtStatic/qtbase/include/QtGui/QGuiApplication \
 		SourceFiles/_other/genlang.h
-	/usr/local/Qt-5.3.1/bin/moc $(DEFINES) -D__APPLE__ -D__GNUC__=4 -I/usr/local/Qt-5.3.1/mkspecs/macx-clang -I. -I/usr/local/Qt-5.3.1/include/QtGui/5.3.1/QtGui -I/usr/local/Qt-5.3.1/include/QtCore/5.3.1/QtCore -I/usr/local/Qt-5.3.1/include -I/usr/local/Qt-5.3.1/include/QtGui -I/usr/local/Qt-5.3.1/include/QtCore -I/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.9.sdk/usr/include/c++/4.2.1 -I/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.9.sdk/usr/include/c++/4.2.1/backward -I/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/lib/clang/5.1/include -I/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include -I/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.9.sdk/usr/include SourceFiles/_other/genlang.h -o GeneratedFiles/Debug/moc_genlang.cpp
+	/usr/local/Qt-5.4.0/bin/moc $(DEFINES) -D__APPLE__ -D__GNUC__=4 -I/usr/local/Qt-5.4.0/mkspecs/macx-clang -I. -I/usr/local/Qt-5.4.0/include/QtGui/5.4.0/QtGui -I/usr/local/Qt-5.4.0/include/QtCore/5.4.0/QtCore -I/usr/local/Qt-5.4.0/include -I/usr/local/Qt-5.4.0/include/QtGui -I/usr/local/Qt-5.4.0/include/QtCore -I/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.9.sdk/usr/include/c++/4.2.1 -I/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.9.sdk/usr/include/c++/4.2.1/backward -I/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/lib/clang/5.1/include -I/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include -I/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.9.sdk/usr/include SourceFiles/_other/genlang.h -o GeneratedFiles/Debug/moc_genlang.cpp

 compiler_moc_source_make_all:
 compiler_moc_source_clean:
--- a/Telegram/MetaStyle.pro
+++ b/Telegram/MetaStyle.pro
@@ -27,7 +27,7 @@ HEADERS += \
    ./SourceFiles/_other/msmain.h \
    ./SourceFiles/_other/genstyles.h \

-INCLUDEPATH += ./../../Libraries/QtStatic/qtbase/include/QtGui/5.3.1/QtGui\
-               ./../../Libraries/QtStatic/qtbase/include/QtCore/5.3.1/QtCore\
+INCLUDEPATH += ./../../Libraries/QtStatic/qtbase/include/QtGui/5.4.0/QtGui\
+               ./../../Libraries/QtStatic/qtbase/include/QtCore/5.4.0/QtCore\
               ./../../Libraries/QtStatic/qtbase/include\

--- a/Telegram/MetaStyle.vcxproj
+++ b/Telegram/MetaStyle.vcxproj
@@ -126,7 +126,7 @@
      <SubSystem>Console</SubSystem>
      <OutputFile>$(OutDir)\$(ProjectName).exe</OutputFile>
      <AdditionalLibraryDirectories>$(QTDIR)\lib;$(QTDIR)\plugins;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>kernel32.lib;user32.lib;shell32.lib;uuid.lib;ole32.lib;advapi32.lib;ws2_32.lib;imm32.lib;winmm.lib;qtmaind.lib;glu32.lib;opengl32.lib;Qt5Cored.lib;Qt5Guid.lib;Qt5Widgetsd.lib;Qt5Networkd.lib;Qt5PlatformSupportd.lib;platforms\qwindowsd.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>kernel32.lib;user32.lib;shell32.lib;uuid.lib;ole32.lib;advapi32.lib;ws2_32.lib;imm32.lib;winmm.lib;qtmaind.lib;glu32.lib;opengl32.lib;Qt5Cored.lib;Qt5Guid.lib;qtharfbuzzngd.lib;Qt5Widgetsd.lib;Qt5Networkd.lib;Qt5PlatformSupportd.lib;platforms\qwindowsd.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <GenerateDebugInformation>true</GenerateDebugInformation>
      <ProgramDatabaseFile>$(IntDir)$(TargetName).pdb</ProgramDatabaseFile>
      <ProfileGuidedDatabase>$(IntDir)$(TargetName).pgd</ProfileGuidedDatabase>
@@ -145,7 +145,7 @@
      <SubSystem>Console</SubSystem>
      <OutputFile>$(OutDir)\$(ProjectName).exe</OutputFile>
      <AdditionalLibraryDirectories>$(QTDIR)\lib;$(QTDIR)\plugins;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>kernel32.lib;user32.lib;shell32.lib;uuid.lib;ole32.lib;advapi32.lib;ws2_32.lib;qtmain.lib;opengl32.lib;imm32.lib;winmm.lib;Qt5Core.lib;Qt5Gui.lib;Qt5PlatformSupport.lib;platforms\qwindows.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>kernel32.lib;user32.lib;shell32.lib;uuid.lib;ole32.lib;advapi32.lib;ws2_32.lib;qtmain.lib;opengl32.lib;imm32.lib;winmm.lib;Qt5Core.lib;Qt5Gui.lib;qtharfbuzzng.lib;Qt5PlatformSupport.lib;platforms\qwindows.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <GenerateDebugInformation>false</GenerateDebugInformation>
    </Link>
  </ItemDefinitionGroup>
@@ -162,7 +162,7 @@
      <SubSystem>Console</SubSystem>
      <OutputFile>$(OutDir)\$(ProjectName).exe</OutputFile>
      <AdditionalLibraryDirectories>$(QTDIR)\lib;$(QTDIR)\plugins;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>kernel32.lib;user32.lib;shell32.lib;uuid.lib;ole32.lib;advapi32.lib;ws2_32.lib;qtmain.lib;opengl32.lib;imm32.lib;winmm.lib;Qt5Core.lib;Qt5Gui.lib;Qt5PlatformSupport.lib;platforms\qwindows.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>kernel32.lib;user32.lib;shell32.lib;uuid.lib;ole32.lib;advapi32.lib;ws2_32.lib;qtmain.lib;opengl32.lib;imm32.lib;winmm.lib;Qt5Core.lib;Qt5Gui.lib;qtharfbuzzng.lib;Qt5PlatformSupport.lib;platforms\qwindows.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <GenerateDebugInformation>false</GenerateDebugInformation>
    </Link>
  </ItemDefinitionGroup>
--- a/Telegram/MetaStyle.xcodeproj/project.pbxproj
+++ b/Telegram/MetaStyle.xcodeproj/project.pbxproj
@@ -63,160 +63,160 @@
 /* End PBXContainerItemProxy section */

 /* Begin PBXFileReference section */
-		04391BE7A8B9D811E255100A /* Qt5Gui */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = Qt5Gui; path = "/usr/local/Qt-5.3.1/lib/libQt5Gui$(QT_LIBRARY_SUFFIX).a"; sourceTree = "<absolute>"; };
-		060A694B42A4555240009936 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qtga.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qtga.pri"; sourceTree = "<absolute>"; };
-		075EB50EB07CF69FD62FB8DF /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_sql_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_sql_private.pri"; sourceTree = "<absolute>"; };
-		0ABCEA8D0DD45589040B0AF2 /* /usr/local/Qt-5.3.1/mkspecs/common/unix.conf */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/common/unix.conf"; sourceTree = "<absolute>"; };
+		04391BE7A8B9D811E255100A /* Qt5Gui */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = Qt5Gui; path = "/usr/local/Qt-5.4.0/lib/libQt5Gui$(QT_LIBRARY_SUFFIX).a"; sourceTree = "<absolute>"; };
+		060A694B42A4555240009936 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qtga.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qtga.pri"; sourceTree = "<absolute>"; };
+		075EB50EB07CF69FD62FB8DF /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_sql_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_sql_private.pri"; sourceTree = "<absolute>"; };
+		0ABCEA8D0DD45589040B0AF2 /* /usr/local/Qt-5.4.0/mkspecs/common/unix.conf */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/common/unix.conf"; sourceTree = "<absolute>"; };
 		10F719DFC6D0B05605ED1C16 /* MetaStyle.pro */ = {isa = PBXFileReference; lastKnownFileType = text; path = MetaStyle.pro; sourceTree = "<absolute>"; };
-		111BBEE3D1432C3B517FD539 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qdds.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qdds.pri"; sourceTree = "<absolute>"; };
-		16DD53E17C65AC8B450CC6C3 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_quick.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_quick.pri"; sourceTree = "<absolute>"; };
-		1FAE75C970AA73F2DEDDB508 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qavfcamera.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qavfcamera.pri"; sourceTree = "<absolute>"; };
-		23BC8B0FC3279421D41CA268 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_gui.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_gui.pri"; sourceTree = "<absolute>"; };
-		2440CD1D4CEF80443BCA1B8B /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qgenericbearer.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qgenericbearer.pri"; sourceTree = "<absolute>"; };
-		247D8DF3B1DDB665B80BBA25 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qtaccessiblequick.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qtaccessiblequick.pri"; sourceTree = "<absolute>"; };
-		24B6929EE3952310F2DAECB1 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qtaudio_coreaudio.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qtaudio_coreaudio.pri"; sourceTree = "<absolute>"; };
-		28BD0D10214709D95B161E24 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_multimediawidgets.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_multimediawidgets.pri"; sourceTree = "<absolute>"; };
-		293C8DEEE270847AC20E70F9 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_network.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_network.pri"; sourceTree = "<absolute>"; };
+		111BBEE3D1432C3B517FD539 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qdds.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qdds.pri"; sourceTree = "<absolute>"; };
+		16DD53E17C65AC8B450CC6C3 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_quick.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_quick.pri"; sourceTree = "<absolute>"; };
+		1FAE75C970AA73F2DEDDB508 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qavfcamera.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qavfcamera.pri"; sourceTree = "<absolute>"; };
+		23BC8B0FC3279421D41CA268 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_gui.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_gui.pri"; sourceTree = "<absolute>"; };
+		2440CD1D4CEF80443BCA1B8B /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qgenericbearer.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qgenericbearer.pri"; sourceTree = "<absolute>"; };
+		247D8DF3B1DDB665B80BBA25 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qtaccessiblequick.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qtaccessiblequick.pri"; sourceTree = "<absolute>"; };
+		24B6929EE3952310F2DAECB1 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qtaudio_coreaudio.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qtaudio_coreaudio.pri"; sourceTree = "<absolute>"; };
+		28BD0D10214709D95B161E24 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_multimediawidgets.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_multimediawidgets.pri"; sourceTree = "<absolute>"; };
+		293C8DEEE270847AC20E70F9 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_network.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_network.pri"; sourceTree = "<absolute>"; };
 		2CBD32689B153445ED220FAE /* MetaStyle.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = MetaStyle.app; sourceTree = BUILT_PRODUCTS_DIR; };
-		2E48BB382B895A5ACD79AF9F /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_bluetooth_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_bluetooth_private.pri"; sourceTree = "<absolute>"; };
-		2E6D9B1D2743D24E31B0B284 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_xmlpatterns.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_xmlpatterns.pri"; sourceTree = "<absolute>"; };
-		311004331A04F3D69C98643C /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_serialport_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_serialport_private.pri"; sourceTree = "<absolute>"; };
-		31120EDB269DFF13E1D49847 /* qicns */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = qicns; path = "/usr/local/Qt-5.3.1/plugins/imageformats/libqicns$(QT_LIBRARY_SUFFIX).a"; sourceTree = "<absolute>"; };
-		33F165B1DB8CBF182C56FAB5 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_macextras_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_macextras_private.pri"; sourceTree = "<absolute>"; };
-		346287C9E754E7C458153F03 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qwbmp.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qwbmp.pri"; sourceTree = "<absolute>"; };
-		360D4B3ED25D126430DE27D4 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_enginio.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_enginio.pri"; sourceTree = "<absolute>"; };
-		3685604BDB64DD6E92169B73 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qdeclarativeview.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qdeclarativeview.pri"; sourceTree = "<absolute>"; };
-		382E89A91A34F7898C25FD0D /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_network_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_network_private.pri"; sourceTree = "<absolute>"; };
-		3F08D430CEC8D2117735CCB4 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qmldbg_tcp_qtdeclarative.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qmldbg_tcp_qtdeclarative.pri"; sourceTree = "<absolute>"; };
-		45B95DB3B70B47A910FC847B /* /usr/local/Qt-5.3.1/mkspecs/common/gcc-base.conf */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/common/gcc-base.conf"; sourceTree = "<absolute>"; };
-		45DB132B756499D4DF38430E /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qjp2.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qjp2.pri"; sourceTree = "<absolute>"; };
-		4689C06178B60B84E7F3A3B7 /* Qt5Widgets */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = Qt5Widgets; path = "/usr/local/Qt-5.3.1/lib/libQt5Widgets$(QT_LIBRARY_SUFFIX).a"; sourceTree = "<absolute>"; };
-		4C6C71914B1926119120DACD /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_enginio_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_enginio_private.pri"; sourceTree = "<absolute>"; };
+		2E48BB382B895A5ACD79AF9F /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_bluetooth_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_bluetooth_private.pri"; sourceTree = "<absolute>"; };
+		2E6D9B1D2743D24E31B0B284 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_xmlpatterns.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_xmlpatterns.pri"; sourceTree = "<absolute>"; };
+		311004331A04F3D69C98643C /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_serialport_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_serialport_private.pri"; sourceTree = "<absolute>"; };
+		31120EDB269DFF13E1D49847 /* qicns */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = qicns; path = "/usr/local/Qt-5.4.0/plugins/imageformats/libqicns$(QT_LIBRARY_SUFFIX).a"; sourceTree = "<absolute>"; };
+		33F165B1DB8CBF182C56FAB5 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_macextras_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_macextras_private.pri"; sourceTree = "<absolute>"; };
+		346287C9E754E7C458153F03 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qwbmp.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qwbmp.pri"; sourceTree = "<absolute>"; };
+		360D4B3ED25D126430DE27D4 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_enginio.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_enginio.pri"; sourceTree = "<absolute>"; };
+		3685604BDB64DD6E92169B73 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qdeclarativeview.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qdeclarativeview.pri"; sourceTree = "<absolute>"; };
+		382E89A91A34F7898C25FD0D /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_network_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_network_private.pri"; sourceTree = "<absolute>"; };
+		3F08D430CEC8D2117735CCB4 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qmldbg_tcp_qtdeclarative.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qmldbg_tcp_qtdeclarative.pri"; sourceTree = "<absolute>"; };
+		45B95DB3B70B47A910FC847B /* /usr/local/Qt-5.4.0/mkspecs/common/gcc-base.conf */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/common/gcc-base.conf"; sourceTree = "<absolute>"; };
+		45DB132B756499D4DF38430E /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qjp2.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qjp2.pri"; sourceTree = "<absolute>"; };
+		4689C06178B60B84E7F3A3B7 /* Qt5Widgets */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = Qt5Widgets; path = "/usr/local/Qt-5.4.0/lib/libQt5Widgets$(QT_LIBRARY_SUFFIX).a"; sourceTree = "<absolute>"; };
+		4C6C71914B1926119120DACD /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_enginio_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_enginio_private.pri"; sourceTree = "<absolute>"; };
 		4D765E1B1EA6C757220C63E7 /* CoreFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreFoundation.framework; path = /System/Library/Frameworks/CoreFoundation.framework; sourceTree = "<absolute>"; };
-		4FB6657DA22BC68B819B64B3 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_qmldevtools_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_qmldevtools_private.pri"; sourceTree = "<absolute>"; };
-		5597304BEC94BFB9EAAEBC4B /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_openglextensions_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_openglextensions_private.pri"; sourceTree = "<absolute>"; };
-		5A80A1907B6CFFB524C1E57D /* Qt5Core */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = Qt5Core; path = "/usr/local/Qt-5.3.1/lib/libQt5Core$(QT_LIBRARY_SUFFIX).a"; sourceTree = "<absolute>"; };
-		5B22E9E4EE9AAE42ABC24AB3 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_qtmultimediaquicktools_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_qtmultimediaquicktools_private.pri"; sourceTree = "<absolute>"; };
-		5CEA7A2DB2136425A88D1254 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_opengl.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_opengl.pri"; sourceTree = "<absolute>"; };
-		5F781C7FD8422D359EA1D2FE /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_core_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_core_private.pri"; sourceTree = "<absolute>"; };
-		6102C69805B6398AF6FA5BEB /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_qml_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_qml_private.pri"; sourceTree = "<absolute>"; };
-		63E722139886C87BC82DBDF5 /* /usr/local/Qt-5.3.1/mkspecs/macx-clang/qmake.conf */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/macx-clang/qmake.conf"; sourceTree = "<absolute>"; };
-		669FB007C4A3D58424D85EC8 /* /usr/local/Qt-5.3.1/mkspecs/common/shell-unix.conf */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/common/shell-unix.conf"; sourceTree = "<absolute>"; };
-		69347C39E4D922E94D0860BF /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_designercomponents_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_designercomponents_private.pri"; sourceTree = "<absolute>"; };
-		6C08BFC27C4C303A3A5181DB /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_printsupport.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_printsupport.pri"; sourceTree = "<absolute>"; };
-		6E67D23B15FC4B628DB2E0B2 /* /usr/local/Qt-5.3.1/mkspecs/qdevice.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/qdevice.pri"; sourceTree = "<absolute>"; };
+		4FB6657DA22BC68B819B64B3 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_qmldevtools_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_qmldevtools_private.pri"; sourceTree = "<absolute>"; };
+		5597304BEC94BFB9EAAEBC4B /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_openglextensions_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_openglextensions_private.pri"; sourceTree = "<absolute>"; };
+		5A80A1907B6CFFB524C1E57D /* Qt5Core */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = Qt5Core; path = "/usr/local/Qt-5.4.0/lib/libQt5Core$(QT_LIBRARY_SUFFIX).a"; sourceTree = "<absolute>"; };
+		5B22E9E4EE9AAE42ABC24AB3 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_qtmultimediaquicktools_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_qtmultimediaquicktools_private.pri"; sourceTree = "<absolute>"; };
+		5CEA7A2DB2136425A88D1254 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_opengl.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_opengl.pri"; sourceTree = "<absolute>"; };
+		5F781C7FD8422D359EA1D2FE /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_core_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_core_private.pri"; sourceTree = "<absolute>"; };
+		6102C69805B6398AF6FA5BEB /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_qml_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_qml_private.pri"; sourceTree = "<absolute>"; };
+		63E722139886C87BC82DBDF5 /* /usr/local/Qt-5.4.0/mkspecs/macx-clang/qmake.conf */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/macx-clang/qmake.conf"; sourceTree = "<absolute>"; };
+		669FB007C4A3D58424D85EC8 /* /usr/local/Qt-5.4.0/mkspecs/common/shell-unix.conf */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/common/shell-unix.conf"; sourceTree = "<absolute>"; };
+		69347C39E4D922E94D0860BF /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_designercomponents_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_designercomponents_private.pri"; sourceTree = "<absolute>"; };
+		6C08BFC27C4C303A3A5181DB /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_printsupport.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_printsupport.pri"; sourceTree = "<absolute>"; };
+		6E67D23B15FC4B628DB2E0B2 /* /usr/local/Qt-5.4.0/mkspecs/qdevice.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/qdevice.pri"; sourceTree = "<absolute>"; };
 		6FF81CB4A724CE1990CEE99A /* msmain.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = msmain.h; path = SourceFiles/_other/msmain.h; sourceTree = "<absolute>"; };
-		74C1C232DFAA71028A0412CA /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qtmultimedia_m3u.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qtmultimedia_m3u.pri"; sourceTree = "<absolute>"; };
-		77FF486B1F9BCD55A8A3F35D /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_concurrent.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_concurrent.pri"; sourceTree = "<absolute>"; };
-		7A94C7168B3FCBE5F04A013B /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_declarative.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_declarative.pri"; sourceTree = "<absolute>"; };
-		7C2F42B222EE88E26A6FED62 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_designer_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_designer_private.pri"; sourceTree = "<absolute>"; };
-		7D28E9003CE64D8A7F2E292E /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_concurrent_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_concurrent_private.pri"; sourceTree = "<absolute>"; };
-		7DE30A90667C03C4F91A2A91 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_sql.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_sql.pri"; sourceTree = "<absolute>"; };
-		7ECCC1F9442988B4F2707CC1 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_core.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_core.pri"; sourceTree = "<absolute>"; };
-		817A0F5A41B553A6DE67FDEB /* /usr/local/Qt-5.3.1/mkspecs/common/macx.conf */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/common/macx.conf"; sourceTree = "<absolute>"; };
-		82E7DCFD95559532D8FC6CDD /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_quickparticles_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_quickparticles_private.pri"; sourceTree = "<absolute>"; };
-		83D37373949868693FB7816D /* qmng */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = qmng; path = "/usr/local/Qt-5.3.1/plugins/imageformats/libqmng$(QT_LIBRARY_SUFFIX).a"; sourceTree = "<absolute>"; };
-		85061B1DA49D125991117950 /* /usr/local/Qt-5.3.1/mkspecs/macx-xcode/qmake.conf */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/macx-xcode/qmake.conf"; sourceTree = "<absolute>"; };
-		85B6936EDBE61D9BB8F8B33B /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_sensors.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_sensors.pri"; sourceTree = "<absolute>"; };
+		74C1C232DFAA71028A0412CA /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qtmultimedia_m3u.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qtmultimedia_m3u.pri"; sourceTree = "<absolute>"; };
+		77FF486B1F9BCD55A8A3F35D /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_concurrent.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_concurrent.pri"; sourceTree = "<absolute>"; };
+		7A94C7168B3FCBE5F04A013B /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_declarative.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_declarative.pri"; sourceTree = "<absolute>"; };
+		7C2F42B222EE88E26A6FED62 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_designer_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_designer_private.pri"; sourceTree = "<absolute>"; };
+		7D28E9003CE64D8A7F2E292E /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_concurrent_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_concurrent_private.pri"; sourceTree = "<absolute>"; };
+		7DE30A90667C03C4F91A2A91 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_sql.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_sql.pri"; sourceTree = "<absolute>"; };
+		7ECCC1F9442988B4F2707CC1 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_core.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_core.pri"; sourceTree = "<absolute>"; };
+		817A0F5A41B553A6DE67FDEB /* /usr/local/Qt-5.4.0/mkspecs/common/macx.conf */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/common/macx.conf"; sourceTree = "<absolute>"; };
+		82E7DCFD95559532D8FC6CDD /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_quickparticles_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_quickparticles_private.pri"; sourceTree = "<absolute>"; };
+		83D37373949868693FB7816D /* qmng */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = qmng; path = "/usr/local/Qt-5.4.0/plugins/imageformats/libqmng$(QT_LIBRARY_SUFFIX).a"; sourceTree = "<absolute>"; };
+		85061B1DA49D125991117950 /* /usr/local/Qt-5.4.0/mkspecs/macx-xcode/qmake.conf */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/macx-xcode/qmake.conf"; sourceTree = "<absolute>"; };
+		85B6936EDBE61D9BB8F8B33B /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_sensors.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_sensors.pri"; sourceTree = "<absolute>"; };
 		861D2151FB56504EB72BDB6E /* moc_genstyles.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = moc_genstyles.cpp; path = GeneratedFiles/Debug/moc_genstyles.cpp; sourceTree = "<absolute>"; };
-		87A4C1983FD641360BF80A02 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qtaccessiblewidgets.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qtaccessiblewidgets.pri"; sourceTree = "<absolute>"; };
-		87EEF25EE25CF21572D1438C /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_websockets_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_websockets_private.pri"; sourceTree = "<absolute>"; };
-		8849E60AEC7DB97A475C17EA /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_testlib_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_testlib_private.pri"; sourceTree = "<absolute>"; };
-		892D36BEF797BA4AF48D378A /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qtsensors_dummy.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qtsensors_dummy.pri"; sourceTree = "<absolute>"; };
-		89863CCAF1D29037AE95755D /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_declarative_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_declarative_private.pri"; sourceTree = "<absolute>"; };
-		8A04A4A3625204D12A1207F6 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_nfc.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_nfc.pri"; sourceTree = "<absolute>"; };
-		8B4BB4E74F8A4442EF563D7D /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qtsensorgestures_shakeplugin.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qtsensorgestures_shakeplugin.pri"; sourceTree = "<absolute>"; };
-		8C31D89BDFCDF466DAED19A0 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_quick_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_quick_private.pri"; sourceTree = "<absolute>"; };
-		8C5164D4E37556D40C5E6AA2 /* /usr/local/Qt-5.3.1/mkspecs/common/clang.conf */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/common/clang.conf"; sourceTree = "<absolute>"; };
-		8CF51323544B886B8F4A2232 /* qwbmp */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = qwbmp; path = "/usr/local/Qt-5.3.1/plugins/imageformats/libqwbmp$(QT_LIBRARY_SUFFIX).a"; sourceTree = "<absolute>"; };
+		87A4C1983FD641360BF80A02 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qtaccessiblewidgets.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qtaccessiblewidgets.pri"; sourceTree = "<absolute>"; };
+		87EEF25EE25CF21572D1438C /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_websockets_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_websockets_private.pri"; sourceTree = "<absolute>"; };
+		8849E60AEC7DB97A475C17EA /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_testlib_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_testlib_private.pri"; sourceTree = "<absolute>"; };
+		892D36BEF797BA4AF48D378A /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qtsensors_dummy.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qtsensors_dummy.pri"; sourceTree = "<absolute>"; };
+		89863CCAF1D29037AE95755D /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_declarative_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_declarative_private.pri"; sourceTree = "<absolute>"; };
+		8A04A4A3625204D12A1207F6 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_nfc.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_nfc.pri"; sourceTree = "<absolute>"; };
+		8B4BB4E74F8A4442EF563D7D /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qtsensorgestures_shakeplugin.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qtsensorgestures_shakeplugin.pri"; sourceTree = "<absolute>"; };
+		8C31D89BDFCDF466DAED19A0 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_quick_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_quick_private.pri"; sourceTree = "<absolute>"; };
+		8C5164D4E37556D40C5E6AA2 /* /usr/local/Qt-5.4.0/mkspecs/common/clang.conf */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/common/clang.conf"; sourceTree = "<absolute>"; };
+		8CF51323544B886B8F4A2232 /* qwbmp */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = qwbmp; path = "/usr/local/Qt-5.4.0/plugins/imageformats/libqwbmp$(QT_LIBRARY_SUFFIX).a"; sourceTree = "<absolute>"; };
 		8D9815BDB5BD9F90D2BC05C5 /* AGL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AGL.framework; path = /System/Library/Frameworks/AGL.framework; sourceTree = "<absolute>"; };
-		8DDE1D26B3206CDB8B57FABE /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_svg_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_svg_private.pri"; sourceTree = "<absolute>"; };
-		8E9136256AFFBA6EF048AA55 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_widgets_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_widgets_private.pri"; sourceTree = "<absolute>"; };
-		8F500B5166907B6D9A7C3E3D /* qico */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = qico; path = "/usr/local/Qt-5.3.1/plugins/imageformats/libqico$(QT_LIBRARY_SUFFIX).a"; sourceTree = "<absolute>"; };
-		8F572030CE9AB8CC5F672201 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_platformsupport_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_platformsupport_private.pri"; sourceTree = "<absolute>"; };
-		8F97C9CAE38CA3AFAC0B3953 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_websockets.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_websockets.pri"; sourceTree = "<absolute>"; };
-		946BEA667170DC1A7A8F9DB0 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qmng.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qmng.pri"; sourceTree = "<absolute>"; };
+		8DDE1D26B3206CDB8B57FABE /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_svg_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_svg_private.pri"; sourceTree = "<absolute>"; };
+		8E9136256AFFBA6EF048AA55 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_widgets_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_widgets_private.pri"; sourceTree = "<absolute>"; };
+		8F500B5166907B6D9A7C3E3D /* qico */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = qico; path = "/usr/local/Qt-5.4.0/plugins/imageformats/libqico$(QT_LIBRARY_SUFFIX).a"; sourceTree = "<absolute>"; };
+		8F572030CE9AB8CC5F672201 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_platformsupport_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_platformsupport_private.pri"; sourceTree = "<absolute>"; };
+		8F97C9CAE38CA3AFAC0B3953 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_websockets.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_websockets.pri"; sourceTree = "<absolute>"; };
+		946BEA667170DC1A7A8F9DB0 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qmng.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qmng.pri"; sourceTree = "<absolute>"; };
 		9742F24EE18EA44D52824F1E /* CoreServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreServices.framework; path = /System/Library/Frameworks/CoreServices.framework; sourceTree = "<absolute>"; };
-		9A0BDF67E013BB4FFB8685B0 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qqt7engine.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qqt7engine.pri"; sourceTree = "<absolute>"; };
+		9A0BDF67E013BB4FFB8685B0 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qqt7engine.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qqt7engine.pri"; sourceTree = "<absolute>"; };
 		9DFF62A901D70814B8A323D4 /* Carbon.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Carbon.framework; path = /System/Library/Frameworks/Carbon.framework; sourceTree = "<absolute>"; };
-		A022AF919D1977534CA66BB8 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_widgets.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_widgets.pri"; sourceTree = "<absolute>"; };
+		A022AF919D1977534CA66BB8 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_widgets.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_widgets.pri"; sourceTree = "<absolute>"; };
 		A1A67BEAA744704B29168D39 /* IOKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = IOKit.framework; path = /System/Library/Frameworks/IOKit.framework; sourceTree = "<absolute>"; };
 		A35D133D7C0EFB42FA85D194 /* genstyles.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = genstyles.h; path = SourceFiles/_other/genstyles.h; sourceTree = "<absolute>"; };
-		A4D8AC60897F435C1C3B9D02 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qtsensors_generic.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qtsensors_generic.pri"; sourceTree = "<absolute>"; };
-		A59F74CD76FDC2B4B9910E18 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_scripttools_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_scripttools_private.pri"; sourceTree = "<absolute>"; };
-		A5B17ABEFBA1C2F43443D644 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_macextras.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_macextras.pri"; sourceTree = "<absolute>"; };
-		A9E30FA27827990C5F182223 /* /usr/local/Qt-5.3.1/mkspecs/common/gcc-base-mac.conf */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/common/gcc-base-mac.conf"; sourceTree = "<absolute>"; };
-		AA73DC3C2901E2979FE8AD5B /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_xml.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_xml.pri"; sourceTree = "<absolute>"; };
-		AB1C02DDBD8E88DD9A9AFDDD /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qtsensorgestures_plugin.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qtsensorgestures_plugin.pri"; sourceTree = "<absolute>"; };
+		A4D8AC60897F435C1C3B9D02 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qtsensors_generic.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qtsensors_generic.pri"; sourceTree = "<absolute>"; };
+		A59F74CD76FDC2B4B9910E18 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_scripttools_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_scripttools_private.pri"; sourceTree = "<absolute>"; };
+		A5B17ABEFBA1C2F43443D644 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_macextras.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_macextras.pri"; sourceTree = "<absolute>"; };
+		A9E30FA27827990C5F182223 /* /usr/local/Qt-5.4.0/mkspecs/common/gcc-base-mac.conf */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/common/gcc-base-mac.conf"; sourceTree = "<absolute>"; };
+		AA73DC3C2901E2979FE8AD5B /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_xml.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_xml.pri"; sourceTree = "<absolute>"; };
+		AB1C02DDBD8E88DD9A9AFDDD /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qtsensorgestures_plugin.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qtsensorgestures_plugin.pri"; sourceTree = "<absolute>"; };
 		AB745978DF0F41D1801ABDA6 /* .qmake.stash */ = {isa = PBXFileReference; lastKnownFileType = file; path = .qmake.stash; sourceTree = "<absolute>"; };
-		ABA9AB4619F09DCFD2D4A27F /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_qmltest_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_qmltest_private.pri"; sourceTree = "<absolute>"; };
-		ACC8A73268E5D9AF64E97AF4 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_bluetooth.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_bluetooth.pri"; sourceTree = "<absolute>"; };
-		ADC6308023253CEA51F86E21 /* qwebp */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = qwebp; path = "/usr/local/Qt-5.3.1/plugins/imageformats/libqwebp$(QT_LIBRARY_SUFFIX).a"; sourceTree = "<absolute>"; };
-		ADFC79902C14A612AE93A89A /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_svg.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_svg.pri"; sourceTree = "<absolute>"; };
+		ABA9AB4619F09DCFD2D4A27F /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_qmltest_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_qmltest_private.pri"; sourceTree = "<absolute>"; };
+		ACC8A73268E5D9AF64E97AF4 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_bluetooth.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_bluetooth.pri"; sourceTree = "<absolute>"; };
+		ADC6308023253CEA51F86E21 /* qwebp */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = qwebp; path = "/usr/local/Qt-5.4.0/plugins/imageformats/libqwebp$(QT_LIBRARY_SUFFIX).a"; sourceTree = "<absolute>"; };
+		ADFC79902C14A612AE93A89A /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_svg.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_svg.pri"; sourceTree = "<absolute>"; };
 		AEA456A2F75ED9F5CDA7BCBE /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = /System/Library/Frameworks/Cocoa.framework; sourceTree = "<absolute>"; };
-		AFD721AA33A2F785E77B1698 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qcocoa.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qcocoa.pri"; sourceTree = "<absolute>"; };
-		B064BF3B496A7BF7A449CA1E /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qsqlite.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qsqlite.pri"; sourceTree = "<absolute>"; };
-		B2246267D4C0D789259A86B0 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_quickwidgets_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_quickwidgets_private.pri"; sourceTree = "<absolute>"; };
-		B26239063A068F800A2C95F4 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qwebp.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qwebp.pri"; sourceTree = "<absolute>"; };
-		B382B645B34234E451AE5D94 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_qml.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_qml.pri"; sourceTree = "<absolute>"; };
-		B518DA4EE7376002AFC71FD5 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_uitools_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_uitools_private.pri"; sourceTree = "<absolute>"; };
-		B51B01657BFE9EAEF5590561 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_nfc_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_nfc_private.pri"; sourceTree = "<absolute>"; };
-		B678DA730B4ECE863AD631AE /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qminimal.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qminimal.pri"; sourceTree = "<absolute>"; };
-		B8525798C5AA7D7C6D68E1B3 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qmldbg_qtquick2.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qmldbg_qtquick2.pri"; sourceTree = "<absolute>"; };
-		B8C1F6C965A7A14FBA8D4518 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qtmedia_audioengine.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qtmedia_audioengine.pri"; sourceTree = "<absolute>"; };
-		BD22EFEFCC02644B1883CE19 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qtiff.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qtiff.pri"; sourceTree = "<absolute>"; };
-		BD4D97801B547471B37A4CDC /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_bootstrap_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_bootstrap_private.pri"; sourceTree = "<absolute>"; };
-		BDC9ECADEE40D11E3C2EA93F /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_sensors_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_sensors_private.pri"; sourceTree = "<absolute>"; };
-		BFF0C38FB0EC140C5F0304AE /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_serialport.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_serialport.pri"; sourceTree = "<absolute>"; };
-		C4295BE59CCEBCDD16268349 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qico.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qico.pri"; sourceTree = "<absolute>"; };
-		C505A18319B9B63C63877858 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_script_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_script_private.pri"; sourceTree = "<absolute>"; };
-		C84546C18DCBB04166195DCF /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qtposition_positionpoll.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qtposition_positionpoll.pri"; sourceTree = "<absolute>"; };
-		CCF75CFFB857487FB18F99F9 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qoffscreen.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qoffscreen.pri"; sourceTree = "<absolute>"; };
-		CE829DD126DD2B97E8D70A7A /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_scripttools.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_scripttools.pri"; sourceTree = "<absolute>"; };
-		CF86CD5BB01B9011E6B6FD3E /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_clucene_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_clucene_private.pri"; sourceTree = "<absolute>"; };
-		CFCB992BEC24B71BFB8A2F30 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_script.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_script.pri"; sourceTree = "<absolute>"; };
-		CFFBE05DB004895080314289 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qsvgicon.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qsvgicon.pri"; sourceTree = "<absolute>"; };
-		D0CDC87DAFDA7F18A7AF450F /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_printsupport_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_printsupport_private.pri"; sourceTree = "<absolute>"; };
-		D1FA7CAB5ACC09D563AE569F /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_multimediawidgets_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_multimediawidgets_private.pri"; sourceTree = "<absolute>"; };
-		D2FE4D909926A0D1656068C4 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_multimedia.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_multimedia.pri"; sourceTree = "<absolute>"; };
-		D3D1BE0BEA3AEE0551AD39AC /* qdds */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = qdds; path = "/usr/local/Qt-5.3.1/plugins/imageformats/libqdds$(QT_LIBRARY_SUFFIX).a"; sourceTree = "<absolute>"; };
+		AFD721AA33A2F785E77B1698 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qcocoa.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qcocoa.pri"; sourceTree = "<absolute>"; };
+		B064BF3B496A7BF7A449CA1E /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qsqlite.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qsqlite.pri"; sourceTree = "<absolute>"; };
+		B2246267D4C0D789259A86B0 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_quickwidgets_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_quickwidgets_private.pri"; sourceTree = "<absolute>"; };
+		B26239063A068F800A2C95F4 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qwebp.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qwebp.pri"; sourceTree = "<absolute>"; };
+		B382B645B34234E451AE5D94 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_qml.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_qml.pri"; sourceTree = "<absolute>"; };
+		B518DA4EE7376002AFC71FD5 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_uitools_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_uitools_private.pri"; sourceTree = "<absolute>"; };
+		B51B01657BFE9EAEF5590561 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_nfc_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_nfc_private.pri"; sourceTree = "<absolute>"; };
+		B678DA730B4ECE863AD631AE /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qminimal.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qminimal.pri"; sourceTree = "<absolute>"; };
+		B8525798C5AA7D7C6D68E1B3 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qmldbg_qtquick2.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qmldbg_qtquick2.pri"; sourceTree = "<absolute>"; };
+		B8C1F6C965A7A14FBA8D4518 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qtmedia_audioengine.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qtmedia_audioengine.pri"; sourceTree = "<absolute>"; };
+		BD22EFEFCC02644B1883CE19 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qtiff.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qtiff.pri"; sourceTree = "<absolute>"; };
+		BD4D97801B547471B37A4CDC /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_bootstrap_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_bootstrap_private.pri"; sourceTree = "<absolute>"; };
+		BDC9ECADEE40D11E3C2EA93F /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_sensors_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_sensors_private.pri"; sourceTree = "<absolute>"; };
+		BFF0C38FB0EC140C5F0304AE /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_serialport.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_serialport.pri"; sourceTree = "<absolute>"; };
+		C4295BE59CCEBCDD16268349 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qico.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qico.pri"; sourceTree = "<absolute>"; };
+		C505A18319B9B63C63877858 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_script_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_script_private.pri"; sourceTree = "<absolute>"; };
+		C84546C18DCBB04166195DCF /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qtposition_positionpoll.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qtposition_positionpoll.pri"; sourceTree = "<absolute>"; };
+		CCF75CFFB857487FB18F99F9 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qoffscreen.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qoffscreen.pri"; sourceTree = "<absolute>"; };
+		CE829DD126DD2B97E8D70A7A /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_scripttools.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_scripttools.pri"; sourceTree = "<absolute>"; };
+		CF86CD5BB01B9011E6B6FD3E /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_clucene_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_clucene_private.pri"; sourceTree = "<absolute>"; };
+		CFCB992BEC24B71BFB8A2F30 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_script.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_script.pri"; sourceTree = "<absolute>"; };
+		CFFBE05DB004895080314289 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qsvgicon.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qsvgicon.pri"; sourceTree = "<absolute>"; };
+		D0CDC87DAFDA7F18A7AF450F /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_printsupport_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_printsupport_private.pri"; sourceTree = "<absolute>"; };
+		D1FA7CAB5ACC09D563AE569F /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_multimediawidgets_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_multimediawidgets_private.pri"; sourceTree = "<absolute>"; };
+		D2FE4D909926A0D1656068C4 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_multimedia.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_multimedia.pri"; sourceTree = "<absolute>"; };
+		D3D1BE0BEA3AEE0551AD39AC /* qdds */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = qdds; path = "/usr/local/Qt-5.4.0/plugins/imageformats/libqdds$(QT_LIBRARY_SUFFIX).a"; sourceTree = "<absolute>"; };
 		D4B32C2222F82AC56BADEB21 /* OpenGL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGL.framework; path = /System/Library/Frameworks/OpenGL.framework; sourceTree = "<absolute>"; };
-		D4DE537C1FBBD48BD989FAD1 /* /usr/local/Qt-5.3.1/mkspecs/qconfig.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/qconfig.pri"; sourceTree = "<absolute>"; };
-		D5141F795670589C8CC41CBC /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_cocoaprintersupport.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_cocoaprintersupport.pri"; sourceTree = "<absolute>"; };
-		D53D8E6A188E05078A114294 /* qcocoa */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = qcocoa; path = "/usr/local/Qt-5.3.1/plugins/platforms/libqcocoa$(QT_LIBRARY_SUFFIX).a"; sourceTree = "<absolute>"; };
-		D6193B79CECC9DD0142D1200 /* qtharfbuzzng */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = qtharfbuzzng; path = "/usr/local/Qt-5.3.1/lib/libqtharfbuzzng$(QT_LIBRARY_SUFFIX).a"; sourceTree = "<absolute>"; };
-		D7A0618DE39A427EBF41940E /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_help_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_help_private.pri"; sourceTree = "<absolute>"; };
-		D81E3D9A18202BE8EC3D0E2C /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_gui_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_gui_private.pri"; sourceTree = "<absolute>"; };
-		D948D4D8F949D45158F8DE35 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_quickwidgets.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_quickwidgets.pri"; sourceTree = "<absolute>"; };
-		DB0A26DDC377B2004F61BFE3 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_testlib.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_testlib.pri"; sourceTree = "<absolute>"; };
-		DBF506D10449BFABD45B82DA /* Qt5PrintSupport */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = Qt5PrintSupport; path = "/usr/local/Qt-5.3.1/lib/libQt5PrintSupport$(QT_LIBRARY_SUFFIX).a"; sourceTree = "<absolute>"; };
-		DCEFD9167C239650120B0145 /* qtga */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = qtga; path = "/usr/local/Qt-5.3.1/plugins/imageformats/libqtga$(QT_LIBRARY_SUFFIX).a"; sourceTree = "<absolute>"; };
-		DF8188E30892A4654B984221 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_qmltest.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_qmltest.pri"; sourceTree = "<absolute>"; };
+		D4DE537C1FBBD48BD989FAD1 /* /usr/local/Qt-5.4.0/mkspecs/qconfig.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/qconfig.pri"; sourceTree = "<absolute>"; };
+		D5141F795670589C8CC41CBC /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_cocoaprintersupport.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_cocoaprintersupport.pri"; sourceTree = "<absolute>"; };
+		D53D8E6A188E05078A114294 /* qcocoa */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = qcocoa; path = "/usr/local/Qt-5.4.0/plugins/platforms/libqcocoa$(QT_LIBRARY_SUFFIX).a"; sourceTree = "<absolute>"; };
+		D6193B79CECC9DD0142D1200 /* qtharfbuzzng */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = qtharfbuzzng; path = "/usr/local/Qt-5.4.0/lib/libqtharfbuzzng$(QT_LIBRARY_SUFFIX).a"; sourceTree = "<absolute>"; };
+		D7A0618DE39A427EBF41940E /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_help_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_help_private.pri"; sourceTree = "<absolute>"; };
+		D81E3D9A18202BE8EC3D0E2C /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_gui_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_gui_private.pri"; sourceTree = "<absolute>"; };
+		D948D4D8F949D45158F8DE35 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_quickwidgets.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_quickwidgets.pri"; sourceTree = "<absolute>"; };
+		DB0A26DDC377B2004F61BFE3 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_testlib.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_testlib.pri"; sourceTree = "<absolute>"; };
+		DBF506D10449BFABD45B82DA /* Qt5PrintSupport */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = Qt5PrintSupport; path = "/usr/local/Qt-5.4.0/lib/libQt5PrintSupport$(QT_LIBRARY_SUFFIX).a"; sourceTree = "<absolute>"; };
+		DCEFD9167C239650120B0145 /* qtga */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = qtga; path = "/usr/local/Qt-5.4.0/plugins/imageformats/libqtga$(QT_LIBRARY_SUFFIX).a"; sourceTree = "<absolute>"; };
+		DF8188E30892A4654B984221 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_qmltest.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_qmltest.pri"; sourceTree = "<absolute>"; };
 		DFD7912080BC557230093752 /* ApplicationServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ApplicationServices.framework; path = /System/Library/Frameworks/ApplicationServices.framework; sourceTree = "<absolute>"; };
-		E0F4563EA350EB65112A0EF4 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_opengl_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_opengl_private.pri"; sourceTree = "<absolute>"; };
-		E37365B4489B4918BEBB707D /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_xml_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_xml_private.pri"; sourceTree = "<absolute>"; };
-		E432DA897A5F027987342E8F /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_openglextensions.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_openglextensions.pri"; sourceTree = "<absolute>"; };
-		E50FA73B8A23BC179A642B27 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_uitools.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_uitools.pri"; sourceTree = "<absolute>"; };
-		E66B9EC81C285CA9A7FB6A2E /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_positioning_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_positioning_private.pri"; sourceTree = "<absolute>"; };
-		E7B2F248E3F7970788F35BF5 /* Qt5PlatformSupport */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = Qt5PlatformSupport; path = "/usr/local/Qt-5.3.1/lib/libQt5PlatformSupport$(QT_LIBRARY_SUFFIX).a"; sourceTree = "<absolute>"; };
-		E7D67CB158408BB7DEA74764 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_multimedia_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_multimedia_private.pri"; sourceTree = "<absolute>"; };
-		EA5D4FF9DE4AC4215D7DCE0D /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qcorewlanbearer.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qcorewlanbearer.pri"; sourceTree = "<absolute>"; };
-		EB1F99FD112917157F3C3F6E /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qicns.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qicns.pri"; sourceTree = "<absolute>"; };
-		EB29AC635054C09EFA749AE1 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qmldbg_tcp.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qmldbg_tcp.pri"; sourceTree = "<absolute>"; };
-		EBD39B69F368CEEAC360A16D /* /usr/local/Qt-5.3.1/mkspecs/common/mac.conf */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/common/mac.conf"; sourceTree = "<absolute>"; };
+		E0F4563EA350EB65112A0EF4 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_opengl_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_opengl_private.pri"; sourceTree = "<absolute>"; };
+		E37365B4489B4918BEBB707D /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_xml_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_xml_private.pri"; sourceTree = "<absolute>"; };
+		E432DA897A5F027987342E8F /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_openglextensions.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_openglextensions.pri"; sourceTree = "<absolute>"; };
+		E50FA73B8A23BC179A642B27 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_uitools.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_uitools.pri"; sourceTree = "<absolute>"; };
+		E66B9EC81C285CA9A7FB6A2E /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_positioning_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_positioning_private.pri"; sourceTree = "<absolute>"; };
+		E7B2F248E3F7970788F35BF5 /* Qt5PlatformSupport */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = Qt5PlatformSupport; path = "/usr/local/Qt-5.4.0/lib/libQt5PlatformSupport$(QT_LIBRARY_SUFFIX).a"; sourceTree = "<absolute>"; };
+		E7D67CB158408BB7DEA74764 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_multimedia_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_multimedia_private.pri"; sourceTree = "<absolute>"; };
+		EA5D4FF9DE4AC4215D7DCE0D /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qcorewlanbearer.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qcorewlanbearer.pri"; sourceTree = "<absolute>"; };
+		EB1F99FD112917157F3C3F6E /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qicns.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qicns.pri"; sourceTree = "<absolute>"; };
+		EB29AC635054C09EFA749AE1 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qmldbg_tcp.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qmldbg_tcp.pri"; sourceTree = "<absolute>"; };
+		EBD39B69F368CEEAC360A16D /* /usr/local/Qt-5.4.0/mkspecs/common/mac.conf */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/common/mac.conf"; sourceTree = "<absolute>"; };
 		EF5243ECB3132AF2796F09DF /* msmain.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = msmain.cpp; path = SourceFiles/_other/msmain.cpp; sourceTree = "<absolute>"; };
-		F0681BC551FC8A2B132FC646 /* qjp2 */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = qjp2; path = "/usr/local/Qt-5.3.1/plugins/imageformats/libqjp2$(QT_LIBRARY_SUFFIX).a"; sourceTree = "<absolute>"; };
-		F0A58515945747E36783CC21 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qmldbg_inspector.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qmldbg_inspector.pri"; sourceTree = "<absolute>"; };
-		F2453BA07315EB9F34F1CD57 /* qtiff */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = qtiff; path = "/usr/local/Qt-5.3.1/plugins/imageformats/libqtiff$(QT_LIBRARY_SUFFIX).a"; sourceTree = "<absolute>"; };
-		F2F823087EA182CCBD5748B8 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_designer.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_designer.pri"; sourceTree = "<absolute>"; };
-		F33BE16353DD1557A9AB3558 /* /usr/local/Qt-5.3.1/mkspecs/common/clang-mac.conf */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/common/clang-mac.conf"; sourceTree = "<absolute>"; };
-		F4EB01857048DCFCFFAAC4D0 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qavfmediaplayer.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qavfmediaplayer.pri"; sourceTree = "<absolute>"; };
-		F7ADBF552F6B9A5982915164 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_positioning.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_positioning.pri"; sourceTree = "<absolute>"; };
-		F83F87F8A60C9DF666911D42 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qsvg.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qsvg.pri"; sourceTree = "<absolute>"; };
+		F0681BC551FC8A2B132FC646 /* qjp2 */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = qjp2; path = "/usr/local/Qt-5.4.0/plugins/imageformats/libqjp2$(QT_LIBRARY_SUFFIX).a"; sourceTree = "<absolute>"; };
+		F0A58515945747E36783CC21 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qmldbg_inspector.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qmldbg_inspector.pri"; sourceTree = "<absolute>"; };
+		F2453BA07315EB9F34F1CD57 /* qtiff */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = qtiff; path = "/usr/local/Qt-5.4.0/plugins/imageformats/libqtiff$(QT_LIBRARY_SUFFIX).a"; sourceTree = "<absolute>"; };
+		F2F823087EA182CCBD5748B8 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_designer.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_designer.pri"; sourceTree = "<absolute>"; };
+		F33BE16353DD1557A9AB3558 /* /usr/local/Qt-5.4.0/mkspecs/common/clang-mac.conf */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/common/clang-mac.conf"; sourceTree = "<absolute>"; };
+		F4EB01857048DCFCFFAAC4D0 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qavfmediaplayer.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qavfmediaplayer.pri"; sourceTree = "<absolute>"; };
+		F7ADBF552F6B9A5982915164 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_positioning.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_positioning.pri"; sourceTree = "<absolute>"; };
+		F83F87F8A60C9DF666911D42 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qsvg.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qsvg.pri"; sourceTree = "<absolute>"; };
 		F8BC976260B6D624F23C32D6 /* genstyles.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = genstyles.cpp; path = SourceFiles/_other/genstyles.cpp; sourceTree = "<absolute>"; };
-		F9BEAA743A908603687DA204 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_xmlpatterns_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_xmlpatterns_private.pri"; sourceTree = "<absolute>"; };
+		F9BEAA743A908603687DA204 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_xmlpatterns_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_xmlpatterns_private.pri"; sourceTree = "<absolute>"; };
 		FCC237CA5AD60B9BA4447615 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = /System/Library/Frameworks/Foundation.framework; sourceTree = "<absolute>"; };
-		FD944B80F033DFE737D401A2 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_help.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_help.pri"; sourceTree = "<absolute>"; };
+		FD944B80F033DFE737D401A2 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_help.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_help.pri"; sourceTree = "<absolute>"; };
 /* End PBXFileReference section */

 /* Begin PBXFrameworksBuildPhase section */
@@ -295,127 +295,127 @@
 			isa = PBXGroup;
 			children = (
 				10F719DFC6D0B05605ED1C16 /* MetaStyle.pro */,
-				6E67D23B15FC4B628DB2E0B2 /* /usr/local/Qt-5.3.1/mkspecs/qdevice.pri */,
-				669FB007C4A3D58424D85EC8 /* /usr/local/Qt-5.3.1/mkspecs/common/shell-unix.conf */,
-				0ABCEA8D0DD45589040B0AF2 /* /usr/local/Qt-5.3.1/mkspecs/common/unix.conf */,
-				EBD39B69F368CEEAC360A16D /* /usr/local/Qt-5.3.1/mkspecs/common/mac.conf */,
-				817A0F5A41B553A6DE67FDEB /* /usr/local/Qt-5.3.1/mkspecs/common/macx.conf */,
-				45B95DB3B70B47A910FC847B /* /usr/local/Qt-5.3.1/mkspecs/common/gcc-base.conf */,
-				A9E30FA27827990C5F182223 /* /usr/local/Qt-5.3.1/mkspecs/common/gcc-base-mac.conf */,
-				8C5164D4E37556D40C5E6AA2 /* /usr/local/Qt-5.3.1/mkspecs/common/clang.conf */,
-				F33BE16353DD1557A9AB3558 /* /usr/local/Qt-5.3.1/mkspecs/common/clang-mac.conf */,
-				D4DE537C1FBBD48BD989FAD1 /* /usr/local/Qt-5.3.1/mkspecs/qconfig.pri */,
-				ACC8A73268E5D9AF64E97AF4 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_bluetooth.pri */,
-				2E48BB382B895A5ACD79AF9F /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_bluetooth_private.pri */,
-				BD4D97801B547471B37A4CDC /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_bootstrap_private.pri */,
-				CF86CD5BB01B9011E6B6FD3E /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_clucene_private.pri */,
-				77FF486B1F9BCD55A8A3F35D /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_concurrent.pri */,
-				7D28E9003CE64D8A7F2E292E /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_concurrent_private.pri */,
-				7ECCC1F9442988B4F2707CC1 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_core.pri */,
-				5F781C7FD8422D359EA1D2FE /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_core_private.pri */,
-				7A94C7168B3FCBE5F04A013B /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_declarative.pri */,
-				89863CCAF1D29037AE95755D /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_declarative_private.pri */,
-				F2F823087EA182CCBD5748B8 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_designer.pri */,
-				7C2F42B222EE88E26A6FED62 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_designer_private.pri */,
-				69347C39E4D922E94D0860BF /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_designercomponents_private.pri */,
-				360D4B3ED25D126430DE27D4 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_enginio.pri */,
-				4C6C71914B1926119120DACD /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_enginio_private.pri */,
-				23BC8B0FC3279421D41CA268 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_gui.pri */,
-				D81E3D9A18202BE8EC3D0E2C /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_gui_private.pri */,
-				FD944B80F033DFE737D401A2 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_help.pri */,
-				D7A0618DE39A427EBF41940E /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_help_private.pri */,
-				A5B17ABEFBA1C2F43443D644 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_macextras.pri */,
-				33F165B1DB8CBF182C56FAB5 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_macextras_private.pri */,
-				D2FE4D909926A0D1656068C4 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_multimedia.pri */,
-				E7D67CB158408BB7DEA74764 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_multimedia_private.pri */,
-				28BD0D10214709D95B161E24 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_multimediawidgets.pri */,
-				D1FA7CAB5ACC09D563AE569F /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_multimediawidgets_private.pri */,
-				293C8DEEE270847AC20E70F9 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_network.pri */,
-				382E89A91A34F7898C25FD0D /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_network_private.pri */,
-				8A04A4A3625204D12A1207F6 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_nfc.pri */,
-				B51B01657BFE9EAEF5590561 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_nfc_private.pri */,
-				5CEA7A2DB2136425A88D1254 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_opengl.pri */,
-				E0F4563EA350EB65112A0EF4 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_opengl_private.pri */,
-				E432DA897A5F027987342E8F /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_openglextensions.pri */,
-				5597304BEC94BFB9EAAEBC4B /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_openglextensions_private.pri */,
-				8F572030CE9AB8CC5F672201 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_platformsupport_private.pri */,
-				F7ADBF552F6B9A5982915164 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_positioning.pri */,
-				E66B9EC81C285CA9A7FB6A2E /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_positioning_private.pri */,
-				6C08BFC27C4C303A3A5181DB /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_printsupport.pri */,
-				D0CDC87DAFDA7F18A7AF450F /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_printsupport_private.pri */,
-				B382B645B34234E451AE5D94 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_qml.pri */,
-				6102C69805B6398AF6FA5BEB /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_qml_private.pri */,
-				4FB6657DA22BC68B819B64B3 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_qmldevtools_private.pri */,
-				DF8188E30892A4654B984221 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_qmltest.pri */,
-				ABA9AB4619F09DCFD2D4A27F /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_qmltest_private.pri */,
-				5B22E9E4EE9AAE42ABC24AB3 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_qtmultimediaquicktools_private.pri */,
-				16DD53E17C65AC8B450CC6C3 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_quick.pri */,
-				8C31D89BDFCDF466DAED19A0 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_quick_private.pri */,
-				82E7DCFD95559532D8FC6CDD /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_quickparticles_private.pri */,
-				D948D4D8F949D45158F8DE35 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_quickwidgets.pri */,
-				B2246267D4C0D789259A86B0 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_quickwidgets_private.pri */,
-				CFCB992BEC24B71BFB8A2F30 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_script.pri */,
-				C505A18319B9B63C63877858 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_script_private.pri */,
-				CE829DD126DD2B97E8D70A7A /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_scripttools.pri */,
-				A59F74CD76FDC2B4B9910E18 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_scripttools_private.pri */,
-				85B6936EDBE61D9BB8F8B33B /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_sensors.pri */,
-				BDC9ECADEE40D11E3C2EA93F /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_sensors_private.pri */,
-				BFF0C38FB0EC140C5F0304AE /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_serialport.pri */,
-				311004331A04F3D69C98643C /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_serialport_private.pri */,
-				7DE30A90667C03C4F91A2A91 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_sql.pri */,
-				075EB50EB07CF69FD62FB8DF /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_sql_private.pri */,
-				ADFC79902C14A612AE93A89A /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_svg.pri */,
-				8DDE1D26B3206CDB8B57FABE /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_svg_private.pri */,
-				DB0A26DDC377B2004F61BFE3 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_testlib.pri */,
-				8849E60AEC7DB97A475C17EA /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_testlib_private.pri */,
-				E50FA73B8A23BC179A642B27 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_uitools.pri */,
-				B518DA4EE7376002AFC71FD5 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_uitools_private.pri */,
-				8F97C9CAE38CA3AFAC0B3953 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_websockets.pri */,
-				87EEF25EE25CF21572D1438C /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_websockets_private.pri */,
-				A022AF919D1977534CA66BB8 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_widgets.pri */,
-				8E9136256AFFBA6EF048AA55 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_widgets_private.pri */,
-				AA73DC3C2901E2979FE8AD5B /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_xml.pri */,
-				E37365B4489B4918BEBB707D /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_xml_private.pri */,
-				2E6D9B1D2743D24E31B0B284 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_xmlpatterns.pri */,
-				F9BEAA743A908603687DA204 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_xmlpatterns_private.pri */,
-				D5141F795670589C8CC41CBC /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_cocoaprintersupport.pri */,
-				1FAE75C970AA73F2DEDDB508 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qavfcamera.pri */,
-				F4EB01857048DCFCFFAAC4D0 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qavfmediaplayer.pri */,
-				AFD721AA33A2F785E77B1698 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qcocoa.pri */,
-				EA5D4FF9DE4AC4215D7DCE0D /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qcorewlanbearer.pri */,
-				111BBEE3D1432C3B517FD539 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qdds.pri */,
-				3685604BDB64DD6E92169B73 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qdeclarativeview.pri */,
-				2440CD1D4CEF80443BCA1B8B /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qgenericbearer.pri */,
-				EB1F99FD112917157F3C3F6E /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qicns.pri */,
-				C4295BE59CCEBCDD16268349 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qico.pri */,
-				45DB132B756499D4DF38430E /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qjp2.pri */,
-				B678DA730B4ECE863AD631AE /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qminimal.pri */,
-				F0A58515945747E36783CC21 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qmldbg_inspector.pri */,
-				B8525798C5AA7D7C6D68E1B3 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qmldbg_qtquick2.pri */,
-				EB29AC635054C09EFA749AE1 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qmldbg_tcp.pri */,
-				3F08D430CEC8D2117735CCB4 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qmldbg_tcp_qtdeclarative.pri */,
-				946BEA667170DC1A7A8F9DB0 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qmng.pri */,
-				CCF75CFFB857487FB18F99F9 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qoffscreen.pri */,
-				9A0BDF67E013BB4FFB8685B0 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qqt7engine.pri */,
-				B064BF3B496A7BF7A449CA1E /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qsqlite.pri */,
-				F83F87F8A60C9DF666911D42 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qsvg.pri */,
-				CFFBE05DB004895080314289 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qsvgicon.pri */,
-				247D8DF3B1DDB665B80BBA25 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qtaccessiblequick.pri */,
-				87A4C1983FD641360BF80A02 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qtaccessiblewidgets.pri */,
-				24B6929EE3952310F2DAECB1 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qtaudio_coreaudio.pri */,
-				060A694B42A4555240009936 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qtga.pri */,
-				BD22EFEFCC02644B1883CE19 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qtiff.pri */,
-				B8C1F6C965A7A14FBA8D4518 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qtmedia_audioengine.pri */,
-				74C1C232DFAA71028A0412CA /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qtmultimedia_m3u.pri */,
-				C84546C18DCBB04166195DCF /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qtposition_positionpoll.pri */,
-				AB1C02DDBD8E88DD9A9AFDDD /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qtsensorgestures_plugin.pri */,
-				8B4BB4E74F8A4442EF563D7D /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qtsensorgestures_shakeplugin.pri */,
-				892D36BEF797BA4AF48D378A /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qtsensors_dummy.pri */,
-				A4D8AC60897F435C1C3B9D02 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qtsensors_generic.pri */,
-				346287C9E754E7C458153F03 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qwbmp.pri */,
-				B26239063A068F800A2C95F4 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qwebp.pri */,
-				63E722139886C87BC82DBDF5 /* /usr/local/Qt-5.3.1/mkspecs/macx-clang/qmake.conf */,
-				85061B1DA49D125991117950 /* /usr/local/Qt-5.3.1/mkspecs/macx-xcode/qmake.conf */,
+				6E67D23B15FC4B628DB2E0B2 /* /usr/local/Qt-5.4.0/mkspecs/qdevice.pri */,
+				669FB007C4A3D58424D85EC8 /* /usr/local/Qt-5.4.0/mkspecs/common/shell-unix.conf */,
+				0ABCEA8D0DD45589040B0AF2 /* /usr/local/Qt-5.4.0/mkspecs/common/unix.conf */,
+				EBD39B69F368CEEAC360A16D /* /usr/local/Qt-5.4.0/mkspecs/common/mac.conf */,
+				817A0F5A41B553A6DE67FDEB /* /usr/local/Qt-5.4.0/mkspecs/common/macx.conf */,
+				45B95DB3B70B47A910FC847B /* /usr/local/Qt-5.4.0/mkspecs/common/gcc-base.conf */,
+				A9E30FA27827990C5F182223 /* /usr/local/Qt-5.4.0/mkspecs/common/gcc-base-mac.conf */,
+				8C5164D4E37556D40C5E6AA2 /* /usr/local/Qt-5.4.0/mkspecs/common/clang.conf */,
+				F33BE16353DD1557A9AB3558 /* /usr/local/Qt-5.4.0/mkspecs/common/clang-mac.conf */,
+				D4DE537C1FBBD48BD989FAD1 /* /usr/local/Qt-5.4.0/mkspecs/qconfig.pri */,
+				ACC8A73268E5D9AF64E97AF4 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_bluetooth.pri */,
+				2E48BB382B895A5ACD79AF9F /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_bluetooth_private.pri */,
+				BD4D97801B547471B37A4CDC /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_bootstrap_private.pri */,
+				CF86CD5BB01B9011E6B6FD3E /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_clucene_private.pri */,
+				77FF486B1F9BCD55A8A3F35D /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_concurrent.pri */,
+				7D28E9003CE64D8A7F2E292E /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_concurrent_private.pri */,
+				7ECCC1F9442988B4F2707CC1 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_core.pri */,
+				5F781C7FD8422D359EA1D2FE /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_core_private.pri */,
+				7A94C7168B3FCBE5F04A013B /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_declarative.pri */,
+				89863CCAF1D29037AE95755D /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_declarative_private.pri */,
+				F2F823087EA182CCBD5748B8 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_designer.pri */,
+				7C2F42B222EE88E26A6FED62 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_designer_private.pri */,
+				69347C39E4D922E94D0860BF /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_designercomponents_private.pri */,
+				360D4B3ED25D126430DE27D4 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_enginio.pri */,
+				4C6C71914B1926119120DACD /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_enginio_private.pri */,
+				23BC8B0FC3279421D41CA268 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_gui.pri */,
+				D81E3D9A18202BE8EC3D0E2C /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_gui_private.pri */,
+				FD944B80F033DFE737D401A2 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_help.pri */,
+				D7A0618DE39A427EBF41940E /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_help_private.pri */,
+				A5B17ABEFBA1C2F43443D644 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_macextras.pri */,
+				33F165B1DB8CBF182C56FAB5 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_macextras_private.pri */,
+				D2FE4D909926A0D1656068C4 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_multimedia.pri */,
+				E7D67CB158408BB7DEA74764 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_multimedia_private.pri */,
+				28BD0D10214709D95B161E24 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_multimediawidgets.pri */,
+				D1FA7CAB5ACC09D563AE569F /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_multimediawidgets_private.pri */,
+				293C8DEEE270847AC20E70F9 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_network.pri */,
+				382E89A91A34F7898C25FD0D /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_network_private.pri */,
+				8A04A4A3625204D12A1207F6 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_nfc.pri */,
+				B51B01657BFE9EAEF5590561 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_nfc_private.pri */,
+				5CEA7A2DB2136425A88D1254 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_opengl.pri */,
+				E0F4563EA350EB65112A0EF4 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_opengl_private.pri */,
+				E432DA897A5F027987342E8F /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_openglextensions.pri */,
+				5597304BEC94BFB9EAAEBC4B /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_openglextensions_private.pri */,
+				8F572030CE9AB8CC5F672201 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_platformsupport_private.pri */,
+				F7ADBF552F6B9A5982915164 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_positioning.pri */,
+				E66B9EC81C285CA9A7FB6A2E /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_positioning_private.pri */,
+				6C08BFC27C4C303A3A5181DB /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_printsupport.pri */,
+				D0CDC87DAFDA7F18A7AF450F /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_printsupport_private.pri */,
+				B382B645B34234E451AE5D94 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_qml.pri */,
+				6102C69805B6398AF6FA5BEB /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_qml_private.pri */,
+				4FB6657DA22BC68B819B64B3 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_qmldevtools_private.pri */,
+				DF8188E30892A4654B984221 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_qmltest.pri */,
+				ABA9AB4619F09DCFD2D4A27F /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_qmltest_private.pri */,
+				5B22E9E4EE9AAE42ABC24AB3 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_qtmultimediaquicktools_private.pri */,
+				16DD53E17C65AC8B450CC6C3 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_quick.pri */,
+				8C31D89BDFCDF466DAED19A0 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_quick_private.pri */,
+				82E7DCFD95559532D8FC6CDD /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_quickparticles_private.pri */,
+				D948D4D8F949D45158F8DE35 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_quickwidgets.pri */,
+				B2246267D4C0D789259A86B0 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_quickwidgets_private.pri */,
+				CFCB992BEC24B71BFB8A2F30 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_script.pri */,
+				C505A18319B9B63C63877858 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_script_private.pri */,
+				CE829DD126DD2B97E8D70A7A /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_scripttools.pri */,
+				A59F74CD76FDC2B4B9910E18 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_scripttools_private.pri */,
+				85B6936EDBE61D9BB8F8B33B /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_sensors.pri */,
+				BDC9ECADEE40D11E3C2EA93F /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_sensors_private.pri */,
+				BFF0C38FB0EC140C5F0304AE /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_serialport.pri */,
+				311004331A04F3D69C98643C /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_serialport_private.pri */,
+				7DE30A90667C03C4F91A2A91 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_sql.pri */,
+				075EB50EB07CF69FD62FB8DF /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_sql_private.pri */,
+				ADFC79902C14A612AE93A89A /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_svg.pri */,
+				8DDE1D26B3206CDB8B57FABE /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_svg_private.pri */,
+				DB0A26DDC377B2004F61BFE3 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_testlib.pri */,
+				8849E60AEC7DB97A475C17EA /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_testlib_private.pri */,
+				E50FA73B8A23BC179A642B27 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_uitools.pri */,
+				B518DA4EE7376002AFC71FD5 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_uitools_private.pri */,
+				8F97C9CAE38CA3AFAC0B3953 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_websockets.pri */,
+				87EEF25EE25CF21572D1438C /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_websockets_private.pri */,
+				A022AF919D1977534CA66BB8 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_widgets.pri */,
+				8E9136256AFFBA6EF048AA55 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_widgets_private.pri */,
+				AA73DC3C2901E2979FE8AD5B /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_xml.pri */,
+				E37365B4489B4918BEBB707D /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_xml_private.pri */,
+				2E6D9B1D2743D24E31B0B284 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_xmlpatterns.pri */,
+				F9BEAA743A908603687DA204 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_xmlpatterns_private.pri */,
+				D5141F795670589C8CC41CBC /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_cocoaprintersupport.pri */,
+				1FAE75C970AA73F2DEDDB508 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qavfcamera.pri */,
+				F4EB01857048DCFCFFAAC4D0 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qavfmediaplayer.pri */,
+				AFD721AA33A2F785E77B1698 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qcocoa.pri */,
+				EA5D4FF9DE4AC4215D7DCE0D /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qcorewlanbearer.pri */,
+				111BBEE3D1432C3B517FD539 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qdds.pri */,
+				3685604BDB64DD6E92169B73 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qdeclarativeview.pri */,
+				2440CD1D4CEF80443BCA1B8B /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qgenericbearer.pri */,
+				EB1F99FD112917157F3C3F6E /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qicns.pri */,
+				C4295BE59CCEBCDD16268349 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qico.pri */,
+				45DB132B756499D4DF38430E /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qjp2.pri */,
+				B678DA730B4ECE863AD631AE /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qminimal.pri */,
+				F0A58515945747E36783CC21 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qmldbg_inspector.pri */,
+				B8525798C5AA7D7C6D68E1B3 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qmldbg_qtquick2.pri */,
+				EB29AC635054C09EFA749AE1 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qmldbg_tcp.pri */,
+				3F08D430CEC8D2117735CCB4 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qmldbg_tcp_qtdeclarative.pri */,
+				946BEA667170DC1A7A8F9DB0 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qmng.pri */,
+				CCF75CFFB857487FB18F99F9 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qoffscreen.pri */,
+				9A0BDF67E013BB4FFB8685B0 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qqt7engine.pri */,
+				B064BF3B496A7BF7A449CA1E /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qsqlite.pri */,
+				F83F87F8A60C9DF666911D42 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qsvg.pri */,
+				CFFBE05DB004895080314289 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qsvgicon.pri */,
+				247D8DF3B1DDB665B80BBA25 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qtaccessiblequick.pri */,
+				87A4C1983FD641360BF80A02 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qtaccessiblewidgets.pri */,
+				24B6929EE3952310F2DAECB1 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qtaudio_coreaudio.pri */,
+				060A694B42A4555240009936 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qtga.pri */,
+				BD22EFEFCC02644B1883CE19 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qtiff.pri */,
+				B8C1F6C965A7A14FBA8D4518 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qtmedia_audioengine.pri */,
+				74C1C232DFAA71028A0412CA /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qtmultimedia_m3u.pri */,
+				C84546C18DCBB04166195DCF /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qtposition_positionpoll.pri */,
+				AB1C02DDBD8E88DD9A9AFDDD /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qtsensorgestures_plugin.pri */,
+				8B4BB4E74F8A4442EF563D7D /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qtsensorgestures_shakeplugin.pri */,
+				892D36BEF797BA4AF48D378A /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qtsensors_dummy.pri */,
+				A4D8AC60897F435C1C3B9D02 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qtsensors_generic.pri */,
+				346287C9E754E7C458153F03 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qwbmp.pri */,
+				B26239063A068F800A2C95F4 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qwebp.pri */,
+				63E722139886C87BC82DBDF5 /* /usr/local/Qt-5.4.0/mkspecs/macx-clang/qmake.conf */,
+				85061B1DA49D125991117950 /* /usr/local/Qt-5.4.0/mkspecs/macx-xcode/qmake.conf */,
 				AB745978DF0F41D1801ABDA6 /* .qmake.stash */,
 			);
 			name = "Supporting Files";
@@ -516,7 +516,7 @@
 		6DB9C3763D02B1415CD9D565 /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 0610;
+				LastUpgradeCheck = 0630;
 			};
 			buildConfigurationList = DAC4C1AA5EDEA1C85E9CA5E6 /* Build configuration list for PBXProject "MetaStyle" */;
 			compatibilityVersion = "Xcode 3.2";
@@ -603,6 +603,7 @@
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				FRAMEWORK_SEARCH_PATHS = "";
 				GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
+				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
@@ -611,25 +612,25 @@
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				HEADER_SEARCH_PATHS = (
-					../../Libraries/QtStatic/qtbase/include/QtGui/5.3.1/QtGui,
-					../../Libraries/QtStatic/qtbase/include/QtCore/5.3.1/QtCore,
+					../../Libraries/QtStatic/qtbase/include/QtGui/5.4.0/QtGui,
+					../../Libraries/QtStatic/qtbase/include/QtCore/5.4.0/QtCore,
 					../../Libraries/QtStatic/qtbase/include,
-					"/usr/local/Qt-5.3.1/include",
-					"/usr/local/Qt-5.3.1/include/QtGui",
-					"/usr/local/Qt-5.3.1/include/QtCore",
+					"/usr/local/Qt-5.4.0/include",
+					"/usr/local/Qt-5.4.0/include/QtGui",
+					"/usr/local/Qt-5.4.0/include/QtCore",
 					GeneratedFiles/Debug,
 					/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.9.sdk/System/Library/Frameworks/OpenGL.framework/Versions/A/Headers,
 					/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.9.sdk/System/Library/Frameworks/AGL.framework/Headers,
-					"/usr/local/Qt-5.3.1/mkspecs/macx-clang",
+					"/usr/local/Qt-5.4.0/mkspecs/macx-clang",
 				);
 				INFOPLIST_FILE = Style.plist;
 				INSTALL_DIR = ../Mac/ReleaseStyle/;
 				LDPLUSPLUS = "/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang++";
 				LIBRARY_SEARCH_PATHS = (
 					/System/Library/Frameworks/,
-					"/usr/local/Qt-5.3.1/lib",
-					"/usr/local/Qt-5.3.1/plugins/platforms",
-					"/usr/local/Qt-5.3.1/plugins/imageformats",
+					"/usr/local/Qt-5.4.0/lib",
+					"/usr/local/Qt-5.4.0/plugins/platforms",
+					"/usr/local/Qt-5.4.0/plugins/imageformats",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 10.7;
 				OBJROOT = ./../Mac/ReleaseIntermediateStyle;
@@ -658,10 +659,10 @@
 				OTHER_LDFLAGS = (
 					"-headerpad_max_install_names",
 					"-stdlib=libc++",
-					"-L/usr/local/Qt-5.3.1/lib",
-					"-L/usr/local/Qt-5.3.1/plugins/platforms",
+					"-L/usr/local/Qt-5.4.0/lib",
+					"-L/usr/local/Qt-5.4.0/plugins/platforms",
 					"-lcups",
-					"-L/usr/local/Qt-5.3.1/plugins/imageformats",
+					"-L/usr/local/Qt-5.4.0/plugins/imageformats",
 					"-lz",
 					"-lm",
 				);
@@ -691,6 +692,7 @@
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				FRAMEWORK_SEARCH_PATHS = "";
 				GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
+				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_OPTIMIZATION_LEVEL = 0;
 				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
@@ -700,25 +702,25 @@
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				HEADER_SEARCH_PATHS = (
-					../../Libraries/QtStatic/qtbase/include/QtGui/5.3.1/QtGui,
-					../../Libraries/QtStatic/qtbase/include/QtCore/5.3.1/QtCore,
+					../../Libraries/QtStatic/qtbase/include/QtGui/5.4.0/QtGui,
+					../../Libraries/QtStatic/qtbase/include/QtCore/5.4.0/QtCore,
 					../../Libraries/QtStatic/qtbase/include,
-					"/usr/local/Qt-5.3.1/include",
-					"/usr/local/Qt-5.3.1/include/QtGui",
-					"/usr/local/Qt-5.3.1/include/QtCore",
+					"/usr/local/Qt-5.4.0/include",
+					"/usr/local/Qt-5.4.0/include/QtGui",
+					"/usr/local/Qt-5.4.0/include/QtCore",
 					GeneratedFiles/Debug,
 					/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.9.sdk/System/Library/Frameworks/OpenGL.framework/Versions/A/Headers,
 					/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.9.sdk/System/Library/Frameworks/AGL.framework/Headers,
-					"/usr/local/Qt-5.3.1/mkspecs/macx-clang",
+					"/usr/local/Qt-5.4.0/mkspecs/macx-clang",
 				);
 				INFOPLIST_FILE = Style.plist;
 				INSTALL_DIR = ../Mac/DebugStyle/;
 				LDPLUSPLUS = "/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang++";
 				LIBRARY_SEARCH_PATHS = (
 					/System/Library/Frameworks/,
-					"/usr/local/Qt-5.3.1/lib",
-					"/usr/local/Qt-5.3.1/plugins/platforms",
-					"/usr/local/Qt-5.3.1/plugins/imageformats",
+					"/usr/local/Qt-5.4.0/lib",
+					"/usr/local/Qt-5.4.0/plugins/platforms",
+					"/usr/local/Qt-5.4.0/plugins/imageformats",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 10.7;
 				OBJROOT = ./../Mac/DebugIntermediateStyle;
@@ -748,10 +750,10 @@
 				OTHER_LDFLAGS = (
 					"-headerpad_max_install_names",
 					"-stdlib=libc++",
-					"-L/usr/local/Qt-5.3.1/lib",
-					"-L/usr/local/Qt-5.3.1/plugins/platforms",
+					"-L/usr/local/Qt-5.4.0/lib",
+					"-L/usr/local/Qt-5.4.0/plugins/platforms",
 					"-lcups",
-					"-L/usr/local/Qt-5.3.1/plugins/imageformats",
+					"-L/usr/local/Qt-5.4.0/plugins/imageformats",
 					"-lz",
 					"-lm",
 				);
@@ -769,15 +771,15 @@
 				COPY_PHASE_STRIP = YES;
 				GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
 				HEADER_SEARCH_PATHS = (
-					./../../Libraries/QtStatic/qtbase/include/QtGui/5.3.1/QtGui,
-					./../../Libraries/QtStatic/qtbase/include/QtCore/5.3.1/QtCore,
+					./../../Libraries/QtStatic/qtbase/include/QtGui/5.4.0/QtGui,
+					./../../Libraries/QtStatic/qtbase/include/QtCore/5.4.0/QtCore,
 					./../../Libraries/QtStatic/qtbase/include,
-					"/usr/local/Qt-5.3.1/include",
-					"/usr/local/Qt-5.3.1/include/QtGui",
-					"/usr/local/Qt-5.3.1/include/QtCore",
+					"/usr/local/Qt-5.4.0/include",
+					"/usr/local/Qt-5.4.0/include/QtGui",
+					"/usr/local/Qt-5.4.0/include/QtCore",
 					/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.9.sdk/System/Library/Frameworks/OpenGL.framework/Versions/A/Headers,
 					/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.9.sdk/System/Library/Frameworks/AGL.framework/Headers,
-					"/usr/local/Qt-5.3.1/mkspecs/macx-clang",
+					"/usr/local/Qt-5.4.0/mkspecs/macx-clang",
 				);
 				INSTALL_DIR = ./../Mac/ReleaseStyle/;
 				PRODUCT_NAME = MetaStyle;
@@ -795,15 +797,15 @@
 				GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
 				GCC_OPTIMIZATION_LEVEL = 0;
 				HEADER_SEARCH_PATHS = (
-					./../../Libraries/QtStatic/qtbase/include/QtGui/5.3.1/QtGui,
-					./../../Libraries/QtStatic/qtbase/include/QtCore/5.3.1/QtCore,
+					./../../Libraries/QtStatic/qtbase/include/QtGui/5.4.0/QtGui,
+					./../../Libraries/QtStatic/qtbase/include/QtCore/5.4.0/QtCore,
 					./../../Libraries/QtStatic/qtbase/include,
-					"/usr/local/Qt-5.3.1/include",
-					"/usr/local/Qt-5.3.1/include/QtGui",
-					"/usr/local/Qt-5.3.1/include/QtCore",
+					"/usr/local/Qt-5.4.0/include",
+					"/usr/local/Qt-5.4.0/include/QtGui",
+					"/usr/local/Qt-5.4.0/include/QtCore",
 					/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.9.sdk/System/Library/Frameworks/OpenGL.framework/Versions/A/Headers,
 					/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.9.sdk/System/Library/Frameworks/AGL.framework/Headers,
-					"/usr/local/Qt-5.3.1/mkspecs/macx-clang",
+					"/usr/local/Qt-5.4.0/mkspecs/macx-clang",
 				);
 				INSTALL_DIR = ./../Mac/DebugStyle/;
 				PRODUCT_NAME = MetaStyle;
--- a/Telegram/MetaStyle.xcodeproj/qt_preprocess.mak
+++ b/Telegram/MetaStyle.xcodeproj/qt_preprocess.mak
@@ -1,21 +1,21 @@
 #############################################################################
 # Makefile for building: ../Mac/DebugStyle/MetaStyle.app/Contents/MacOS/MetaStyle
-# Generated by qmake (3.0) (Qt 5.3.1)
+# Generated by qmake (3.0) (Qt 5.4.0)
 # Project:  MetaStyle.pro
 # Template: app
-# Command: /usr/local/Qt-5.3.1/bin/qmake -spec macx-xcode -o MetaStyle.xcodeproj/project.pbxproj MetaStyle.pro
+# Command: /usr/local/Qt-5.4.0/bin/qmake -spec macx-xcode -o MetaStyle.xcodeproj/project.pbxproj MetaStyle.pro
 #############################################################################

 MAKEFILE      = project.pbxproj

-MOC       = /usr/local/Qt-5.3.1/bin/moc
+MOC       = /usr/local/Qt-5.4.0/bin/moc
 UIC       = 
 LEX       = flex
 LEXFLAGS  = 
 YACC      = yacc
 YACCFLAGS = -d
 DEFINES       = -D_DEBUG -DQT_GUI_LIB -DQT_CORE_LIB
-INCPATH       = -I/usr/local/Qt-5.3.1/mkspecs/macx-clang -I. -I../../Libraries/QtStatic/qtbase/include/QtGui/5.3.1/QtGui -I../../Libraries/QtStatic/qtbase/include/QtCore/5.3.1/QtCore -I../../Libraries/QtStatic/qtbase/include -I/usr/local/Qt-5.3.1/include -I/usr/local/Qt-5.3.1/include/QtGui -I/usr/local/Qt-5.3.1/include/QtCore -IGeneratedFiles/Debug -I/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.9.sdk/System/Library/Frameworks/OpenGL.framework/Versions/A/Headers -I/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.9.sdk/System/Library/Frameworks/AGL.framework/Headers
+INCPATH       = -I/usr/local/Qt-5.4.0/mkspecs/macx-clang -I. -I../../Libraries/QtStatic/qtbase/include/QtGui/5.4.0/QtGui -I../../Libraries/QtStatic/qtbase/include/QtCore/5.4.0/QtCore -I../../Libraries/QtStatic/qtbase/include -I/usr/local/Qt-5.4.0/include -I/usr/local/Qt-5.4.0/include/QtGui -I/usr/local/Qt-5.4.0/include/QtCore -IGeneratedFiles/Debug -I/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.9.sdk/System/Library/Frameworks/OpenGL.framework/Versions/A/Headers -I/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.9.sdk/System/Library/Frameworks/AGL.framework/Headers
 DEL_FILE  = rm -f
 MOVE      = mv -f

@@ -51,7 +51,7 @@ GeneratedFiles/Debug/moc_genstyles.cpp: ../../Libraries/QtStatic/qtbase/include/
 		../../Libraries/QtStatic/qtbase/include/QtGui/QGuiApplication \
 		../../Libraries/QtStatic/qtbase/include/QtGui/QPainter \
 		SourceFiles/_other/genstyles.h
-	/usr/local/Qt-5.3.1/bin/moc $(DEFINES) -D__APPLE__ -D__GNUC__=4 -I/usr/local/Qt-5.3.1/mkspecs/macx-clang -I. -I/usr/local/Qt-5.3.1/include/QtGui/5.3.1/QtGui -I/usr/local/Qt-5.3.1/include/QtCore/5.3.1/QtCore -I/usr/local/Qt-5.3.1/include -I/usr/local/Qt-5.3.1/include/QtGui -I/usr/local/Qt-5.3.1/include/QtCore -I/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.9.sdk/usr/include/c++/4.2.1 -I/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.9.sdk/usr/include/c++/4.2.1/backward -I/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/lib/clang/5.1/include -I/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include -I/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.9.sdk/usr/include SourceFiles/_other/genstyles.h -o GeneratedFiles/Debug/moc_genstyles.cpp
+	/usr/local/Qt-5.4.0/bin/moc $(DEFINES) -D__APPLE__ -D__GNUC__=4 -I/usr/local/Qt-5.4.0/mkspecs/macx-clang -I. -I/usr/local/Qt-5.4.0/include/QtGui/5.4.0/QtGui -I/usr/local/Qt-5.4.0/include/QtCore/5.4.0/QtCore -I/usr/local/Qt-5.4.0/include -I/usr/local/Qt-5.4.0/include/QtGui -I/usr/local/Qt-5.4.0/include/QtCore -I/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.9.sdk/usr/include/c++/4.2.1 -I/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.9.sdk/usr/include/c++/4.2.1/backward -I/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/lib/clang/5.1/include -I/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include -I/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.9.sdk/usr/include SourceFiles/_other/genstyles.h -o GeneratedFiles/Debug/moc_genstyles.cpp

 compiler_moc_source_make_all:
 compiler_moc_source_clean:
--- a/Telegram/Packer.pro
+++ b/Telegram/Packer.pro
@@ -35,8 +35,8 @@ unix {
    }
 }

-INCLUDEPATH += ./../../Libraries/QtStatic/qtbase/include/QtGui/5.3.1/QtGui\
-               ./../../Libraries/QtStatic/qtbase/include/QtCore/5.3.1/QtCore\
+INCLUDEPATH += ./../../Libraries/QtStatic/qtbase/include/QtGui/5.4.0/QtGui\
+               ./../../Libraries/QtStatic/qtbase/include/QtCore/5.4.0/QtCore\
               ./../../Libraries/QtStatic/qtbase/include

 LIBS += -lcrypto -lssl -lz -llzma
--- a/Telegram/Packer.xcodeproj/project.pbxproj
+++ b/Telegram/Packer.xcodeproj/project.pbxproj
@@ -60,157 +60,157 @@
 /* End PBXContainerItemProxy section */

 /* Begin PBXFileReference section */
-		04391BE7A8B9D811E255100A /* Qt5Gui */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = Qt5Gui; path = "/usr/local/Qt-5.3.1/lib/libQt5Gui$(QT_LIBRARY_SUFFIX).a"; sourceTree = "<absolute>"; };
-		060A694B42A4555240009936 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qtga.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qtga.pri"; sourceTree = "<absolute>"; };
-		075EB50EB07CF69FD62FB8DF /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_sql_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_sql_private.pri"; sourceTree = "<absolute>"; };
-		0ABCEA8D0DD45589040B0AF2 /* /usr/local/Qt-5.3.1/mkspecs/common/unix.conf */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/common/unix.conf"; sourceTree = "<absolute>"; };
-		111BBEE3D1432C3B517FD539 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qdds.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qdds.pri"; sourceTree = "<absolute>"; };
-		16DD53E17C65AC8B450CC6C3 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_quick.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_quick.pri"; sourceTree = "<absolute>"; };
-		1FAE75C970AA73F2DEDDB508 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qavfcamera.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qavfcamera.pri"; sourceTree = "<absolute>"; };
-		23BC8B0FC3279421D41CA268 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_gui.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_gui.pri"; sourceTree = "<absolute>"; };
-		2440CD1D4CEF80443BCA1B8B /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qgenericbearer.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qgenericbearer.pri"; sourceTree = "<absolute>"; };
-		247D8DF3B1DDB665B80BBA25 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qtaccessiblequick.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qtaccessiblequick.pri"; sourceTree = "<absolute>"; };
-		24B6929EE3952310F2DAECB1 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qtaudio_coreaudio.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qtaudio_coreaudio.pri"; sourceTree = "<absolute>"; };
-		28BD0D10214709D95B161E24 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_multimediawidgets.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_multimediawidgets.pri"; sourceTree = "<absolute>"; };
-		293C8DEEE270847AC20E70F9 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_network.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_network.pri"; sourceTree = "<absolute>"; };
-		2E48BB382B895A5ACD79AF9F /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_bluetooth_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_bluetooth_private.pri"; sourceTree = "<absolute>"; };
-		2E6D9B1D2743D24E31B0B284 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_xmlpatterns.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_xmlpatterns.pri"; sourceTree = "<absolute>"; };
-		311004331A04F3D69C98643C /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_serialport_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_serialport_private.pri"; sourceTree = "<absolute>"; };
-		31120EDB269DFF13E1D49847 /* qicns */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = qicns; path = "/usr/local/Qt-5.3.1/plugins/imageformats/libqicns$(QT_LIBRARY_SUFFIX).a"; sourceTree = "<absolute>"; };
-		33F165B1DB8CBF182C56FAB5 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_macextras_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_macextras_private.pri"; sourceTree = "<absolute>"; };
-		346287C9E754E7C458153F03 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qwbmp.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qwbmp.pri"; sourceTree = "<absolute>"; };
-		360D4B3ED25D126430DE27D4 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_enginio.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_enginio.pri"; sourceTree = "<absolute>"; };
-		3685604BDB64DD6E92169B73 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qdeclarativeview.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qdeclarativeview.pri"; sourceTree = "<absolute>"; };
-		382E89A91A34F7898C25FD0D /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_network_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_network_private.pri"; sourceTree = "<absolute>"; };
-		3F08D430CEC8D2117735CCB4 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qmldbg_tcp_qtdeclarative.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qmldbg_tcp_qtdeclarative.pri"; sourceTree = "<absolute>"; };
-		45B95DB3B70B47A910FC847B /* /usr/local/Qt-5.3.1/mkspecs/common/gcc-base.conf */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/common/gcc-base.conf"; sourceTree = "<absolute>"; };
-		45DB132B756499D4DF38430E /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qjp2.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qjp2.pri"; sourceTree = "<absolute>"; };
-		4689C06178B60B84E7F3A3B7 /* Qt5Widgets */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = Qt5Widgets; path = "/usr/local/Qt-5.3.1/lib/libQt5Widgets$(QT_LIBRARY_SUFFIX).a"; sourceTree = "<absolute>"; };
-		4C6C71914B1926119120DACD /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_enginio_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_enginio_private.pri"; sourceTree = "<absolute>"; };
+		04391BE7A8B9D811E255100A /* Qt5Gui */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = Qt5Gui; path = "/usr/local/Qt-5.4.0/lib/libQt5Gui$(QT_LIBRARY_SUFFIX).a"; sourceTree = "<absolute>"; };
+		060A694B42A4555240009936 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qtga.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qtga.pri"; sourceTree = "<absolute>"; };
+		075EB50EB07CF69FD62FB8DF /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_sql_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_sql_private.pri"; sourceTree = "<absolute>"; };
+		0ABCEA8D0DD45589040B0AF2 /* /usr/local/Qt-5.4.0/mkspecs/common/unix.conf */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/common/unix.conf"; sourceTree = "<absolute>"; };
+		111BBEE3D1432C3B517FD539 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qdds.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qdds.pri"; sourceTree = "<absolute>"; };
+		16DD53E17C65AC8B450CC6C3 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_quick.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_quick.pri"; sourceTree = "<absolute>"; };
+		1FAE75C970AA73F2DEDDB508 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qavfcamera.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qavfcamera.pri"; sourceTree = "<absolute>"; };
+		23BC8B0FC3279421D41CA268 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_gui.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_gui.pri"; sourceTree = "<absolute>"; };
+		2440CD1D4CEF80443BCA1B8B /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qgenericbearer.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qgenericbearer.pri"; sourceTree = "<absolute>"; };
+		247D8DF3B1DDB665B80BBA25 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qtaccessiblequick.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qtaccessiblequick.pri"; sourceTree = "<absolute>"; };
+		24B6929EE3952310F2DAECB1 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qtaudio_coreaudio.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qtaudio_coreaudio.pri"; sourceTree = "<absolute>"; };
+		28BD0D10214709D95B161E24 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_multimediawidgets.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_multimediawidgets.pri"; sourceTree = "<absolute>"; };
+		293C8DEEE270847AC20E70F9 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_network.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_network.pri"; sourceTree = "<absolute>"; };
+		2E48BB382B895A5ACD79AF9F /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_bluetooth_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_bluetooth_private.pri"; sourceTree = "<absolute>"; };
+		2E6D9B1D2743D24E31B0B284 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_xmlpatterns.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_xmlpatterns.pri"; sourceTree = "<absolute>"; };
+		311004331A04F3D69C98643C /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_serialport_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_serialport_private.pri"; sourceTree = "<absolute>"; };
+		31120EDB269DFF13E1D49847 /* qicns */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = qicns; path = "/usr/local/Qt-5.4.0/plugins/imageformats/libqicns$(QT_LIBRARY_SUFFIX).a"; sourceTree = "<absolute>"; };
+		33F165B1DB8CBF182C56FAB5 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_macextras_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_macextras_private.pri"; sourceTree = "<absolute>"; };
+		346287C9E754E7C458153F03 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qwbmp.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qwbmp.pri"; sourceTree = "<absolute>"; };
+		360D4B3ED25D126430DE27D4 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_enginio.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_enginio.pri"; sourceTree = "<absolute>"; };
+		3685604BDB64DD6E92169B73 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qdeclarativeview.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qdeclarativeview.pri"; sourceTree = "<absolute>"; };
+		382E89A91A34F7898C25FD0D /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_network_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_network_private.pri"; sourceTree = "<absolute>"; };
+		3F08D430CEC8D2117735CCB4 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qmldbg_tcp_qtdeclarative.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qmldbg_tcp_qtdeclarative.pri"; sourceTree = "<absolute>"; };
+		45B95DB3B70B47A910FC847B /* /usr/local/Qt-5.4.0/mkspecs/common/gcc-base.conf */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/common/gcc-base.conf"; sourceTree = "<absolute>"; };
+		45DB132B756499D4DF38430E /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qjp2.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qjp2.pri"; sourceTree = "<absolute>"; };
+		4689C06178B60B84E7F3A3B7 /* Qt5Widgets */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = Qt5Widgets; path = "/usr/local/Qt-5.4.0/lib/libQt5Widgets$(QT_LIBRARY_SUFFIX).a"; sourceTree = "<absolute>"; };
+		4C6C71914B1926119120DACD /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_enginio_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_enginio_private.pri"; sourceTree = "<absolute>"; };
 		4D765E1B1EA6C757220C63E7 /* CoreFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreFoundation.framework; path = /System/Library/Frameworks/CoreFoundation.framework; sourceTree = "<absolute>"; };
-		4FB6657DA22BC68B819B64B3 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_qmldevtools_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_qmldevtools_private.pri"; sourceTree = "<absolute>"; };
+		4FB6657DA22BC68B819B64B3 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_qmldevtools_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_qmldevtools_private.pri"; sourceTree = "<absolute>"; };
 		5520A59148EC5EC44EF0D3CD /* Packer.pro */ = {isa = PBXFileReference; lastKnownFileType = text; path = Packer.pro; sourceTree = "<absolute>"; };
-		5597304BEC94BFB9EAAEBC4B /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_openglextensions_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_openglextensions_private.pri"; sourceTree = "<absolute>"; };
-		5A80A1907B6CFFB524C1E57D /* Qt5Core */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = Qt5Core; path = "/usr/local/Qt-5.3.1/lib/libQt5Core$(QT_LIBRARY_SUFFIX).a"; sourceTree = "<absolute>"; };
+		5597304BEC94BFB9EAAEBC4B /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_openglextensions_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_openglextensions_private.pri"; sourceTree = "<absolute>"; };
+		5A80A1907B6CFFB524C1E57D /* Qt5Core */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = Qt5Core; path = "/usr/local/Qt-5.4.0/lib/libQt5Core$(QT_LIBRARY_SUFFIX).a"; sourceTree = "<absolute>"; };
 		5AA25EFD83BC060B26945285 /* packer.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = packer.h; path = SourceFiles/_other/packer.h; sourceTree = "<absolute>"; };
-		5B22E9E4EE9AAE42ABC24AB3 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_qtmultimediaquicktools_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_qtmultimediaquicktools_private.pri"; sourceTree = "<absolute>"; };
-		5CEA7A2DB2136425A88D1254 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_opengl.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_opengl.pri"; sourceTree = "<absolute>"; };
-		5F781C7FD8422D359EA1D2FE /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_core_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_core_private.pri"; sourceTree = "<absolute>"; };
-		6102C69805B6398AF6FA5BEB /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_qml_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_qml_private.pri"; sourceTree = "<absolute>"; };
-		63E722139886C87BC82DBDF5 /* /usr/local/Qt-5.3.1/mkspecs/macx-clang/qmake.conf */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/macx-clang/qmake.conf"; sourceTree = "<absolute>"; };
-		669FB007C4A3D58424D85EC8 /* /usr/local/Qt-5.3.1/mkspecs/common/shell-unix.conf */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/common/shell-unix.conf"; sourceTree = "<absolute>"; };
-		69347C39E4D922E94D0860BF /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_designercomponents_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_designercomponents_private.pri"; sourceTree = "<absolute>"; };
-		6C08BFC27C4C303A3A5181DB /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_printsupport.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_printsupport.pri"; sourceTree = "<absolute>"; };
-		6E67D23B15FC4B628DB2E0B2 /* /usr/local/Qt-5.3.1/mkspecs/qdevice.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/qdevice.pri"; sourceTree = "<absolute>"; };
-		74C1C232DFAA71028A0412CA /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qtmultimedia_m3u.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qtmultimedia_m3u.pri"; sourceTree = "<absolute>"; };
-		77FF486B1F9BCD55A8A3F35D /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_concurrent.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_concurrent.pri"; sourceTree = "<absolute>"; };
-		7A94C7168B3FCBE5F04A013B /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_declarative.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_declarative.pri"; sourceTree = "<absolute>"; };
-		7C2F42B222EE88E26A6FED62 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_designer_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_designer_private.pri"; sourceTree = "<absolute>"; };
-		7D28E9003CE64D8A7F2E292E /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_concurrent_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_concurrent_private.pri"; sourceTree = "<absolute>"; };
-		7DE30A90667C03C4F91A2A91 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_sql.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_sql.pri"; sourceTree = "<absolute>"; };
-		7ECCC1F9442988B4F2707CC1 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_core.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_core.pri"; sourceTree = "<absolute>"; };
-		817A0F5A41B553A6DE67FDEB /* /usr/local/Qt-5.3.1/mkspecs/common/macx.conf */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/common/macx.conf"; sourceTree = "<absolute>"; };
-		82E7DCFD95559532D8FC6CDD /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_quickparticles_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_quickparticles_private.pri"; sourceTree = "<absolute>"; };
-		83D37373949868693FB7816D /* qmng */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = qmng; path = "/usr/local/Qt-5.3.1/plugins/imageformats/libqmng$(QT_LIBRARY_SUFFIX).a"; sourceTree = "<absolute>"; };
-		85061B1DA49D125991117950 /* /usr/local/Qt-5.3.1/mkspecs/macx-xcode/qmake.conf */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/macx-xcode/qmake.conf"; sourceTree = "<absolute>"; };
-		85B6936EDBE61D9BB8F8B33B /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_sensors.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_sensors.pri"; sourceTree = "<absolute>"; };
-		87A4C1983FD641360BF80A02 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qtaccessiblewidgets.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qtaccessiblewidgets.pri"; sourceTree = "<absolute>"; };
-		87EEF25EE25CF21572D1438C /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_websockets_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_websockets_private.pri"; sourceTree = "<absolute>"; };
-		8849E60AEC7DB97A475C17EA /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_testlib_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_testlib_private.pri"; sourceTree = "<absolute>"; };
-		892D36BEF797BA4AF48D378A /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qtsensors_dummy.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qtsensors_dummy.pri"; sourceTree = "<absolute>"; };
-		89863CCAF1D29037AE95755D /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_declarative_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_declarative_private.pri"; sourceTree = "<absolute>"; };
-		8A04A4A3625204D12A1207F6 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_nfc.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_nfc.pri"; sourceTree = "<absolute>"; };
-		8B4BB4E74F8A4442EF563D7D /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qtsensorgestures_shakeplugin.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qtsensorgestures_shakeplugin.pri"; sourceTree = "<absolute>"; };
-		8C31D89BDFCDF466DAED19A0 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_quick_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_quick_private.pri"; sourceTree = "<absolute>"; };
-		8C5164D4E37556D40C5E6AA2 /* /usr/local/Qt-5.3.1/mkspecs/common/clang.conf */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/common/clang.conf"; sourceTree = "<absolute>"; };
-		8CF51323544B886B8F4A2232 /* qwbmp */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = qwbmp; path = "/usr/local/Qt-5.3.1/plugins/imageformats/libqwbmp$(QT_LIBRARY_SUFFIX).a"; sourceTree = "<absolute>"; };
+		5B22E9E4EE9AAE42ABC24AB3 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_qtmultimediaquicktools_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_qtmultimediaquicktools_private.pri"; sourceTree = "<absolute>"; };
+		5CEA7A2DB2136425A88D1254 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_opengl.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_opengl.pri"; sourceTree = "<absolute>"; };
+		5F781C7FD8422D359EA1D2FE /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_core_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_core_private.pri"; sourceTree = "<absolute>"; };
+		6102C69805B6398AF6FA5BEB /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_qml_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_qml_private.pri"; sourceTree = "<absolute>"; };
+		63E722139886C87BC82DBDF5 /* /usr/local/Qt-5.4.0/mkspecs/macx-clang/qmake.conf */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/macx-clang/qmake.conf"; sourceTree = "<absolute>"; };
+		669FB007C4A3D58424D85EC8 /* /usr/local/Qt-5.4.0/mkspecs/common/shell-unix.conf */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/common/shell-unix.conf"; sourceTree = "<absolute>"; };
+		69347C39E4D922E94D0860BF /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_designercomponents_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_designercomponents_private.pri"; sourceTree = "<absolute>"; };
+		6C08BFC27C4C303A3A5181DB /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_printsupport.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_printsupport.pri"; sourceTree = "<absolute>"; };
+		6E67D23B15FC4B628DB2E0B2 /* /usr/local/Qt-5.4.0/mkspecs/qdevice.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/qdevice.pri"; sourceTree = "<absolute>"; };
+		74C1C232DFAA71028A0412CA /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qtmultimedia_m3u.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qtmultimedia_m3u.pri"; sourceTree = "<absolute>"; };
+		77FF486B1F9BCD55A8A3F35D /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_concurrent.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_concurrent.pri"; sourceTree = "<absolute>"; };
+		7A94C7168B3FCBE5F04A013B /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_declarative.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_declarative.pri"; sourceTree = "<absolute>"; };
+		7C2F42B222EE88E26A6FED62 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_designer_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_designer_private.pri"; sourceTree = "<absolute>"; };
+		7D28E9003CE64D8A7F2E292E /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_concurrent_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_concurrent_private.pri"; sourceTree = "<absolute>"; };
+		7DE30A90667C03C4F91A2A91 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_sql.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_sql.pri"; sourceTree = "<absolute>"; };
+		7ECCC1F9442988B4F2707CC1 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_core.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_core.pri"; sourceTree = "<absolute>"; };
+		817A0F5A41B553A6DE67FDEB /* /usr/local/Qt-5.4.0/mkspecs/common/macx.conf */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/common/macx.conf"; sourceTree = "<absolute>"; };
+		82E7DCFD95559532D8FC6CDD /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_quickparticles_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_quickparticles_private.pri"; sourceTree = "<absolute>"; };
+		83D37373949868693FB7816D /* qmng */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = qmng; path = "/usr/local/Qt-5.4.0/plugins/imageformats/libqmng$(QT_LIBRARY_SUFFIX).a"; sourceTree = "<absolute>"; };
+		85061B1DA49D125991117950 /* /usr/local/Qt-5.4.0/mkspecs/macx-xcode/qmake.conf */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/macx-xcode/qmake.conf"; sourceTree = "<absolute>"; };
+		85B6936EDBE61D9BB8F8B33B /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_sensors.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_sensors.pri"; sourceTree = "<absolute>"; };
+		87A4C1983FD641360BF80A02 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qtaccessiblewidgets.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qtaccessiblewidgets.pri"; sourceTree = "<absolute>"; };
+		87EEF25EE25CF21572D1438C /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_websockets_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_websockets_private.pri"; sourceTree = "<absolute>"; };
+		8849E60AEC7DB97A475C17EA /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_testlib_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_testlib_private.pri"; sourceTree = "<absolute>"; };
+		892D36BEF797BA4AF48D378A /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qtsensors_dummy.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qtsensors_dummy.pri"; sourceTree = "<absolute>"; };
+		89863CCAF1D29037AE95755D /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_declarative_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_declarative_private.pri"; sourceTree = "<absolute>"; };
+		8A04A4A3625204D12A1207F6 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_nfc.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_nfc.pri"; sourceTree = "<absolute>"; };
+		8B4BB4E74F8A4442EF563D7D /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qtsensorgestures_shakeplugin.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qtsensorgestures_shakeplugin.pri"; sourceTree = "<absolute>"; };
+		8C31D89BDFCDF466DAED19A0 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_quick_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_quick_private.pri"; sourceTree = "<absolute>"; };
+		8C5164D4E37556D40C5E6AA2 /* /usr/local/Qt-5.4.0/mkspecs/common/clang.conf */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/common/clang.conf"; sourceTree = "<absolute>"; };
+		8CF51323544B886B8F4A2232 /* qwbmp */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = qwbmp; path = "/usr/local/Qt-5.4.0/plugins/imageformats/libqwbmp$(QT_LIBRARY_SUFFIX).a"; sourceTree = "<absolute>"; };
 		8D9815BDB5BD9F90D2BC05C5 /* AGL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AGL.framework; path = /System/Library/Frameworks/AGL.framework; sourceTree = "<absolute>"; };
-		8DDE1D26B3206CDB8B57FABE /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_svg_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_svg_private.pri"; sourceTree = "<absolute>"; };
-		8E9136256AFFBA6EF048AA55 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_widgets_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_widgets_private.pri"; sourceTree = "<absolute>"; };
-		8F500B5166907B6D9A7C3E3D /* qico */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = qico; path = "/usr/local/Qt-5.3.1/plugins/imageformats/libqico$(QT_LIBRARY_SUFFIX).a"; sourceTree = "<absolute>"; };
-		8F572030CE9AB8CC5F672201 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_platformsupport_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_platformsupport_private.pri"; sourceTree = "<absolute>"; };
-		8F97C9CAE38CA3AFAC0B3953 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_websockets.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_websockets.pri"; sourceTree = "<absolute>"; };
-		946BEA667170DC1A7A8F9DB0 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qmng.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qmng.pri"; sourceTree = "<absolute>"; };
+		8DDE1D26B3206CDB8B57FABE /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_svg_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_svg_private.pri"; sourceTree = "<absolute>"; };
+		8E9136256AFFBA6EF048AA55 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_widgets_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_widgets_private.pri"; sourceTree = "<absolute>"; };
+		8F500B5166907B6D9A7C3E3D /* qico */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = qico; path = "/usr/local/Qt-5.4.0/plugins/imageformats/libqico$(QT_LIBRARY_SUFFIX).a"; sourceTree = "<absolute>"; };
+		8F572030CE9AB8CC5F672201 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_platformsupport_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_platformsupport_private.pri"; sourceTree = "<absolute>"; };
+		8F97C9CAE38CA3AFAC0B3953 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_websockets.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_websockets.pri"; sourceTree = "<absolute>"; };
+		946BEA667170DC1A7A8F9DB0 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qmng.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qmng.pri"; sourceTree = "<absolute>"; };
 		9742F24EE18EA44D52824F1E /* CoreServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreServices.framework; path = /System/Library/Frameworks/CoreServices.framework; sourceTree = "<absolute>"; };
-		9A0BDF67E013BB4FFB8685B0 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qqt7engine.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qqt7engine.pri"; sourceTree = "<absolute>"; };
+		9A0BDF67E013BB4FFB8685B0 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qqt7engine.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qqt7engine.pri"; sourceTree = "<absolute>"; };
 		9DFF62A901D70814B8A323D4 /* Carbon.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Carbon.framework; path = /System/Library/Frameworks/Carbon.framework; sourceTree = "<absolute>"; };
-		A022AF919D1977534CA66BB8 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_widgets.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_widgets.pri"; sourceTree = "<absolute>"; };
+		A022AF919D1977534CA66BB8 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_widgets.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_widgets.pri"; sourceTree = "<absolute>"; };
 		A1A67BEAA744704B29168D39 /* IOKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = IOKit.framework; path = /System/Library/Frameworks/IOKit.framework; sourceTree = "<absolute>"; };
-		A4D8AC60897F435C1C3B9D02 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qtsensors_generic.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qtsensors_generic.pri"; sourceTree = "<absolute>"; };
+		A4D8AC60897F435C1C3B9D02 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qtsensors_generic.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qtsensors_generic.pri"; sourceTree = "<absolute>"; };
 		A5588D4B50885E2A9CAA5505 /* Packer.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Packer.app; sourceTree = BUILT_PRODUCTS_DIR; };
-		A59F74CD76FDC2B4B9910E18 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_scripttools_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_scripttools_private.pri"; sourceTree = "<absolute>"; };
-		A5B17ABEFBA1C2F43443D644 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_macextras.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_macextras.pri"; sourceTree = "<absolute>"; };
-		A9E30FA27827990C5F182223 /* /usr/local/Qt-5.3.1/mkspecs/common/gcc-base-mac.conf */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/common/gcc-base-mac.conf"; sourceTree = "<absolute>"; };
-		AA73DC3C2901E2979FE8AD5B /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_xml.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_xml.pri"; sourceTree = "<absolute>"; };
-		AB1C02DDBD8E88DD9A9AFDDD /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qtsensorgestures_plugin.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qtsensorgestures_plugin.pri"; sourceTree = "<absolute>"; };
+		A59F74CD76FDC2B4B9910E18 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_scripttools_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_scripttools_private.pri"; sourceTree = "<absolute>"; };
+		A5B17ABEFBA1C2F43443D644 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_macextras.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_macextras.pri"; sourceTree = "<absolute>"; };
+		A9E30FA27827990C5F182223 /* /usr/local/Qt-5.4.0/mkspecs/common/gcc-base-mac.conf */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/common/gcc-base-mac.conf"; sourceTree = "<absolute>"; };
+		AA73DC3C2901E2979FE8AD5B /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_xml.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_xml.pri"; sourceTree = "<absolute>"; };
+		AB1C02DDBD8E88DD9A9AFDDD /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qtsensorgestures_plugin.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qtsensorgestures_plugin.pri"; sourceTree = "<absolute>"; };
 		AB745978DF0F41D1801ABDA6 /* .qmake.stash */ = {isa = PBXFileReference; lastKnownFileType = file; path = .qmake.stash; sourceTree = "<absolute>"; };
-		ABA9AB4619F09DCFD2D4A27F /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_qmltest_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_qmltest_private.pri"; sourceTree = "<absolute>"; };
-		ACC8A73268E5D9AF64E97AF4 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_bluetooth.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_bluetooth.pri"; sourceTree = "<absolute>"; };
-		ADC6308023253CEA51F86E21 /* qwebp */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = qwebp; path = "/usr/local/Qt-5.3.1/plugins/imageformats/libqwebp$(QT_LIBRARY_SUFFIX).a"; sourceTree = "<absolute>"; };
-		ADFC79902C14A612AE93A89A /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_svg.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_svg.pri"; sourceTree = "<absolute>"; };
+		ABA9AB4619F09DCFD2D4A27F /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_qmltest_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_qmltest_private.pri"; sourceTree = "<absolute>"; };
+		ACC8A73268E5D9AF64E97AF4 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_bluetooth.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_bluetooth.pri"; sourceTree = "<absolute>"; };
+		ADC6308023253CEA51F86E21 /* qwebp */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = qwebp; path = "/usr/local/Qt-5.4.0/plugins/imageformats/libqwebp$(QT_LIBRARY_SUFFIX).a"; sourceTree = "<absolute>"; };
+		ADFC79902C14A612AE93A89A /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_svg.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_svg.pri"; sourceTree = "<absolute>"; };
 		AEA456A2F75ED9F5CDA7BCBE /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = /System/Library/Frameworks/Cocoa.framework; sourceTree = "<absolute>"; };
-		AFD721AA33A2F785E77B1698 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qcocoa.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qcocoa.pri"; sourceTree = "<absolute>"; };
-		B064BF3B496A7BF7A449CA1E /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qsqlite.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qsqlite.pri"; sourceTree = "<absolute>"; };
-		B2246267D4C0D789259A86B0 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_quickwidgets_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_quickwidgets_private.pri"; sourceTree = "<absolute>"; };
-		B26239063A068F800A2C95F4 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qwebp.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qwebp.pri"; sourceTree = "<absolute>"; };
-		B382B645B34234E451AE5D94 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_qml.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_qml.pri"; sourceTree = "<absolute>"; };
-		B518DA4EE7376002AFC71FD5 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_uitools_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_uitools_private.pri"; sourceTree = "<absolute>"; };
-		B51B01657BFE9EAEF5590561 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_nfc_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_nfc_private.pri"; sourceTree = "<absolute>"; };
-		B678DA730B4ECE863AD631AE /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qminimal.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qminimal.pri"; sourceTree = "<absolute>"; };
-		B8525798C5AA7D7C6D68E1B3 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qmldbg_qtquick2.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qmldbg_qtquick2.pri"; sourceTree = "<absolute>"; };
-		B8C1F6C965A7A14FBA8D4518 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qtmedia_audioengine.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qtmedia_audioengine.pri"; sourceTree = "<absolute>"; };
-		BD22EFEFCC02644B1883CE19 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qtiff.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qtiff.pri"; sourceTree = "<absolute>"; };
-		BD4D97801B547471B37A4CDC /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_bootstrap_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_bootstrap_private.pri"; sourceTree = "<absolute>"; };
-		BDC9ECADEE40D11E3C2EA93F /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_sensors_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_sensors_private.pri"; sourceTree = "<absolute>"; };
-		BFF0C38FB0EC140C5F0304AE /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_serialport.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_serialport.pri"; sourceTree = "<absolute>"; };
-		C4295BE59CCEBCDD16268349 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qico.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qico.pri"; sourceTree = "<absolute>"; };
-		C505A18319B9B63C63877858 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_script_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_script_private.pri"; sourceTree = "<absolute>"; };
-		C84546C18DCBB04166195DCF /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qtposition_positionpoll.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qtposition_positionpoll.pri"; sourceTree = "<absolute>"; };
-		CCF75CFFB857487FB18F99F9 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qoffscreen.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qoffscreen.pri"; sourceTree = "<absolute>"; };
-		CE829DD126DD2B97E8D70A7A /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_scripttools.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_scripttools.pri"; sourceTree = "<absolute>"; };
-		CF86CD5BB01B9011E6B6FD3E /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_clucene_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_clucene_private.pri"; sourceTree = "<absolute>"; };
-		CFCB992BEC24B71BFB8A2F30 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_script.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_script.pri"; sourceTree = "<absolute>"; };
-		CFFBE05DB004895080314289 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qsvgicon.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qsvgicon.pri"; sourceTree = "<absolute>"; };
-		D0CDC87DAFDA7F18A7AF450F /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_printsupport_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_printsupport_private.pri"; sourceTree = "<absolute>"; };
-		D1FA7CAB5ACC09D563AE569F /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_multimediawidgets_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_multimediawidgets_private.pri"; sourceTree = "<absolute>"; };
-		D2FE4D909926A0D1656068C4 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_multimedia.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_multimedia.pri"; sourceTree = "<absolute>"; };
-		D3D1BE0BEA3AEE0551AD39AC /* qdds */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = qdds; path = "/usr/local/Qt-5.3.1/plugins/imageformats/libqdds$(QT_LIBRARY_SUFFIX).a"; sourceTree = "<absolute>"; };
+		AFD721AA33A2F785E77B1698 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qcocoa.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qcocoa.pri"; sourceTree = "<absolute>"; };
+		B064BF3B496A7BF7A449CA1E /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qsqlite.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qsqlite.pri"; sourceTree = "<absolute>"; };
+		B2246267D4C0D789259A86B0 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_quickwidgets_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_quickwidgets_private.pri"; sourceTree = "<absolute>"; };
+		B26239063A068F800A2C95F4 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qwebp.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qwebp.pri"; sourceTree = "<absolute>"; };
+		B382B645B34234E451AE5D94 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_qml.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_qml.pri"; sourceTree = "<absolute>"; };
+		B518DA4EE7376002AFC71FD5 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_uitools_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_uitools_private.pri"; sourceTree = "<absolute>"; };
+		B51B01657BFE9EAEF5590561 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_nfc_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_nfc_private.pri"; sourceTree = "<absolute>"; };
+		B678DA730B4ECE863AD631AE /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qminimal.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qminimal.pri"; sourceTree = "<absolute>"; };
+		B8525798C5AA7D7C6D68E1B3 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qmldbg_qtquick2.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qmldbg_qtquick2.pri"; sourceTree = "<absolute>"; };
+		B8C1F6C965A7A14FBA8D4518 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qtmedia_audioengine.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qtmedia_audioengine.pri"; sourceTree = "<absolute>"; };
+		BD22EFEFCC02644B1883CE19 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qtiff.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qtiff.pri"; sourceTree = "<absolute>"; };
+		BD4D97801B547471B37A4CDC /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_bootstrap_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_bootstrap_private.pri"; sourceTree = "<absolute>"; };
+		BDC9ECADEE40D11E3C2EA93F /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_sensors_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_sensors_private.pri"; sourceTree = "<absolute>"; };
+		BFF0C38FB0EC140C5F0304AE /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_serialport.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_serialport.pri"; sourceTree = "<absolute>"; };
+		C4295BE59CCEBCDD16268349 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qico.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qico.pri"; sourceTree = "<absolute>"; };
+		C505A18319B9B63C63877858 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_script_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_script_private.pri"; sourceTree = "<absolute>"; };
+		C84546C18DCBB04166195DCF /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qtposition_positionpoll.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qtposition_positionpoll.pri"; sourceTree = "<absolute>"; };
+		CCF75CFFB857487FB18F99F9 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qoffscreen.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qoffscreen.pri"; sourceTree = "<absolute>"; };
+		CE829DD126DD2B97E8D70A7A /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_scripttools.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_scripttools.pri"; sourceTree = "<absolute>"; };
+		CF86CD5BB01B9011E6B6FD3E /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_clucene_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_clucene_private.pri"; sourceTree = "<absolute>"; };
+		CFCB992BEC24B71BFB8A2F30 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_script.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_script.pri"; sourceTree = "<absolute>"; };
+		CFFBE05DB004895080314289 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qsvgicon.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qsvgicon.pri"; sourceTree = "<absolute>"; };
+		D0CDC87DAFDA7F18A7AF450F /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_printsupport_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_printsupport_private.pri"; sourceTree = "<absolute>"; };
+		D1FA7CAB5ACC09D563AE569F /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_multimediawidgets_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_multimediawidgets_private.pri"; sourceTree = "<absolute>"; };
+		D2FE4D909926A0D1656068C4 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_multimedia.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_multimedia.pri"; sourceTree = "<absolute>"; };
+		D3D1BE0BEA3AEE0551AD39AC /* qdds */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = qdds; path = "/usr/local/Qt-5.4.0/plugins/imageformats/libqdds$(QT_LIBRARY_SUFFIX).a"; sourceTree = "<absolute>"; };
 		D4B32C2222F82AC56BADEB21 /* OpenGL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGL.framework; path = /System/Library/Frameworks/OpenGL.framework; sourceTree = "<absolute>"; };
-		D4DE537C1FBBD48BD989FAD1 /* /usr/local/Qt-5.3.1/mkspecs/qconfig.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/qconfig.pri"; sourceTree = "<absolute>"; };
-		D5141F795670589C8CC41CBC /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_cocoaprintersupport.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_cocoaprintersupport.pri"; sourceTree = "<absolute>"; };
-		D53D8E6A188E05078A114294 /* qcocoa */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = qcocoa; path = "/usr/local/Qt-5.3.1/plugins/platforms/libqcocoa$(QT_LIBRARY_SUFFIX).a"; sourceTree = "<absolute>"; };
-		D6193B79CECC9DD0142D1200 /* qtharfbuzzng */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = qtharfbuzzng; path = "/usr/local/Qt-5.3.1/lib/libqtharfbuzzng$(QT_LIBRARY_SUFFIX).a"; sourceTree = "<absolute>"; };
-		D7A0618DE39A427EBF41940E /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_help_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_help_private.pri"; sourceTree = "<absolute>"; };
-		D81E3D9A18202BE8EC3D0E2C /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_gui_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_gui_private.pri"; sourceTree = "<absolute>"; };
-		D948D4D8F949D45158F8DE35 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_quickwidgets.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_quickwidgets.pri"; sourceTree = "<absolute>"; };
-		DB0A26DDC377B2004F61BFE3 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_testlib.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_testlib.pri"; sourceTree = "<absolute>"; };
-		DBF506D10449BFABD45B82DA /* Qt5PrintSupport */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = Qt5PrintSupport; path = "/usr/local/Qt-5.3.1/lib/libQt5PrintSupport$(QT_LIBRARY_SUFFIX).a"; sourceTree = "<absolute>"; };
-		DCEFD9167C239650120B0145 /* qtga */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = qtga; path = "/usr/local/Qt-5.3.1/plugins/imageformats/libqtga$(QT_LIBRARY_SUFFIX).a"; sourceTree = "<absolute>"; };
-		DF8188E30892A4654B984221 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_qmltest.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_qmltest.pri"; sourceTree = "<absolute>"; };
+		D4DE537C1FBBD48BD989FAD1 /* /usr/local/Qt-5.4.0/mkspecs/qconfig.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/qconfig.pri"; sourceTree = "<absolute>"; };
+		D5141F795670589C8CC41CBC /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_cocoaprintersupport.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_cocoaprintersupport.pri"; sourceTree = "<absolute>"; };
+		D53D8E6A188E05078A114294 /* qcocoa */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = qcocoa; path = "/usr/local/Qt-5.4.0/plugins/platforms/libqcocoa$(QT_LIBRARY_SUFFIX).a"; sourceTree = "<absolute>"; };
+		D6193B79CECC9DD0142D1200 /* qtharfbuzzng */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = qtharfbuzzng; path = "/usr/local/Qt-5.4.0/lib/libqtharfbuzzng$(QT_LIBRARY_SUFFIX).a"; sourceTree = "<absolute>"; };
+		D7A0618DE39A427EBF41940E /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_help_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_help_private.pri"; sourceTree = "<absolute>"; };
+		D81E3D9A18202BE8EC3D0E2C /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_gui_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_gui_private.pri"; sourceTree = "<absolute>"; };
+		D948D4D8F949D45158F8DE35 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_quickwidgets.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_quickwidgets.pri"; sourceTree = "<absolute>"; };
+		DB0A26DDC377B2004F61BFE3 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_testlib.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_testlib.pri"; sourceTree = "<absolute>"; };
+		DBF506D10449BFABD45B82DA /* Qt5PrintSupport */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = Qt5PrintSupport; path = "/usr/local/Qt-5.4.0/lib/libQt5PrintSupport$(QT_LIBRARY_SUFFIX).a"; sourceTree = "<absolute>"; };
+		DCEFD9167C239650120B0145 /* qtga */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = qtga; path = "/usr/local/Qt-5.4.0/plugins/imageformats/libqtga$(QT_LIBRARY_SUFFIX).a"; sourceTree = "<absolute>"; };
+		DF8188E30892A4654B984221 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_qmltest.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_qmltest.pri"; sourceTree = "<absolute>"; };
 		DFD7912080BC557230093752 /* ApplicationServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ApplicationServices.framework; path = /System/Library/Frameworks/ApplicationServices.framework; sourceTree = "<absolute>"; };
-		E0F4563EA350EB65112A0EF4 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_opengl_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_opengl_private.pri"; sourceTree = "<absolute>"; };
-		E37365B4489B4918BEBB707D /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_xml_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_xml_private.pri"; sourceTree = "<absolute>"; };
+		E0F4563EA350EB65112A0EF4 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_opengl_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_opengl_private.pri"; sourceTree = "<absolute>"; };
+		E37365B4489B4918BEBB707D /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_xml_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_xml_private.pri"; sourceTree = "<absolute>"; };
 		E3790AE49DBDB3F5EFA42FE1 /* packer.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = packer.cpp; path = SourceFiles/_other/packer.cpp; sourceTree = "<absolute>"; };
-		E432DA897A5F027987342E8F /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_openglextensions.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_openglextensions.pri"; sourceTree = "<absolute>"; };
-		E50FA73B8A23BC179A642B27 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_uitools.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_uitools.pri"; sourceTree = "<absolute>"; };
-		E66B9EC81C285CA9A7FB6A2E /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_positioning_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_positioning_private.pri"; sourceTree = "<absolute>"; };
-		E7B2F248E3F7970788F35BF5 /* Qt5PlatformSupport */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = Qt5PlatformSupport; path = "/usr/local/Qt-5.3.1/lib/libQt5PlatformSupport$(QT_LIBRARY_SUFFIX).a"; sourceTree = "<absolute>"; };
-		E7D67CB158408BB7DEA74764 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_multimedia_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_multimedia_private.pri"; sourceTree = "<absolute>"; };
-		EA5D4FF9DE4AC4215D7DCE0D /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qcorewlanbearer.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qcorewlanbearer.pri"; sourceTree = "<absolute>"; };
-		EB1F99FD112917157F3C3F6E /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qicns.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qicns.pri"; sourceTree = "<absolute>"; };
-		EB29AC635054C09EFA749AE1 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qmldbg_tcp.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qmldbg_tcp.pri"; sourceTree = "<absolute>"; };
-		EBD39B69F368CEEAC360A16D /* /usr/local/Qt-5.3.1/mkspecs/common/mac.conf */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/common/mac.conf"; sourceTree = "<absolute>"; };
-		F0681BC551FC8A2B132FC646 /* qjp2 */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = qjp2; path = "/usr/local/Qt-5.3.1/plugins/imageformats/libqjp2$(QT_LIBRARY_SUFFIX).a"; sourceTree = "<absolute>"; };
-		F0A58515945747E36783CC21 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qmldbg_inspector.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qmldbg_inspector.pri"; sourceTree = "<absolute>"; };
-		F2453BA07315EB9F34F1CD57 /* qtiff */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = qtiff; path = "/usr/local/Qt-5.3.1/plugins/imageformats/libqtiff$(QT_LIBRARY_SUFFIX).a"; sourceTree = "<absolute>"; };
-		F2F823087EA182CCBD5748B8 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_designer.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_designer.pri"; sourceTree = "<absolute>"; };
-		F33BE16353DD1557A9AB3558 /* /usr/local/Qt-5.3.1/mkspecs/common/clang-mac.conf */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/common/clang-mac.conf"; sourceTree = "<absolute>"; };
-		F4EB01857048DCFCFFAAC4D0 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qavfmediaplayer.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qavfmediaplayer.pri"; sourceTree = "<absolute>"; };
-		F7ADBF552F6B9A5982915164 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_positioning.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_positioning.pri"; sourceTree = "<absolute>"; };
-		F83F87F8A60C9DF666911D42 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qsvg.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qsvg.pri"; sourceTree = "<absolute>"; };
-		F9BEAA743A908603687DA204 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_xmlpatterns_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_xmlpatterns_private.pri"; sourceTree = "<absolute>"; };
+		E432DA897A5F027987342E8F /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_openglextensions.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_openglextensions.pri"; sourceTree = "<absolute>"; };
+		E50FA73B8A23BC179A642B27 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_uitools.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_uitools.pri"; sourceTree = "<absolute>"; };
+		E66B9EC81C285CA9A7FB6A2E /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_positioning_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_positioning_private.pri"; sourceTree = "<absolute>"; };
+		E7B2F248E3F7970788F35BF5 /* Qt5PlatformSupport */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = Qt5PlatformSupport; path = "/usr/local/Qt-5.4.0/lib/libQt5PlatformSupport$(QT_LIBRARY_SUFFIX).a"; sourceTree = "<absolute>"; };
+		E7D67CB158408BB7DEA74764 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_multimedia_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_multimedia_private.pri"; sourceTree = "<absolute>"; };
+		EA5D4FF9DE4AC4215D7DCE0D /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qcorewlanbearer.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qcorewlanbearer.pri"; sourceTree = "<absolute>"; };
+		EB1F99FD112917157F3C3F6E /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qicns.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qicns.pri"; sourceTree = "<absolute>"; };
+		EB29AC635054C09EFA749AE1 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qmldbg_tcp.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qmldbg_tcp.pri"; sourceTree = "<absolute>"; };
+		EBD39B69F368CEEAC360A16D /* /usr/local/Qt-5.4.0/mkspecs/common/mac.conf */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/common/mac.conf"; sourceTree = "<absolute>"; };
+		F0681BC551FC8A2B132FC646 /* qjp2 */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = qjp2; path = "/usr/local/Qt-5.4.0/plugins/imageformats/libqjp2$(QT_LIBRARY_SUFFIX).a"; sourceTree = "<absolute>"; };
+		F0A58515945747E36783CC21 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qmldbg_inspector.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qmldbg_inspector.pri"; sourceTree = "<absolute>"; };
+		F2453BA07315EB9F34F1CD57 /* qtiff */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = qtiff; path = "/usr/local/Qt-5.4.0/plugins/imageformats/libqtiff$(QT_LIBRARY_SUFFIX).a"; sourceTree = "<absolute>"; };
+		F2F823087EA182CCBD5748B8 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_designer.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_designer.pri"; sourceTree = "<absolute>"; };
+		F33BE16353DD1557A9AB3558 /* /usr/local/Qt-5.4.0/mkspecs/common/clang-mac.conf */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/common/clang-mac.conf"; sourceTree = "<absolute>"; };
+		F4EB01857048DCFCFFAAC4D0 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qavfmediaplayer.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qavfmediaplayer.pri"; sourceTree = "<absolute>"; };
+		F7ADBF552F6B9A5982915164 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_positioning.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_positioning.pri"; sourceTree = "<absolute>"; };
+		F83F87F8A60C9DF666911D42 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qsvg.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qsvg.pri"; sourceTree = "<absolute>"; };
+		F9BEAA743A908603687DA204 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_xmlpatterns_private.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_xmlpatterns_private.pri"; sourceTree = "<absolute>"; };
 		FCC237CA5AD60B9BA4447615 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = /System/Library/Frameworks/Foundation.framework; sourceTree = "<absolute>"; };
-		FD944B80F033DFE737D401A2 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_help.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_help.pri"; sourceTree = "<absolute>"; };
+		FD944B80F033DFE737D401A2 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_help.pri */ = {isa = PBXFileReference; lastKnownFileType = text; path = "/usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_help.pri"; sourceTree = "<absolute>"; };
 /* End PBXFileReference section */

 /* Begin PBXFrameworksBuildPhase section */
@@ -279,127 +279,127 @@
 			isa = PBXGroup;
 			children = (
 				5520A59148EC5EC44EF0D3CD /* Packer.pro */,
-				6E67D23B15FC4B628DB2E0B2 /* /usr/local/Qt-5.3.1/mkspecs/qdevice.pri */,
-				669FB007C4A3D58424D85EC8 /* /usr/local/Qt-5.3.1/mkspecs/common/shell-unix.conf */,
-				0ABCEA8D0DD45589040B0AF2 /* /usr/local/Qt-5.3.1/mkspecs/common/unix.conf */,
-				EBD39B69F368CEEAC360A16D /* /usr/local/Qt-5.3.1/mkspecs/common/mac.conf */,
-				817A0F5A41B553A6DE67FDEB /* /usr/local/Qt-5.3.1/mkspecs/common/macx.conf */,
-				45B95DB3B70B47A910FC847B /* /usr/local/Qt-5.3.1/mkspecs/common/gcc-base.conf */,
-				A9E30FA27827990C5F182223 /* /usr/local/Qt-5.3.1/mkspecs/common/gcc-base-mac.conf */,
-				8C5164D4E37556D40C5E6AA2 /* /usr/local/Qt-5.3.1/mkspecs/common/clang.conf */,
-				F33BE16353DD1557A9AB3558 /* /usr/local/Qt-5.3.1/mkspecs/common/clang-mac.conf */,
-				D4DE537C1FBBD48BD989FAD1 /* /usr/local/Qt-5.3.1/mkspecs/qconfig.pri */,
-				ACC8A73268E5D9AF64E97AF4 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_bluetooth.pri */,
-				2E48BB382B895A5ACD79AF9F /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_bluetooth_private.pri */,
-				BD4D97801B547471B37A4CDC /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_bootstrap_private.pri */,
-				CF86CD5BB01B9011E6B6FD3E /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_clucene_private.pri */,
-				77FF486B1F9BCD55A8A3F35D /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_concurrent.pri */,
-				7D28E9003CE64D8A7F2E292E /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_concurrent_private.pri */,
-				7ECCC1F9442988B4F2707CC1 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_core.pri */,
-				5F781C7FD8422D359EA1D2FE /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_core_private.pri */,
-				7A94C7168B3FCBE5F04A013B /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_declarative.pri */,
-				89863CCAF1D29037AE95755D /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_declarative_private.pri */,
-				F2F823087EA182CCBD5748B8 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_designer.pri */,
-				7C2F42B222EE88E26A6FED62 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_designer_private.pri */,
-				69347C39E4D922E94D0860BF /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_designercomponents_private.pri */,
-				360D4B3ED25D126430DE27D4 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_enginio.pri */,
-				4C6C71914B1926119120DACD /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_enginio_private.pri */,
-				23BC8B0FC3279421D41CA268 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_gui.pri */,
-				D81E3D9A18202BE8EC3D0E2C /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_gui_private.pri */,
-				FD944B80F033DFE737D401A2 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_help.pri */,
-				D7A0618DE39A427EBF41940E /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_help_private.pri */,
-				A5B17ABEFBA1C2F43443D644 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_macextras.pri */,
-				33F165B1DB8CBF182C56FAB5 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_macextras_private.pri */,
-				D2FE4D909926A0D1656068C4 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_multimedia.pri */,
-				E7D67CB158408BB7DEA74764 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_multimedia_private.pri */,
-				28BD0D10214709D95B161E24 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_multimediawidgets.pri */,
-				D1FA7CAB5ACC09D563AE569F /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_multimediawidgets_private.pri */,
-				293C8DEEE270847AC20E70F9 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_network.pri */,
-				382E89A91A34F7898C25FD0D /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_network_private.pri */,
-				8A04A4A3625204D12A1207F6 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_nfc.pri */,
-				B51B01657BFE9EAEF5590561 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_nfc_private.pri */,
-				5CEA7A2DB2136425A88D1254 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_opengl.pri */,
-				E0F4563EA350EB65112A0EF4 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_opengl_private.pri */,
-				E432DA897A5F027987342E8F /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_openglextensions.pri */,
-				5597304BEC94BFB9EAAEBC4B /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_openglextensions_private.pri */,
-				8F572030CE9AB8CC5F672201 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_platformsupport_private.pri */,
-				F7ADBF552F6B9A5982915164 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_positioning.pri */,
-				E66B9EC81C285CA9A7FB6A2E /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_positioning_private.pri */,
-				6C08BFC27C4C303A3A5181DB /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_printsupport.pri */,
-				D0CDC87DAFDA7F18A7AF450F /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_printsupport_private.pri */,
-				B382B645B34234E451AE5D94 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_qml.pri */,
-				6102C69805B6398AF6FA5BEB /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_qml_private.pri */,
-				4FB6657DA22BC68B819B64B3 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_qmldevtools_private.pri */,
-				DF8188E30892A4654B984221 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_qmltest.pri */,
-				ABA9AB4619F09DCFD2D4A27F /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_qmltest_private.pri */,
-				5B22E9E4EE9AAE42ABC24AB3 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_qtmultimediaquicktools_private.pri */,
-				16DD53E17C65AC8B450CC6C3 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_quick.pri */,
-				8C31D89BDFCDF466DAED19A0 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_quick_private.pri */,
-				82E7DCFD95559532D8FC6CDD /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_quickparticles_private.pri */,
-				D948D4D8F949D45158F8DE35 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_quickwidgets.pri */,
-				B2246267D4C0D789259A86B0 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_quickwidgets_private.pri */,
-				CFCB992BEC24B71BFB8A2F30 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_script.pri */,
-				C505A18319B9B63C63877858 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_script_private.pri */,
-				CE829DD126DD2B97E8D70A7A /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_scripttools.pri */,
-				A59F74CD76FDC2B4B9910E18 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_scripttools_private.pri */,
-				85B6936EDBE61D9BB8F8B33B /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_sensors.pri */,
-				BDC9ECADEE40D11E3C2EA93F /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_sensors_private.pri */,
-				BFF0C38FB0EC140C5F0304AE /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_serialport.pri */,
-				311004331A04F3D69C98643C /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_serialport_private.pri */,
-				7DE30A90667C03C4F91A2A91 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_sql.pri */,
-				075EB50EB07CF69FD62FB8DF /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_sql_private.pri */,
-				ADFC79902C14A612AE93A89A /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_svg.pri */,
-				8DDE1D26B3206CDB8B57FABE /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_svg_private.pri */,
-				DB0A26DDC377B2004F61BFE3 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_testlib.pri */,
-				8849E60AEC7DB97A475C17EA /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_testlib_private.pri */,
-				E50FA73B8A23BC179A642B27 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_uitools.pri */,
-				B518DA4EE7376002AFC71FD5 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_uitools_private.pri */,
-				8F97C9CAE38CA3AFAC0B3953 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_websockets.pri */,
-				87EEF25EE25CF21572D1438C /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_websockets_private.pri */,
-				A022AF919D1977534CA66BB8 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_widgets.pri */,
-				8E9136256AFFBA6EF048AA55 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_widgets_private.pri */,
-				AA73DC3C2901E2979FE8AD5B /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_xml.pri */,
-				E37365B4489B4918BEBB707D /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_xml_private.pri */,
-				2E6D9B1D2743D24E31B0B284 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_xmlpatterns.pri */,
-				F9BEAA743A908603687DA204 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_lib_xmlpatterns_private.pri */,
-				D5141F795670589C8CC41CBC /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_cocoaprintersupport.pri */,
-				1FAE75C970AA73F2DEDDB508 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qavfcamera.pri */,
-				F4EB01857048DCFCFFAAC4D0 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qavfmediaplayer.pri */,
-				AFD721AA33A2F785E77B1698 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qcocoa.pri */,
-				EA5D4FF9DE4AC4215D7DCE0D /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qcorewlanbearer.pri */,
-				111BBEE3D1432C3B517FD539 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qdds.pri */,
-				3685604BDB64DD6E92169B73 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qdeclarativeview.pri */,
-				2440CD1D4CEF80443BCA1B8B /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qgenericbearer.pri */,
-				EB1F99FD112917157F3C3F6E /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qicns.pri */,
-				C4295BE59CCEBCDD16268349 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qico.pri */,
-				45DB132B756499D4DF38430E /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qjp2.pri */,
-				B678DA730B4ECE863AD631AE /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qminimal.pri */,
-				F0A58515945747E36783CC21 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qmldbg_inspector.pri */,
-				B8525798C5AA7D7C6D68E1B3 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qmldbg_qtquick2.pri */,
-				EB29AC635054C09EFA749AE1 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qmldbg_tcp.pri */,
-				3F08D430CEC8D2117735CCB4 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qmldbg_tcp_qtdeclarative.pri */,
-				946BEA667170DC1A7A8F9DB0 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qmng.pri */,
-				CCF75CFFB857487FB18F99F9 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qoffscreen.pri */,
-				9A0BDF67E013BB4FFB8685B0 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qqt7engine.pri */,
-				B064BF3B496A7BF7A449CA1E /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qsqlite.pri */,
-				F83F87F8A60C9DF666911D42 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qsvg.pri */,
-				CFFBE05DB004895080314289 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qsvgicon.pri */,
-				247D8DF3B1DDB665B80BBA25 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qtaccessiblequick.pri */,
-				87A4C1983FD641360BF80A02 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qtaccessiblewidgets.pri */,
-				24B6929EE3952310F2DAECB1 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qtaudio_coreaudio.pri */,
-				060A694B42A4555240009936 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qtga.pri */,
-				BD22EFEFCC02644B1883CE19 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qtiff.pri */,
-				B8C1F6C965A7A14FBA8D4518 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qtmedia_audioengine.pri */,
-				74C1C232DFAA71028A0412CA /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qtmultimedia_m3u.pri */,
-				C84546C18DCBB04166195DCF /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qtposition_positionpoll.pri */,
-				AB1C02DDBD8E88DD9A9AFDDD /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qtsensorgestures_plugin.pri */,
-				8B4BB4E74F8A4442EF563D7D /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qtsensorgestures_shakeplugin.pri */,
-				892D36BEF797BA4AF48D378A /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qtsensors_dummy.pri */,
-				A4D8AC60897F435C1C3B9D02 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qtsensors_generic.pri */,
-				346287C9E754E7C458153F03 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qwbmp.pri */,
-				B26239063A068F800A2C95F4 /* /usr/local/Qt-5.3.1/mkspecs/modules/qt_plugin_qwebp.pri */,
-				63E722139886C87BC82DBDF5 /* /usr/local/Qt-5.3.1/mkspecs/macx-clang/qmake.conf */,
-				85061B1DA49D125991117950 /* /usr/local/Qt-5.3.1/mkspecs/macx-xcode/qmake.conf */,
+				6E67D23B15FC4B628DB2E0B2 /* /usr/local/Qt-5.4.0/mkspecs/qdevice.pri */,
+				669FB007C4A3D58424D85EC8 /* /usr/local/Qt-5.4.0/mkspecs/common/shell-unix.conf */,
+				0ABCEA8D0DD45589040B0AF2 /* /usr/local/Qt-5.4.0/mkspecs/common/unix.conf */,
+				EBD39B69F368CEEAC360A16D /* /usr/local/Qt-5.4.0/mkspecs/common/mac.conf */,
+				817A0F5A41B553A6DE67FDEB /* /usr/local/Qt-5.4.0/mkspecs/common/macx.conf */,
+				45B95DB3B70B47A910FC847B /* /usr/local/Qt-5.4.0/mkspecs/common/gcc-base.conf */,
+				A9E30FA27827990C5F182223 /* /usr/local/Qt-5.4.0/mkspecs/common/gcc-base-mac.conf */,
+				8C5164D4E37556D40C5E6AA2 /* /usr/local/Qt-5.4.0/mkspecs/common/clang.conf */,
+				F33BE16353DD1557A9AB3558 /* /usr/local/Qt-5.4.0/mkspecs/common/clang-mac.conf */,
+				D4DE537C1FBBD48BD989FAD1 /* /usr/local/Qt-5.4.0/mkspecs/qconfig.pri */,
+				ACC8A73268E5D9AF64E97AF4 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_bluetooth.pri */,
+				2E48BB382B895A5ACD79AF9F /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_bluetooth_private.pri */,
+				BD4D97801B547471B37A4CDC /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_bootstrap_private.pri */,
+				CF86CD5BB01B9011E6B6FD3E /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_clucene_private.pri */,
+				77FF486B1F9BCD55A8A3F35D /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_concurrent.pri */,
+				7D28E9003CE64D8A7F2E292E /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_concurrent_private.pri */,
+				7ECCC1F9442988B4F2707CC1 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_core.pri */,
+				5F781C7FD8422D359EA1D2FE /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_core_private.pri */,
+				7A94C7168B3FCBE5F04A013B /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_declarative.pri */,
+				89863CCAF1D29037AE95755D /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_declarative_private.pri */,
+				F2F823087EA182CCBD5748B8 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_designer.pri */,
+				7C2F42B222EE88E26A6FED62 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_designer_private.pri */,
+				69347C39E4D922E94D0860BF /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_designercomponents_private.pri */,
+				360D4B3ED25D126430DE27D4 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_enginio.pri */,
+				4C6C71914B1926119120DACD /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_enginio_private.pri */,
+				23BC8B0FC3279421D41CA268 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_gui.pri */,
+				D81E3D9A18202BE8EC3D0E2C /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_gui_private.pri */,
+				FD944B80F033DFE737D401A2 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_help.pri */,
+				D7A0618DE39A427EBF41940E /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_help_private.pri */,
+				A5B17ABEFBA1C2F43443D644 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_macextras.pri */,
+				33F165B1DB8CBF182C56FAB5 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_macextras_private.pri */,
+				D2FE4D909926A0D1656068C4 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_multimedia.pri */,
+				E7D67CB158408BB7DEA74764 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_multimedia_private.pri */,
+				28BD0D10214709D95B161E24 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_multimediawidgets.pri */,
+				D1FA7CAB5ACC09D563AE569F /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_multimediawidgets_private.pri */,
+				293C8DEEE270847AC20E70F9 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_network.pri */,
+				382E89A91A34F7898C25FD0D /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_network_private.pri */,
+				8A04A4A3625204D12A1207F6 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_nfc.pri */,
+				B51B01657BFE9EAEF5590561 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_nfc_private.pri */,
+				5CEA7A2DB2136425A88D1254 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_opengl.pri */,
+				E0F4563EA350EB65112A0EF4 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_opengl_private.pri */,
+				E432DA897A5F027987342E8F /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_openglextensions.pri */,
+				5597304BEC94BFB9EAAEBC4B /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_openglextensions_private.pri */,
+				8F572030CE9AB8CC5F672201 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_platformsupport_private.pri */,
+				F7ADBF552F6B9A5982915164 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_positioning.pri */,
+				E66B9EC81C285CA9A7FB6A2E /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_positioning_private.pri */,
+				6C08BFC27C4C303A3A5181DB /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_printsupport.pri */,
+				D0CDC87DAFDA7F18A7AF450F /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_printsupport_private.pri */,
+				B382B645B34234E451AE5D94 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_qml.pri */,
+				6102C69805B6398AF6FA5BEB /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_qml_private.pri */,
+				4FB6657DA22BC68B819B64B3 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_qmldevtools_private.pri */,
+				DF8188E30892A4654B984221 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_qmltest.pri */,
+				ABA9AB4619F09DCFD2D4A27F /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_qmltest_private.pri */,
+				5B22E9E4EE9AAE42ABC24AB3 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_qtmultimediaquicktools_private.pri */,
+				16DD53E17C65AC8B450CC6C3 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_quick.pri */,
+				8C31D89BDFCDF466DAED19A0 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_quick_private.pri */,
+				82E7DCFD95559532D8FC6CDD /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_quickparticles_private.pri */,
+				D948D4D8F949D45158F8DE35 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_quickwidgets.pri */,
+				B2246267D4C0D789259A86B0 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_quickwidgets_private.pri */,
+				CFCB992BEC24B71BFB8A2F30 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_script.pri */,
+				C505A18319B9B63C63877858 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_script_private.pri */,
+				CE829DD126DD2B97E8D70A7A /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_scripttools.pri */,
+				A59F74CD76FDC2B4B9910E18 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_scripttools_private.pri */,
+				85B6936EDBE61D9BB8F8B33B /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_sensors.pri */,
+				BDC9ECADEE40D11E3C2EA93F /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_sensors_private.pri */,
+				BFF0C38FB0EC140C5F0304AE /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_serialport.pri */,
+				311004331A04F3D69C98643C /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_serialport_private.pri */,
+				7DE30A90667C03C4F91A2A91 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_sql.pri */,
+				075EB50EB07CF69FD62FB8DF /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_sql_private.pri */,
+				ADFC79902C14A612AE93A89A /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_svg.pri */,
+				8DDE1D26B3206CDB8B57FABE /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_svg_private.pri */,
+				DB0A26DDC377B2004F61BFE3 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_testlib.pri */,
+				8849E60AEC7DB97A475C17EA /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_testlib_private.pri */,
+				E50FA73B8A23BC179A642B27 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_uitools.pri */,
+				B518DA4EE7376002AFC71FD5 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_uitools_private.pri */,
+				8F97C9CAE38CA3AFAC0B3953 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_websockets.pri */,
+				87EEF25EE25CF21572D1438C /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_websockets_private.pri */,
+				A022AF919D1977534CA66BB8 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_widgets.pri */,
+				8E9136256AFFBA6EF048AA55 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_widgets_private.pri */,
+				AA73DC3C2901E2979FE8AD5B /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_xml.pri */,
+				E37365B4489B4918BEBB707D /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_xml_private.pri */,
+				2E6D9B1D2743D24E31B0B284 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_xmlpatterns.pri */,
+				F9BEAA743A908603687DA204 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_lib_xmlpatterns_private.pri */,
+				D5141F795670589C8CC41CBC /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_cocoaprintersupport.pri */,
+				1FAE75C970AA73F2DEDDB508 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qavfcamera.pri */,
+				F4EB01857048DCFCFFAAC4D0 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qavfmediaplayer.pri */,
+				AFD721AA33A2F785E77B1698 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qcocoa.pri */,
+				EA5D4FF9DE4AC4215D7DCE0D /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qcorewlanbearer.pri */,
+				111BBEE3D1432C3B517FD539 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qdds.pri */,
+				3685604BDB64DD6E92169B73 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qdeclarativeview.pri */,
+				2440CD1D4CEF80443BCA1B8B /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qgenericbearer.pri */,
+				EB1F99FD112917157F3C3F6E /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qicns.pri */,
+				C4295BE59CCEBCDD16268349 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qico.pri */,
+				45DB132B756499D4DF38430E /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qjp2.pri */,
+				B678DA730B4ECE863AD631AE /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qminimal.pri */,
+				F0A58515945747E36783CC21 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qmldbg_inspector.pri */,
+				B8525798C5AA7D7C6D68E1B3 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qmldbg_qtquick2.pri */,
+				EB29AC635054C09EFA749AE1 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qmldbg_tcp.pri */,
+				3F08D430CEC8D2117735CCB4 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qmldbg_tcp_qtdeclarative.pri */,
+				946BEA667170DC1A7A8F9DB0 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qmng.pri */,
+				CCF75CFFB857487FB18F99F9 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qoffscreen.pri */,
+				9A0BDF67E013BB4FFB8685B0 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qqt7engine.pri */,
+				B064BF3B496A7BF7A449CA1E /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qsqlite.pri */,
+				F83F87F8A60C9DF666911D42 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qsvg.pri */,
+				CFFBE05DB004895080314289 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qsvgicon.pri */,
+				247D8DF3B1DDB665B80BBA25 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qtaccessiblequick.pri */,
+				87A4C1983FD641360BF80A02 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qtaccessiblewidgets.pri */,
+				24B6929EE3952310F2DAECB1 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qtaudio_coreaudio.pri */,
+				060A694B42A4555240009936 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qtga.pri */,
+				BD22EFEFCC02644B1883CE19 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qtiff.pri */,
+				B8C1F6C965A7A14FBA8D4518 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qtmedia_audioengine.pri */,
+				74C1C232DFAA71028A0412CA /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qtmultimedia_m3u.pri */,
+				C84546C18DCBB04166195DCF /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qtposition_positionpoll.pri */,
+				AB1C02DDBD8E88DD9A9AFDDD /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qtsensorgestures_plugin.pri */,
+				8B4BB4E74F8A4442EF563D7D /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qtsensorgestures_shakeplugin.pri */,
+				892D36BEF797BA4AF48D378A /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qtsensors_dummy.pri */,
+				A4D8AC60897F435C1C3B9D02 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qtsensors_generic.pri */,
+				346287C9E754E7C458153F03 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qwbmp.pri */,
+				B26239063A068F800A2C95F4 /* /usr/local/Qt-5.4.0/mkspecs/modules/qt_plugin_qwebp.pri */,
+				63E722139886C87BC82DBDF5 /* /usr/local/Qt-5.4.0/mkspecs/macx-clang/qmake.conf */,
+				85061B1DA49D125991117950 /* /usr/local/Qt-5.4.0/mkspecs/macx-xcode/qmake.conf */,
 				AB745978DF0F41D1801ABDA6 /* .qmake.stash */,
 			);
 			name = "Supporting Files";
@@ -562,26 +562,26 @@
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				HEADER_SEARCH_PATHS = (
-					../../Libraries/QtStatic/qtbase/include/QtGui/5.3.1/QtGui,
-					../../Libraries/QtStatic/qtbase/include/QtCore/5.3.1/QtCore,
+					../../Libraries/QtStatic/qtbase/include/QtGui/5.4.0/QtGui,
+					../../Libraries/QtStatic/qtbase/include/QtCore/5.4.0/QtCore,
 					../../Libraries/QtStatic/qtbase/include,
 					/usr/local/include,
-					"/usr/local/Qt-5.3.1/include",
-					"/usr/local/Qt-5.3.1/include/QtGui",
-					"/usr/local/Qt-5.3.1/include/QtCore",
+					"/usr/local/Qt-5.4.0/include",
+					"/usr/local/Qt-5.4.0/include/QtGui",
+					"/usr/local/Qt-5.4.0/include/QtCore",
 					GeneratedFiles/Debug,
 					/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.9.sdk/System/Library/Frameworks/OpenGL.framework/Versions/A/Headers,
 					/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.9.sdk/System/Library/Frameworks/AGL.framework/Headers,
-					"/usr/local/Qt-5.3.1/mkspecs/macx-clang",
+					"/usr/local/Qt-5.4.0/mkspecs/macx-clang",
 				);
 				INFOPLIST_FILE = Packer.plist;
 				INSTALL_DIR = "../Mac/$(CONFIGURATION)";
 				LDPLUSPLUS = "/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang++";
 				LIBRARY_SEARCH_PATHS = (
 					/System/Library/Frameworks/,
-					"/usr/local/Qt-5.3.1/lib",
-					"/usr/local/Qt-5.3.1/plugins/platforms",
-					"/usr/local/Qt-5.3.1/plugins/imageformats",
+					"/usr/local/Qt-5.4.0/lib",
+					"/usr/local/Qt-5.4.0/plugins/platforms",
+					"/usr/local/Qt-5.4.0/plugins/imageformats",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 10.7;
 				OBJROOT = "$(BUILD_DIR)/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)IntermediatePacker/";
@@ -612,10 +612,10 @@
 					"-stdlib=libc++",
 					"-lcrypto",
 					"-lssl",
-					"-L/usr/local/Qt-5.3.1/lib",
-					"-L/usr/local/Qt-5.3.1/plugins/platforms",
+					"-L/usr/local/Qt-5.4.0/lib",
+					"-L/usr/local/Qt-5.4.0/plugins/platforms",
 					"-lcups",
-					"-L/usr/local/Qt-5.3.1/plugins/imageformats",
+					"-L/usr/local/Qt-5.4.0/plugins/imageformats",
 					"-lz",
 					"-lm",
 					"-llzma",
@@ -654,26 +654,26 @@
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				HEADER_SEARCH_PATHS = (
-					../../Libraries/QtStatic/qtbase/include/QtGui/5.3.1/QtGui,
-					../../Libraries/QtStatic/qtbase/include/QtCore/5.3.1/QtCore,
+					../../Libraries/QtStatic/qtbase/include/QtGui/5.4.0/QtGui,
+					../../Libraries/QtStatic/qtbase/include/QtCore/5.4.0/QtCore,
 					../../Libraries/QtStatic/qtbase/include,
 					/usr/local/include,
-					"/usr/local/Qt-5.3.1/include",
-					"/usr/local/Qt-5.3.1/include/QtGui",
-					"/usr/local/Qt-5.3.1/include/QtCore",
+					"/usr/local/Qt-5.4.0/include",
+					"/usr/local/Qt-5.4.0/include/QtGui",
+					"/usr/local/Qt-5.4.0/include/QtCore",
 					GeneratedFiles/Debug,
 					/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.9.sdk/System/Library/Frameworks/OpenGL.framework/Versions/A/Headers,
 					/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.9.sdk/System/Library/Frameworks/AGL.framework/Headers,
-					"/usr/local/Qt-5.3.1/mkspecs/macx-clang",
+					"/usr/local/Qt-5.4.0/mkspecs/macx-clang",
 				);
 				INFOPLIST_FILE = Packer.plist;
 				INSTALL_DIR = "../Mac/$(CONFIGURATION)";
 				LDPLUSPLUS = "/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang++";
 				LIBRARY_SEARCH_PATHS = (
 					/System/Library/Frameworks/,
-					"/usr/local/Qt-5.3.1/lib",
-					"/usr/local/Qt-5.3.1/plugins/platforms",
-					"/usr/local/Qt-5.3.1/plugins/imageformats",
+					"/usr/local/Qt-5.4.0/lib",
+					"/usr/local/Qt-5.4.0/plugins/platforms",
+					"/usr/local/Qt-5.4.0/plugins/imageformats",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 10.7;
 				OBJROOT = "$(BUILD_DIR)/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)IntermediatePacker/";
@@ -705,10 +705,10 @@
 					"-stdlib=libc++",
 					"-lcrypto",
 					"-lssl",
-					"-L/usr/local/Qt-5.3.1/lib",
-					"-L/usr/local/Qt-5.3.1/plugins/platforms",
+					"-L/usr/local/Qt-5.4.0/lib",
+					"-L/usr/local/Qt-5.4.0/plugins/platforms",
 					"-lcups",
-					"-L/usr/local/Qt-5.3.1/plugins/imageformats",
+					"-L/usr/local/Qt-5.4.0/plugins/imageformats",
 					"-lz",
 					"-lm",
 					"-llzma",
--- a/Telegram/Packer.xcodeproj/qt_preprocess.mak
+++ b/Telegram/Packer.xcodeproj/qt_preprocess.mak
@@ -1,21 +1,21 @@
 #############################################################################
 # Makefile for building: ../Mac/DebugPacker/Packer.app/Contents/MacOS/Packer
-# Generated by qmake (3.0) (Qt 5.3.1)
+# Generated by qmake (3.0) (Qt 5.4.0)
 # Project:  Packer.pro
 # Template: app
-# Command: /usr/local/Qt-5.3.1/bin/qmake -spec macx-xcode -o Packer.xcodeproj/project.pbxproj Packer.pro
+# Command: /usr/local/Qt-5.4.0/bin/qmake -spec macx-xcode -o Packer.xcodeproj/project.pbxproj Packer.pro
 #############################################################################

 MAKEFILE      = project.pbxproj

-MOC       = /usr/local/Qt-5.3.1/bin/moc
+MOC       = /usr/local/Qt-5.4.0/bin/moc
 UIC       = 
 LEX       = flex
 LEXFLAGS  = 
 YACC      = yacc
 YACCFLAGS = -d
 DEFINES       = -D_DEBUG -DQT_GUI_LIB -DQT_CORE_LIB
-INCPATH       = -I/usr/local/Qt-5.3.1/mkspecs/macx-clang -I. -I../../Libraries/QtStatic/qtbase/include/QtGui/5.3.1/QtGui -I../../Libraries/QtStatic/qtbase/include/QtCore/5.3.1/QtCore -I../../Libraries/QtStatic/qtbase/include -I../../Libraries/lzma/C -I/usr/local/Qt-5.3.1/include -I/usr/local/Qt-5.3.1/include/QtGui -I/usr/local/Qt-5.3.1/include/QtCore -IGeneratedFiles/Debug -I/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.9.sdk/System/Library/Frameworks/OpenGL.framework/Versions/A/Headers -I/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.9.sdk/System/Library/Frameworks/AGL.framework/Headers
+INCPATH       = -I/usr/local/Qt-5.4.0/mkspecs/macx-clang -I. -I../../Libraries/QtStatic/qtbase/include/QtGui/5.4.0/QtGui -I../../Libraries/QtStatic/qtbase/include/QtCore/5.4.0/QtCore -I../../Libraries/QtStatic/qtbase/include -I../../Libraries/lzma/C -I/usr/local/Qt-5.4.0/include -I/usr/local/Qt-5.4.0/include/QtGui -I/usr/local/Qt-5.4.0/include/QtCore -IGeneratedFiles/Debug -I/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.9.sdk/System/Library/Frameworks/OpenGL.framework/Versions/A/Headers -I/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.9.sdk/System/Library/Frameworks/AGL.framework/Headers
 DEL_FILE  = rm -f
 MOVE      = mv -f

--- a/Telegram/Prepare.vcxproj
+++ b/Telegram/Prepare.vcxproj
@@ -1,126 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Deploy|Win32">
-      <Configuration>Deploy</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="SourceFiles\_other\prepare.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="SourceFiles\_other\prepare.h" />
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{88AB1138-143A-4CFB-A0E6-79B646B5E1B0}</ProjectGuid>
-    <Keyword>Qt4VSv1.0</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v120_xp</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v120_xp</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Deploy|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v120_xp</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Deploy|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>11.0.61030.0</_ProjectFileVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)$(Platform)\$(Configuration)IntermediatePrepare\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)$(Platform)\$(Configuration)IntermediatePrepare\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Deploy|Win32'">
-    <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)$(Platform)\$(Configuration)IntermediatePrepare\</IntDir>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <PreprocessorDefinitions>UNICODE;WIN32;WIN64;QT_CORE_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Optimization>Disabled</Optimization>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <AdditionalIncludeDirectories>.;$(QTDIR)\include;.\GeneratedFiles\$(ConfigurationName);$(QTDIR)\include\QtCore;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <TreatWChar_tAsBuiltInType>false</TreatWChar_tAsBuiltInType>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <OutputFile>$(OutDir)\$(ProjectName).exe</OutputFile>
-      <AdditionalLibraryDirectories>$(QTDIR)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>kernel32.lib;user32.lib;shell32.lib;uuid.lib;ole32.lib;advapi32.lib;ws2_32.lib;qtmaind.lib;Qt5Cored.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <PreprocessorDefinitions>UNICODE;WIN32;WIN64;QT_NO_DEBUG;NDEBUG;QT_CORE_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <DebugInformationFormat />
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <AdditionalIncludeDirectories>.;$(QTDIR)\include;.\GeneratedFiles\$(ConfigurationName);$(QTDIR)\include\QtCore;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <TreatWChar_tAsBuiltInType>false</TreatWChar_tAsBuiltInType>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <OutputFile>$(OutDir)\$(ProjectName).exe</OutputFile>
-      <AdditionalLibraryDirectories>$(QTDIR)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>kernel32.lib;user32.lib;shell32.lib;uuid.lib;ole32.lib;advapi32.lib;ws2_32.lib;qtmain.lib;Qt5Core.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <GenerateDebugInformation>false</GenerateDebugInformation>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Deploy|Win32'">
-    <ClCompile>
-      <PreprocessorDefinitions>UNICODE;WIN32;WIN64;QT_NO_DEBUG;NDEBUG;QT_CORE_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <DebugInformationFormat>
-      </DebugInformationFormat>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <AdditionalIncludeDirectories>.;$(QTDIR)\include;.\GeneratedFiles\$(ConfigurationName);$(QTDIR)\include\QtCore;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <TreatWChar_tAsBuiltInType>false</TreatWChar_tAsBuiltInType>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <OutputFile>$(OutDir)\$(ProjectName).exe</OutputFile>
-      <AdditionalLibraryDirectories>$(QTDIR)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>kernel32.lib;user32.lib;shell32.lib;uuid.lib;ole32.lib;advapi32.lib;ws2_32.lib;qtmain.lib;Qt5Core.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <GenerateDebugInformation>false</GenerateDebugInformation>
-    </Link>
-  </ItemDefinitionGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-  <ProjectExtensions>
-    <VisualStudio>
-      <UserProperties UicDir=".\GeneratedFiles" MocDir=".\GeneratedFiles\$(ConfigurationName)" MocOptions="" RccDir=".\GeneratedFiles" lupdateOnBuild="0" lupdateOptions="" lreleaseOptions="" Qt5Version_x0020_Win32="$(DefaultQtVersion)" />
-    </VisualStudio>
-  </ProjectExtensions>
-</Project>
--- a/Telegram/Prepare.vcxproj.filters
+++ b/Telegram/Prepare.vcxproj.filters
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;cxx;c;def</Extensions>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{D9D6E242-F8AF-46E4-B9FD-80ECBC20BA3E}</UniqueIdentifier>
-      <Extensions>qrc;*</Extensions>
-      <ParseFiles>false</ParseFiles>
-    </Filter>
-    <Filter Include="Generated Files">
-      <UniqueIdentifier>{71ED8ED8-ACB9-4CE9-BBE1-E00B30144E11}</UniqueIdentifier>
-      <Extensions>moc;h;cpp</Extensions>
-      <SourceControlFiles>False</SourceControlFiles>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="SourceFiles\_other\prepare.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="SourceFiles\_other\prepare.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-  </ItemGroup>
-</Project>
--- a/Telegram/PrepareLinux.sh
+++ b/Telegram/PrepareLinux.sh
@@ -1,5 +1,17 @@
 AppVersion=`./Version.sh | awk -F " " '{print $1}'`
 AppVersionStr=`./Version.sh | awk -F " " '{print $2}'`
+DevChannel=`./Version.sh | awk -F " " '{print $3}'`
+DevPostfix=''
+DevParam=''
+if [ "$DevChannel" != "0" ]; then
+  DevPostfix='.dev'
+  DevParam='-dev'
+fi
+
+if [ -d "./../Linux/Release/deploy/$AppVersionStr.dev" ]; then
+  echo "Deploy folder for version $AppVersionStr.dev already exists!"
+  exit 1
+fi

 if [ -d "./../Linux/Release/deploy/$AppVersionStr" ]; then
  echo "Deploy folder for version $AppVersionStr already exists!"
@@ -21,19 +33,19 @@ if [ ! -f "./../Linux/Release/Updater" ]; then
  exit 1
 fi

-echo "Preparing version $AppVersionStr, executing Packer.."
-cd ./../Linux/Release && ./Packer -path Telegram -path Updater -version $AppVersion && cd ./../../Telegram
+echo "Preparing version $AppVersionStr$DevPostfix, executing Packer.."
+cd ./../Linux/Release && ./Packer -path Telegram -path Updater -version $AppVersion $DevParam && cd ./../../Telegram
 echo "Packer done!"

 if [ ! -d "./../Linux/Release/deploy" ]; then
  mkdir "./../Linux/Release/deploy"
 fi
-echo "Copying Telegram, Updater and tlinuxupd$AppVersion to deploy/$AppVersionStr..";
-mkdir "./../Linux/Release/deploy/$AppVersionStr"
-mkdir "./../Linux/Release/deploy/$AppVersionStr/Telegram"
-mv ./../Linux/Release/Telegram ./../Linux/Release/deploy/$AppVersionStr/Telegram/
-mv ./../Linux/Release/Updater ./../Linux/Release/deploy/$AppVersionStr/Telegram/
-mv ./../Linux/Release/tlinuxupd$AppVersion ./../Linux/Release/deploy/$AppVersionStr/
-cd ./../Linux/Release/deploy/$AppVersionStr && tar -cJvf tsetup.$AppVersionStr.tar.xz Telegram/ && cd ./../../../../Telegram
-echo "Version $AppVersionStr prepared!";
+echo "Copying Telegram, Updater and tlinuxupd$AppVersion to deploy/$AppVersionStr$DevPostfix..";
+mkdir "./../Linux/Release/deploy/$AppVersionStr$DevPostfix"
+mkdir "./../Linux/Release/deploy/$AppVersionStr$DevPostfix/Telegram"
+mv ./../Linux/Release/Telegram ./../Linux/Release/deploy/$AppVersionStr$DevPostfix/Telegram/
+mv ./../Linux/Release/Updater ./../Linux/Release/deploy/$AppVersionStr$DevPostfix/Telegram/
+mv ./../Linux/Release/tlinuxupd$AppVersion ./../Linux/Release/deploy/$AppVersionStr$DevPostfix/
+cd ./../Linux/Release/deploy/$AppVersionStr$DevPostfix && tar -cJvf tsetup.$AppVersionStr$DevPostfix.tar.xz Telegram/ && cd ./../../../../Telegram
+echo "Version $AppVersionStr$DevPostfix prepared!";

--- a/Telegram/PrepareLinux32.sh
+++ b/Telegram/PrepareLinux32.sh
@@ -1,5 +1,17 @@
 AppVersion=`./Version.sh | awk -F " " '{print $1}'`
 AppVersionStr=`./Version.sh | awk -F " " '{print $2}'`
+DevChannel=`./Version.sh | awk -F " " '{print $3}'`
+DevPostfix=''
+DevParam=''
+if [ "$DevChannel" != "0" ]; then
+  DevPostfix='.dev'
+  DevParam='-dev'
+fi
+
+if [ -d "./../Linux/Release/deploy/$AppVersionStr.dev" ]; then
+  echo "Deploy folder for version $AppVersionStr.dev already exists!"
+  exit 1
+fi

 if [ -d "./../Linux/Release/deploy/$AppVersionStr" ]; then
  echo "Deploy folder for version $AppVersionStr already exists!"
@@ -21,19 +33,19 @@ if [ ! -f "./../Linux/Release/Updater" ]; then
  exit 1
 fi

-echo "Preparing version $AppVersionStr, executing Packer.."
-cd ./../Linux/Release && ./Packer -path Telegram -path Updater -version $AppVersion && cd ./../../Telegram
+echo "Preparing version $AppVersionStr$DevPostfix, executing Packer.."
+cd ./../Linux/Release && ./Packer -path Telegram -path Updater -version $AppVersion $DevParam && cd ./../../Telegram
 echo "Packer done!"

 if [ ! -d "./../Linux/Release/deploy" ]; then
  mkdir "./../Linux/Release/deploy"
 fi
-echo "Copying Telegram, Updater and tlinux32upd$AppVersion to deploy/$AppVersionStr..";
-mkdir "./../Linux/Release/deploy/$AppVersionStr"
-mkdir "./../Linux/Release/deploy/$AppVersionStr/Telegram"
-mv ./../Linux/Release/Telegram ./../Linux/Release/deploy/$AppVersionStr/Telegram/
-mv ./../Linux/Release/Updater ./../Linux/Release/deploy/$AppVersionStr/Telegram/
-mv ./../Linux/Release/tlinux32upd$AppVersion ./../Linux/Release/deploy/$AppVersionStr/
-cd ./../Linux/Release/deploy/$AppVersionStr && tar -cJvf tsetup32.$AppVersionStr.tar.xz Telegram/ && cd ./../../../../Telegram
-echo "Version $AppVersionStr prepared!";
+echo "Copying Telegram, Updater and tlinux32upd$AppVersion to deploy/$AppVersionStr$DevPostfix..";
+mkdir "./../Linux/Release/deploy/$AppVersionStr$DevPostfix"
+mkdir "./../Linux/Release/deploy/$AppVersionStr$DevPostfix/Telegram"
+mv ./../Linux/Release/Telegram ./../Linux/Release/deploy/$AppVersionStr$DevPostfix/Telegram/
+mv ./../Linux/Release/Updater ./../Linux/Release/deploy/$AppVersionStr$DevPostfix/Telegram/
+mv ./../Linux/Release/tlinux32upd$AppVersion ./../Linux/Release/deploy/$AppVersionStr$DevPostfix/
+cd ./../Linux/Release/deploy/$AppVersionStr$DevPostfix && tar -cJvf tsetup32.$AppVersionStr$DevPostfix.tar.xz Telegram/ && cd ./../../../../Telegram
+echo "Version $AppVersionStr$DevPostfix prepared!";

--- a/Telegram/PrepareMac.sh
+++ b/Telegram/PrepareMac.sh
@@ -1,10 +1,22 @@
 AppVersion=`./Version.sh | awk -F " " '{print $1}'`
 AppVersionStr=`./Version.sh | awk -F " " '{print $2}'`
+DevChannel=`./Version.sh | awk -F " " '{print $3}'`
+DevPostfix=''
+DevParam=''
+if [ "$DevChannel" != "0" ]; then
+  DevPostfix='.dev'
+  DevParam='-dev'
+fi

 echo ""
-echo "Preparing version $AppVersionStr.."
+echo "Preparing version $AppVersionStr$DevPostfix.."
 echo ""

+if [ -d "./../Mac/Release/deploy/$AppVersionStr.dev" ]; then
+  echo "Deploy folder for version $AppVersionStr.dev already exists!"
+  exit 1
+fi
+
 if [ -d "./../Mac/Release/deploy/$AppVersionStr" ]; then
  echo "Deploy folder for version $AppVersionStr already exists!"
  exit 1
@@ -20,6 +32,18 @@ if [ ! -d "./../Mac/Release/Telegram.app" ]; then
  exit 1
 fi

+if [ ! -d "./../Mac/Release/Telegram.app.dSYM" ]; then
+  echo "Telegram.app.dSYM not found!"
+  exit 1
+fi
+
+AppUUID=`dwarfdump -u "./../Mac/Release/Telegram.app/Contents/MacOS/Telegram" | awk -F " " '{print $2}'`
+DsymUUID=`dwarfdump -u "./../Mac/Release/Telegram.app.dSYM" | awk -F " " '{print $2}'`
+if [ "$AppUUID" != "$DsymUUID" ]; then
+  echo "UUID of binary '$AppUUID' and dSYM '$DsymUUID' differ!"
+  exit 1
+fi
+
 if [ ! -f "./../Mac/Release/Telegram.app/Contents/Resources/Icon.icns" ]; then
  echo "Icon.icns not found in Resources!"
  exit 1
@@ -45,22 +69,23 @@ temppath=`hdiutil attach -readwrite tsetup.dmg | awk -F "\t" 'END {print $3}'`
 cp -R ./Telegram.app "$temppath/"
 bless --folder "$temppath/" --openfolder "$temppath/"
 hdiutil detach "$temppath"
-hdiutil convert tsetup.dmg -format UDZO -imagekey zlib-level=9 -ov -o tsetup.$AppVersionStr.dmg
+hdiutil convert tsetup.dmg -format UDZO -imagekey zlib-level=9 -ov -o tsetup.$AppVersionStr$DevPostfix.dmg
 cd ./../../Telegram
-cd ./../Mac/Release && ./Packer.app/Contents/MacOS/Packer -path Telegram.app -version $AppVersion && cd ./../../Telegram
+cd ./../Mac/Release && ./Packer.app/Contents/MacOS/Packer -path Telegram.app -version $AppVersion $DevParam && cd ./../../Telegram

 if [ ! -d "./../Mac/Release/deploy/" ]; then
  mkdir "./../Mac/Release/deploy"
 fi

 echo "Copying Telegram.app and tmacupd$AppVersion to deploy/$AppVersionStr..";
-mkdir "./../Mac/Release/deploy/$AppVersionStr"
-mkdir "./../Mac/Release/deploy/$AppVersionStr/Telegram"
-cp -r ./../Mac/Release/Telegram.app ./../Mac/Release/deploy/$AppVersionStr/Telegram/
+mkdir "./../Mac/Release/deploy/$AppVersionStr$DevPostfix"
+mkdir "./../Mac/Release/deploy/$AppVersionStr$DevPostfix/Telegram"
+cp -r ./../Mac/Release/Telegram.app ./../Mac/Release/deploy/$AppVersionStr$DevPostfix/Telegram/
+mv ./../Mac/Release/Telegram.app.dSYM ./../Mac/Release/deploy/$AppVersionStr$DevPostfix/
 rm ./../Mac/Release/Telegram.app/Contents/MacOS/Telegram
 rm ./../Mac/Release/Telegram.app/Contents/Frameworks/Updater
 rm -rf ./../Mac/Release/Telegram.app/Contents/_CodeSignature
-mv ./../Mac/Release/tmacupd$AppVersion ./../Mac/Release/deploy/$AppVersionStr/
-mv ./../Mac/Release/tsetup.$AppVersionStr.dmg ./../Mac/Release/deploy/$AppVersionStr/tsetup.$AppVersionStr.dmg
-echo "Version $AppVersionStr prepared!";
+mv ./../Mac/Release/tmacupd$AppVersion ./../Mac/Release/deploy/$AppVersionStr$DevPostfix/
+mv ./../Mac/Release/tsetup.$AppVersionStr$DevPostfix.dmg ./../Mac/Release/deploy/$AppVersionStr$DevPostfix/tsetup.$AppVersionStr$DevPostfix.dmg
+echo "Version $AppVersionStr$DevPostfix prepared!";

--- a/Telegram/PrepareWin.bat
+++ b/Telegram/PrepareWin.bat
@@ -1,13 +1,32 @@
@echo OFF

-set "AppVersionStrSmall=0.7.6"
-set "AppVersionStr=0.7.6"
-set "AppVersionStrFull=0.7.6.0"
+set "AppVersion=8012"
+set "AppVersionStrSmall=0.8.12"
+set "AppVersionStr=0.8.12"
+set "AppVersionStrFull=0.8.12.0"
+set "DevChannel=1"
+
+if %DevChannel% neq 0 goto preparedev
+
+set "DevPostfix="
+set "DevParam="
+goto devprepared
+
+:preparedev
+
+set "DevPostfix=.dev"
+set "DevParam=-dev"
+
+:devprepared

 echo.
-echo Preparing version %AppVersionStr%..
+echo Preparing version %AppVersionStr%%DevPostfix%..
 echo.

+if exist ..\Win32\Deploy\deploy\%AppVersionStr%\ goto error_exist1
+if exist ..\Win32\Deploy\deploy\%AppVersionStr%.dev\ goto error_exist2
+if exist ..\Win32\Deploy\tupdate%AppVersion% goto error_exist3
+
 set "PATH=%PATH%;C:\Program Files\7-Zip;C:\Program Files (x86)\Inno Setup 5"
 cd ..\Win32\Deploy

@@ -17,23 +36,32 @@ if %errorlevel% neq 0 goto error1
 call ..\..\..\TelegramPrivate\Sign.bat Updater.exe
 if %errorlevel% neq 0 goto error1

-iscc /dMyAppVersion=%AppVersionStrSmall% /dMyAppVersionZero=%AppVersionStr% /dMyAppFullVersion=%AppVersionStrFull% ..\..\Telegram\Setup.iss
+iscc /dMyAppVersion=%AppVersionStrSmall% /dMyAppVersionZero=%AppVersionStr% /dMyAppFullVersion=%AppVersionStrFull% /dMyAppVersionForExe=%AppVersionStr%%DevPostfix% ..\..\Telegram\Setup.iss
 if %errorlevel% neq 0 goto error1

-call ..\..\..\TelegramPrivate\Sign.bat tsetup.%AppVersionStr%.exe
+call ..\..\..\TelegramPrivate\Sign.bat tsetup.%AppVersionStr%%DevPostfix%.exe
 if %errorlevel% neq 0 goto error1

-call Prepare.exe -path Telegram.exe -path Updater.exe
+call Packer.exe -version %AppVersion% -path Telegram.exe -path Updater.exe %DevParam%
 if %errorlevel% neq 0 goto error1

-cd deploy\%AppVersionStr%
-mkdir Telegram
-move Telegram.exe Telegram\
-7z a -mx9 tportable.%AppVersionStr%.zip Telegram\
+if not exist deploy mkdir deploy
+mkdir deploy\%AppVersionStr%%DevPostfix%
+mkdir deploy\%AppVersionStr%%DevPostfix%\Telegram
+
+move Telegram.exe deploy\%AppVersionStr%%DevPostfix%\Telegram\
+move Updater.exe deploy\%AppVersionStr%%DevPostfix%\
+move Telegram.pdb deploy\%AppVersionStr%%DevPostfix%\
+move Updater.pdb deploy\%AppVersionStr%%DevPostfix%\
+move tsetup.%AppVersionStr%%DevPostfix%.exe deploy\%AppVersionStr%%DevPostfix%\
+move tupdate%AppVersion% deploy\%AppVersionStr%%DevPostfix%\
+
+cd deploy\%AppVersionStr%%DevPostfix%
+7z a -mx9 tportable.%AppVersionStr%%DevPostfix%.zip Telegram\
 if %errorlevel% neq 0 goto error2

 echo .
-echo Version %AppVersionStr% is ready for deploy!
+echo Version %AppVersionStr%%DevPostfix% is ready for deploy!
 echo .

 cd ..\..\..\..\Telegram
@@ -46,4 +74,16 @@ cd ..\..\Telegram
 echo ERROR occured!
 exit /b %errorlevel%

+:error_exist1
+echo Deploy folder for version %AppVersionStr% already exists!
+exit /b 1
+
+:error_exist2
+echo Deploy folder for version %AppVersionStr%.dev already exists!
+exit /b 1
+
+:error_exist3
+echo Update file for version %AppVersion% already exists!
+exit /b 1
+
 :eof
--- a/Telegram/Resources/lang.strings
+++ b/Telegram/Resources/lang.strings
@@ -89,14 +89,16 @@ Copyright (c) 2014 John Preston, https://desktop.telegram.org
 "lng_chat_status_members_online" = "{count:_not_used_|# member|# members}, {count_online:_not_used_|# online|# online}";

 "lng_server_error" = "Internal server error.";
-"lng_flood_error" = "Too much tries. Please try again later.";
+"lng_flood_error" = "Too many tries. Please try again later.";
 "lng_deleted" = "Unknown";
+"lng_deleted_message" = "Deleted message";

 "lng_intro" = "Welcome to the official [a href=\"https://telegram.org/\"]Telegram[/a] desktop app.\nIt's [b]fast[/b] and [b]secure[/b].";
 "lng_start_msgs" = "START MESSAGING";

 "lng_intro_next" = "NEXT";
 "lng_intro_finish" = "SIGN UP";
+"lng_intro_submit" = "SUBMIT";

 "lng_phone_ph" = "Your phone number";
 "lng_phone_title" = "Your Phone";
@@ -121,7 +123,25 @@ Copyright (c) 2014 John Preston, https://desktop.telegram.org
 "lng_bad_name" = "Please enter your first and last name.";
 "lng_bad_photo" = "Bad image selected.";

-"lng_bad_image_for_photo" = "This image can't be sent that way.\nWould you like to send it as a document?";
+"lng_bad_image_for_photo" = "This image can't be sent that way.\nWould you like to send it as a file?";
+
+"lng_signin_title" = "Cloud password check";
+"lng_signin_desc" = "Please enter your cloud password.";
+"lng_signin_recover_desc" = "Please enter the code from the e-mail.";
+"lng_signin_password" = "Your cloud password";
+"lng_signin_code" = "Code from e-mail";
+"lng_signin_recover" = "Forgot password?";
+"lng_signin_hint" = "Hint: {password_hint}";
+"lng_signin_recover_hint" = "Code was sent to {recover_email}";
+"lng_signin_bad_password" = "You have entered a wrong password.";
+"lng_signin_wrong_code" = "You have entered an invalid code. Please try again.";
+"lng_signin_try_password" = "Having trouble accessing your e-mail?";
+"lng_signin_password_removed" = "Your cloud password was disabled.\nYou can set a new one in Settings.";
+"lng_signin_no_email_forgot" = "Since you haven't provided a recovery\ne-mail when setting up your password, your remaining options are either to remember your password or to reset your account.";
+"lng_signin_cant_email_forgot" = "If you can't restore access to the e-mail, your remaining options are either to remember your password or to reset your account.";
+"lng_signin_reset_account" = "Reset your account";
+"lng_sigin_sure_reset" = "Warning!\n\nYou will lose all your chats and messages,\nalong with any media and files you shared!\n\nDo you want to reset your account?";
+"lng_sigin_reset" = "Reset";

 "lng_signup_title" = "Information and photo";
 "lng_signup_desc" = "Please enter your name and\nupload a photo.";
@@ -153,8 +173,7 @@ Copyright (c) 2014 John Preston, https://desktop.telegram.org
 "lng_settings_section_contact_info" = "Contact info";
 "lng_settings_phone_number" = "Phone number:";
 "lng_settings_username" = "Username:";
-"lng_settings_choose_username" = "choose username";
-"lng_settings_change_username" = "Change";
+"lng_settings_choose_username" = "Choose username";

 "lng_settings_section_notify" = "Notifications";
 "lng_settings_desktop_notify" = "Desktop notifications";
@@ -173,7 +192,7 @@ Copyright (c) 2014 John Preston, https://desktop.telegram.org
 "lng_settings_check_now" = "Check for updates";
 "lng_settings_update_checking" = "Checking for updates..";
 "lng_settings_latest_installed" = "Latest version is installed";
-"lng_settings_downloading" = "Downloading update {ready} / {total} Mb..";
+"lng_settings_downloading" = "Downloading update {ready} / {total} MB..";
 "lng_settings_update_ready" = "New version is ready";
 "lng_settings_update_now" = "Restart Now";
 "lng_settings_update_fail" = "Update check failed :(";
@@ -192,7 +211,13 @@ Copyright (c) 2014 John Preston, https://desktop.telegram.org
 "lng_settings_send_enter" = "Send by Enter";
 "lng_settings_send_ctrlenter" = "Send by Ctrl+Enter";
 "lng_settings_send_cmdenter" = "Send by Cmd+Enter";
-"lng_settings_cats_and_dogs" = "Allow cats and dogs";
+
+"lng_settings_section_background" = "Chat background";
+"lng_settings_bg_from_gallery" = "Choose from gallery";
+"lng_settings_bg_from_file" = "Choose from file";
+"lng_settings_bg_tile" = "Tile background";
+
+"lng_backgrounds_header" = "Choose your new chat background";

 "lng_download_path_dont_ask" = "Don't ask download path for each file";
 "lng_download_path_label" = "Download path:";
@@ -222,6 +247,55 @@ Copyright (c) 2014 John Preston, https://desktop.telegram.org
 "lng_local_storage_clear_failed" = "Clear failed :(";

 "lng_settings_section_advanced" = "Advanced";
+
+"lng_passcode_remove_button" = "Remove";
+
+"lng_passcode_turn_on" = "Turn on local passcode";
+"lng_passcode_change" = "Change local passcode";
+"lng_passcode_create" = "Create local passcode";
+"lng_passcode_remove" = "Remove local passcode";
+"lng_passcode_turn_off" = "Turn off";
+"lng_passcode_autolock" = "Auto-Lock";
+"lng_passcode_autolock_away" = "Auto-Lock if away for:";
+"lng_passcode_autolock_inactive" = "Auto-Lock if inactive for:";
+"lng_passcode_autolock_minutes" = "{count:_not_used_|# minute|# minutes}";
+"lng_passcode_autolock_hours" = "{count:_not_used_|# hour|# hours}";
+"lng_passcode_enter_old" = "Enter old passcode";
+"lng_passcode_enter_first" = "Enter a passcode";
+"lng_passcode_enter_new" = "Enter new passcode";
+"lng_passcode_confirm_new" = "Re-enter new passcode";
+"lng_passcode_about" = "When a local passcode is set, a lock icon appears in the top menu. Click it to lock the app.\n\nNote: if you forget your local passcode, you'll need to relogin in Telegram Desktop.";
+"lng_passcode_differ" = "Passcodes are different";
+"lng_passcode_wrong" = "Wrong passcode";
+"lng_passcode_is_same" = "Passcode was not changed";
+"lng_passcode_enter" = "Enter your local passcode";
+"lng_passcode_submit" = "Submit";
+"lng_passcode_logout" = "Log out";
+
+"lng_cloud_password_waiting" = "Confirmation link sent to {email}..";
+"lng_cloud_password_change" = "Change cloud password";
+"lng_cloud_password_create" = "Create cloud password";
+"lng_cloud_password_remove" = "Remove cloud password";
+"lng_cloud_password_set" = "Enable two-step verification";
+"lng_cloud_password_edit" = "Change cloud password";
+"lng_cloud_password_enter_old" = "Enter old password";
+"lng_cloud_password_enter_first" = "Enter a password";
+"lng_cloud_password_enter_new" = "Enter new password";
+"lng_cloud_password_confirm_new" = "Re-enter new password";
+"lng_cloud_password_hint" = "Enter password hint";
+"lng_cloud_password_bad" = "Password and hint cannot be the same.";
+"lng_cloud_password_email" = "Enter recovery e-mail";
+"lng_cloud_password_bad_email" = "Incorrect e-mail, please try other.";
+"lng_cloud_password_about" = "This password will be required when you log in on a new device in addition to the pin code.";
+"lng_cloud_password_about_recover" = "Warning! Are you sure you don't want to\nadd a password recovery e-mail?\n\nIf you forget your password, you will\nlose access to your Telegram account.";
+"lng_cloud_password_almost" = "A confirmation link was sent\nto the e-mail you provided.\n\nTwo-step verification will be enabled\nas soon as you follow that link.";
+"lng_cloud_password_was_set" = "Two-step verification enabled.";
+"lng_cloud_password_updated" = "Your cloud password was updated.";
+"lng_cloud_password_removed" = "Two-step verification was disabled.";
+"lng_cloud_password_differ" = "Passwords do not match";
+"lng_cloud_password_wrong" = "Wrong cloud password";
+"lng_cloud_password_is_same" = "Password was not changed";
+
 "lng_connection_type" = "Connection type:";
 "lng_connection_auto_connecting" = "Default (connecting..)";
 "lng_connection_auto" = "Default ({type} used)";
@@ -236,8 +310,10 @@ Copyright (c) 2014 John Preston, https://desktop.telegram.org
 "lng_connection_user_ph" = "Username";
 "lng_connection_password_ph" = "Password";
 "lng_connection_save" = "Save";
-"lng_settings_reset" = "Terminate other sessions";
-"lng_settings_reset_sure" = "Are you sure you want to terminate all other sessions?";
+"lng_settings_show_sessions" = "Show all sessions";
+"lng_settings_reset" = "Terminate all other sessions";
+"lng_settings_reset_sure" = "Are you sure you want to terminate\nall other sessions?";
+"lng_settings_reset_one_sure" = "Do you want to terminate this session?";
 "lng_settings_reset_button" = "Terminate";
 "lng_settings_reset_done" = "Other sessions terminated";
 "lng_settings_logout" = "Log Out";
@@ -247,10 +323,18 @@ Copyright (c) 2014 John Preston, https://desktop.telegram.org
 "lng_settings_restart_now" = "Restart";
 "lng_settings_restart_later" = "Later";

+"lng_sessions_header" = "Current session";
+"lng_sessions_other_header" = "Active sessions";
+"lng_sessions_no_other" = "No other sessions";
+"lng_sessions_other_desc" = "You can log in to Telegram from other\nmobile, tablet and desktop devices, using\nthe same phone number. All your data\nwill be instantly synchronized.";
+"lng_sessions_terminate_all" = "Terminate all";
+
+"lng_preview_loading" = "Getting Link Info..";
+
 "lng_profile_chat_unaccessible" = "Group is unaccessible";
 "lng_topbar_info" = "Info";
 "lng_profile_settings_section" = "Settings";
-"lng_profile_participants_section" = "Participants";
+"lng_profile_participants_section" = "Members";
 "lng_profile_info" = "Contact info";
 "lng_profile_group_info" = "Group info";
 "lng_profile_add_contact" = "Add Contact";
@@ -272,8 +356,8 @@ Copyright (c) 2014 John Preston, https://desktop.telegram.org
 "lng_profile_photos_header" = "Photos overview";
 "lng_profile_videos" = "{count:_not_used_|# video file|# video files} »";
 "lng_profile_videos_header" = "Video files overview";
-"lng_profile_documents" = "{count:_not_used_|# document|# documents} »";
-"lng_profile_documents_header" = "Documents overview";
+"lng_profile_files" = "{count:_not_used_|# file|# files} »";
+"lng_profile_files_header" = "Files overview";
 "lng_profile_audios" = "{count:_not_used_|# voice message|# voice messages} »";
 "lng_profile_audios_header" = "Voice messages overview";
 "lng_profile_show_all_types" = "Show all types";
@@ -285,35 +369,49 @@ Copyright (c) 2014 John Preston, https://desktop.telegram.org
 "lng_create_group_next" = "Next";
 "lng_create_group_title" = "New Group";

+"lng_failed_add_participant" = "Could not add user. Try again later.";
+
 "lng_sure_delete_contact" = "Are you sure, you want to delete {contact} from your contact list?";
 "lng_sure_delete_history" = "Are you sure, you want to delete all message history with {contact}?\n\nThis action cannot be undone.";

 "lng_sure_delete_and_exit" = "Are you sure, you want to delete all message history and leave «{group}»?\n\nThis action cannot be undone.";

-"lng_sure_enable_debug" = "Do you want to enable DEBUG mode?\n\nAll network events will be logged.";
-
 "lng_message_empty" = "(empty)";

 "lng_action_add_user" = "{from} added {user}";
 "lng_action_kick_user" = "{from} kicked {user}";
 "lng_action_user_left" = "{from} left the group";
 "lng_action_user_joined" = "{from} joined the group";
+"lng_action_user_joined_by_link" = "{from} joined the group via invite link";
 "lng_action_user_registered" = "{from} just joined Telegram";
 "lng_action_removed_photo" = "{from} removed group photo";
 "lng_action_changed_photo" = "{from} changed group photo";
 "lng_action_changed_title" = "{from} changed group name to «{title}»";
 "lng_action_created_chat" = "{from} created group «{title}»";

+"lng_group_invite_bad_link" = "This invite link is broken\nor it has expired.";
+"lng_group_invite_want_join" = "Do you want to join the group «{title}»?";
+"lng_group_invite_join" = "Join";
+
+"lng_group_invite_link" = "Invite link";
+"lng_group_invite_create" = "Create an invite link";
+"lng_group_invite_about" = "You can create a link for joining this group.\nAnyone who has that link can join.";
+"lng_group_invite_create_new" = "Create new link";
+"lng_group_invite_about_new" = "Current invite link will stop working\nwhen you create a new one.";
+"lng_group_invite_copied" = "Invite link was copied to clipboard.";
+"lng_group_invite_no_room" = "Unable to join this group because there are\ntoo many members in it already.";
+
 "lng_forwarded_from" = "Forwarded from";
+"lng_in_reply_to" = "In reply to";

 "lng_attach_failed" = "Failed";
-"lng_attach_file" = "Document";
+"lng_attach_file" = "File";
 "lng_attach_photo" = "Photo";

 "lng_media_type" = "Media type";
 "lng_media_type_photos" = "Photos";
 "lng_media_type_videos" = "Video files";
-"lng_media_type_documents" = "Documents";
+"lng_media_type_files" = "Files";
 "lng_media_type_audios" = "Voice messages";

 "lng_media_open_with" = "Open With";
@@ -322,11 +420,21 @@ Copyright (c) 2014 John Preston, https://desktop.telegram.org
 "lng_media_video" = "Video file";
 "lng_media_audio" = "Voice message";

+"lng_emoji_category0" = "Frequently used";
+"lng_emoji_category1" = "People";
+"lng_emoji_category2" = "Nature";
+"lng_emoji_category3" = "Food & Drink";
+"lng_emoji_category4" = "Celebration";
+"lng_emoji_category5" = "Activity";
+"lng_emoji_category6" = "Travel & Places";
+"lng_emoji_category7" = "Objects & Symbols";
+"lng_emoji_category8" = "Stickers";
+
 "lng_in_dlg_photo" = "Photo";
 "lng_in_dlg_video" = "Video";
 "lng_in_dlg_contact" = "Contact";
 "lng_in_dlg_audio" = "Audio";
-"lng_in_dlg_document" = "Document";
+"lng_in_dlg_file" = "File";
 "lng_in_dlg_sticker" = "Sticker";
 "lng_in_dlg_sticker_emoji" = "{emoji} (sticker)";

@@ -347,7 +455,7 @@ Copyright (c) 2014 John Preston, https://desktop.telegram.org
 "lng_save_photo" = "Save image";
 "lng_save_video" = "Save video";
 "lng_save_audio" = "Save audio";
-"lng_save_document" = "Save document";
+"lng_save_file" = "Save file";
 "lng_save_downloaded" = "{ready} / {total} {mb}";
 "lng_duration_and_size" = "{duration}, {size}";
 "lng_choose_images" = "Choose images";
@@ -358,6 +466,8 @@ Copyright (c) 2014 John Preston, https://desktop.telegram.org
 "lng_context_copy_email" = "Copy email address";
 "lng_context_open_hashtag" = "Search by hashtag";
 "lng_context_copy_hashtag" = "Copy hashtag";
+"lng_context_open_mention" = "Open profile";
+"lng_context_copy_mention" = "Copy username";
 "lng_context_open_image" = "Open Image";
 "lng_context_save_image" = "Save Image As..";
 "lng_context_forward_image" = "Forward Image";
@@ -371,13 +481,14 @@ Copyright (c) 2014 John Preston, https://desktop.telegram.org
 "lng_context_save_video" = "Save Video As..";
 "lng_context_open_audio" = "Open Audio";
 "lng_context_save_audio" = "Save Audio As..";
-"lng_context_open_document" = "Open File";
-"lng_context_save_document" = "Save File As..";
+"lng_context_open_file" = "Open File";
+"lng_context_save_file" = "Save File As..";
 "lng_context_forward_file" = "Forward File";
 "lng_context_delete_file" = "Delete File";
 "lng_context_close_file" = "Close File";
-"lng_context_copy_text" = "Copy Message Text";
+"lng_context_copy_text" = "Copy Text";
 "lng_context_to_msg" = "Go To Message";
+"lng_context_reply_msg" = "Reply";
 "lng_context_forward_msg" = "Forward Message";
 "lng_context_delete_msg" = "Delete Message";
 "lng_context_select_msg" = "Select Message";
@@ -398,6 +509,9 @@ Copyright (c) 2014 John Preston, https://desktop.telegram.org
 "lng_forward_send_files_confirm" = "Send selected files to {recipient}?";
 "lng_forward" = "Forward";
 "lng_forward_send" = "Send";
+"lng_forward_messages" = "{count:_not_used_|Forwarded message|# forwarded messages}";
+"lng_forwarding_from" = "{user} and {count:_not_used_|# other|# others}";
+"lng_forwarding_from_two" = "{user} and {second_user}";

 "lng_contact_phone" = "Phone number";
 "lng_enter_contact_data" = "New Contact";
@@ -418,7 +532,7 @@ Copyright (c) 2014 John Preston, https://desktop.telegram.org

 "lng_drag_to_send_quick" = "to send them in a quick way";
 "lng_drag_to_send_no_compression" = "to send them without compression";
-"lng_drag_to_send_documents" = "to send them as documents";
+"lng_drag_to_send_files" = "to send them as files";

 "lng_selected_clear" = "Cancel";
 "lng_selected_delete" = "Delete";
@@ -436,27 +550,49 @@ Copyright (c) 2014 John Preston, https://desktop.telegram.org
 "lng_search_found_results" = "{count:No messages found|Found # message|Found # messages}";
 "lng_search_global_results" = "Global search results";

-"lng_mediaview_save" = "Download";
+"lng_media_save_progress" = "{ready} of {total} {mb}";
+"lng_mediaview_save_as" = "Save As..";
+"lng_mediaview_copy" = "Copy";
 "lng_mediaview_forward" = "Forward";
 "lng_mediaview_delete" = "Delete";
+"lng_mediaview_photos_all" = "View all photos";
+"lng_mediaview_files_all" = "View all files";
 "lng_mediaview_single_photo" = "Single Photo";
 "lng_mediaview_group_photo" = "Group Photo";
 "lng_mediaview_profile_photo" = "Profile Photo";
+"lng_mediaview_file_n_of_count" = "{file} {n} of {count}";
 "lng_mediaview_n_of_count" = "Photo {n} of {count}";
-"lng_mediaview_doc_image" = "Document";
+"lng_mediaview_doc_image" = "File";
 "lng_mediaview_today" = "today at {time}";
 "lng_mediaview_yesterday" = "yesterday at {time}";
 "lng_mediaview_date_time" = "{date} at {time}";

 "lng_mediaview_saved" = "Image was saved to your [c]Downloads[/c] folder";

-"lng_new_authorization" = "{name},\nWe detected a login into your account from a new device on {day}, {date} at {time}\n\nDevice: {device}\nLocation: {location}\n\nIf this wasn't you, you can go to Settings — Terminate other sessions.\n\nThanks,\nThe Telegram Team";
+"lng_new_authorization" = "{name},\nWe detected a login into your account from a new device on {day}, {date} at {time}\n\nDevice: {device}\nLocation: {location}\n\nIf this wasn't you, you can go to Settings — Show all sessions and terminate that session.\n\nIf you think that somebody logged in to your account against your will, you can enable two-step verification in Settings.\n\nSincerely,\nThe Telegram Team";

-"lng_new_version7005" = "Telegram Desktop was updated to version {version}\n\n — Stickers support\n — Local caching for voice messages\n — Added Portuguese language\n\nFull version history is available here:\n{link}";
-"lng_new_version7006_appstore" = "Telegram Desktop was updated to version {version}\n\n — Stickers support\n — Local caching for voice messages\n — Added new languages\n\nFull version history is available here:\n{link}";
+"lng_new_version_wrap" = "Telegram Desktop was updated to version {version}\n\n{changes}\n\nFull version history is available here:\n{link}";
+"lng_new_version_minor" = "— Bug fixes and other minor improvements";
+"lng_new_version_text" = "— Invite links for group chats\n— Gray unread badge for muted conversations";
+
+"lng_menu_insert_unicode" = "Insert Unicode control character";
+
+// Wnd specific
+
+"lng_wnd_choose_program_menu" = "Choose Default Program...";
+
+"lng_wnd_menu_undo" = "Undo";
+"lng_wnd_menu_redo" = "Redo";
+
+// Linux specific
+
+"lng_linux_menu_undo" = "Undo";
+"lng_linux_menu_redo" = "Redo";

 // Mac specific

+"lng_mac_choose_program_menu" = "Other...";
+
 "lng_mac_choose_app" = "Choose Application";
 "lng_mac_choose_text" = "Choose an application to open the document \"{file}\".";
 "lng_mac_enable_filter" = "Enable:";
--- a/Telegram/Resources/style.txt
+++ b/Telegram/Resources/style.txt
@@ -21,7 +21,6 @@ semibold: 'Open Sans Semibold';
 fsize: 13px;

 spriteFile: ':/gui/art/sprite.png' / 2:':/gui/art/sprite_125x.png' / 3:':/gui/art/sprite_150x.png' / 4:':/gui/art/sprite_200x.png';
-emojisFile: ':/gui/art/emoji.png' / 2:':/gui/art/emoji_125x.png' / 3:':/gui/art/emoji_150x.png' / 4:':/gui/art/emoji_200x.png';
 emojiImgSize: 18px; // exceptional value for retina
 emojiSize: 18px;
 emojiPadding: 0px;
@@ -52,7 +51,7 @@ wndMinHeight: 480px;
 wndDefWidth: 800px;
 wndDefHeight: 600px;
 wndBG: #FFF;
-wndShadow: sprite(184px, 21px, 19px, 19px);
+wndShadow: sprite(209px, 46px, 19px, 19px);
 wndShadowShift: 1px;

 layerAlpha: 0.3;
@@ -116,10 +115,16 @@ sysRes: sysButton(sysUpd) {
 sysCls: sysButton(sysUpd) {
 	img: sprite(276px, 1px, 19px, 19px);
 }
+sysLock: sysButton(sysUpd) {
+	img: sprite(184px, 22px, 19px, 19px);
+}
+sysUnlock: sysButton(sysUpd) {
+	img: sprite(207px, 22px, 19px, 19px);
+}
 titleBackButton: iconedButton(btnDefIconed) {
-	icon: sprite(133px, 197px, 13px, 20px);
+	icon: sprite(113px, 108px, 13px, 20px);
 	iconPos: point(5px, 9px);
-	downIcon: sprite(133px, 197px, 13px, 20px);
+	downIcon: sprite(113px, 108px, 13px, 20px);
 	downIconPos: point(5px, 10px);

 	bgColor: #c4d8e9;
@@ -222,7 +227,7 @@ cbDefFlat: flatCheckbox {

 	imageRect: sprite(140px, 68px, 22px, 22px);
 	chkImageRect: sprite(115px, 68px, 22px, 22px);
-	overImageRect: sprite(140px, 68px, 22px, 22px);
+	overImageRect: sprite(190px, 68px, 22px, 22px);
 	chkOverImageRect: sprite(115px, 68px, 22px, 22px);
 	disImageRect: sprite(140px, 43px, 22px, 22px);
 	chkDisImageRect: sprite(115px, 43px, 22px, 22px);
@@ -350,8 +355,7 @@ introPointTop: 3px;
 introPointDelta: 10px;
 introPointColor: rgb(0, 0, 0);
 introPointAlpha: 0.5;
-introPointHoverColor: rgb(47, 158, 218);
-introPointHoverAlpha: 0.5;
+introPointHoverColor: #86b4e3;
 introPointStepT: transition(sineInOut);
 introPointAlphaT: transition(linear);
 introPointShowStepT: transition(easeOutCirc);
@@ -371,6 +375,7 @@ introAlphaShowFunc: transition(easeInCirc);
 introTextTop: 22px;
 introTextSize: size(400px, 93px);
 introCallSkip: 15px;
+introPwdTextSize: size(400px, 73px);

 btnIntroSep: 12px;
 btnIntroNext: flatButton(btnDefNext, btnDefBig) {
@@ -384,7 +389,7 @@ btnIntroNext: flatButton(btnDefNext, btnDefBig) {
 	width: 300px;
 }

-boxShadow: sprite(240px, 21px, 9px, 9px);
+boxShadow: sprite(230px, 46px, 9px, 9px);

 introCountry: countryInput {
 	width: 300px;
@@ -421,9 +426,11 @@ inpIntroCode: flatInput(inpDefGray) {
 inpIntroName: flatInput(inpIntroPhone) {
 	width: 192px;
 }
+inpIntroPassword: flatInput(inpIntroPhone) {
+	width: 300px;
+}

 introSelectDelta: 30px;
-introSelectMaxHeight: 550px;
 btnSelectDone: flatButton(btnDefFlat) {
 	color: btnYesColor;
 	overColor: btnYesHover;
@@ -450,6 +457,16 @@ btnSelectCancel: flatButton(btnSelectDone) {
 	downColor: btnNoHover;
 }
 btnSelectSep: #e0e0e0;
+btnRedLink: linkButton(btnDefLink) {
+	color: #d15948;
+	overColor: #d15948;
+	downColor: #db6352;
+}
+btnRedDone: flatButton(btnSelectDone) {
+	color: #d15948;
+	overColor: #d15948;
+	downColor: #db6352;
+}

 countryList: countryList {
 	notFoundColor: #aaa;//rgb(20, 136, 210);
@@ -484,8 +501,7 @@ countriesAlphaShowFunc: transition(easeInCirc);
 introErrWidth: 450px;
 introErrDuration: 200;
 introErrFunc: transition(linear);
-introErrBG: #ffa5a5;
-introErrColor: black;//#800000;
+introErrColor: black;
 introErrTop: 15px;
 introErrHeight: 40px;
 introErrFont: font(16px);
@@ -498,19 +514,20 @@ introErrLabel: flatLabel(labelDefFlat) {
 setWidth: 356px;
 setTop: 26px;
 setNameLeft: 3px;
-setNameTop: 1px;
-setNameFont: font(22px);
-setStatusTop: 39px;
-setStatusLeft: 1px;
-setStatusFont: font(16px);
+setNameTop: 5px;
+setNameFont: font(18px);
+setStatusTop: 35px;
+setStatusLeft: 3px;
+setStatusFont: font(14px);
 setPhotoSize: 120px;
-setHeaderFont: font(20px);
+setHeaderFont: font(17px);
 setHeaderColor: black;
-setHeaderSkip: 59px;
+setHeaderSkip: 60px;
 setHeaderLeft: -1px;
-setHeaderTop: 22px;
+setHeaderTop: 26px;
 setLittleSkip: 9px;
 setSectionSkip: 25px;
+setContactInfoLeft: 150px;
 setVersionHeight: 41px;
 setVersionLeft: 36px;
 setVersionTop: 3px;
@@ -554,6 +571,8 @@ setErrHeight: 30px;
 setErrFont: font(fsize);
 setGoodColor: #008000;

+setBackgroundSize: 120px;
+
 btnSetUpload: flatButton(btnDefNext, btnDefBig) {
 	width: 206px;
 	height: 42px;
@@ -635,7 +654,7 @@ dlgFilter: flatInput(inpDefGray) {
 	phColor: #949494;
 	phFocusColor: #a4a4a4;
 	textMrg: margins(34px, 2px, 34px, 4px);
-	imgRect: sprite(208px, 28px, 24px, 24px);
+	imgRect: sprite(227px, 21px, 24px, 24px);
 	imgPos: point(6px, 5px);
 	width: 240px;

@@ -671,7 +690,7 @@ dlgHistFont: font(fsize);
 dlgNameColor: #000;
 dlgNameTop: 2px;
 dlgSystemColor: #4981af;
-dlgTextColor: #888888;
+dlgTextColor: #888;

 dlgDateFont: font(13px);
 dlgDateColor: #a8a8a8;
@@ -679,6 +698,7 @@ dlgDateSkip: 5px;

 dlgUnreadColor: #FFF;
 dlgUnreadBG: #6fc766;
+dlgUnreadMutedBG: #bbb;
 dlgUnreadFont: font(12px bold);
 dlgUnreadPaddingHor: 5px;
 dlgUnreadPaddingVer: 1px;
@@ -736,8 +756,6 @@ topBarActionButton: flatButton(btnDefNext, btnDefBig) {
 }
 topBarActionSkip: 13px;

-historyBG: #dfe4e8;
-
 historyToEnd: iconedButton(btnDefIconed) {
 	bgColor: transparent;
 	overBgColor: transparent;
@@ -778,6 +796,8 @@ msgInSelectOverlay: #358cd44c;
 msgStickerOverlay: #358cd47f;
 msgOutServiceColor: #3a8e26;
 msgInServiceColor: #0e7acd;
+msgOutServiceSelColor: #367570;
+msgInServiceSelColor: #0e7acd;
 msgShadow: 2px;
 msgInShadow: #748ea229;
 msgOutShadow: #3ac34740;
@@ -788,6 +808,15 @@ msgOutDateColor: #6cc264;
 msgInSelectDateColor: #6a9cc5;
 msgOutSelectDateColor: #50a79c;

+msgReplyPadding: margins(6px, 6px, 11px, 6px);
+msgReplyBarPos: point(1px, 0px);
+msgReplyBarSize: size(2px, 36px);
+msgReplyBarSkip: 10px;
+msgOutReplyBarColor: #5dc452;
+msgInReplyBarColor: #2fa9e2;
+msgOutReplyBarSelColor: #4da79f;
+msgInReplyBarSelColor: #2fa9e2;
+
 msgServiceSelectBG: #fff4;
 msgServiceRadius: 2px;

@@ -802,10 +831,12 @@ msgLinkColor: #2a6dc2;
 msgPressedLinkColor: #004bad;
 msgSkip: 40px;
 msgPtr: 8px;
-msgBG: ':/gui/art/bg.png' / 2:':/gui/art/bg_125x.png' / 3:':/gui/art/bg_150x.png' / 4:':/gui/art/bg_200x.png';
+msgBG: ':/gui/art/bg.jpg';
+msgBG0: ':/gui/art/bg0.png';

 msgSendingRect: sprite(260px, 20px, 20px, 20px);
 msgCheckRect: sprite(320px, 0px, 20px, 20px);
+msgCheckPos: point(5px, 1px);
 msgDblCheckRect: sprite(300px, 0px, 20px, 20px);
 msgSelectCheckRect: sprite(160px, 0px, 20px, 20px);
 msgSelectDblCheckRect: sprite(140px, 0px, 20px, 20px);
@@ -872,7 +903,7 @@ introErrLabelTextStyle: textStyle(defaultTextStyle) {

 mediaMaxWidth: 250px;
 mediaFont: font(fsize);
-mediaPadding: margins(7px, 6px, 11px, 6px);
+mediaPadding: margins(7px, 6px, 7px, 6px);
 mediaThumbSize: 48px;
 mediaNameTop: 3px;
 mediaDetailsShift: 3px;
@@ -888,6 +919,12 @@ mediaInColor: msgInDateColor;
 mediaOutColor: msgOutDateColor;
 mediaInSelectColor: msgInSelectDateColor;
 mediaOutSelectColor: msgOutSelectDateColor;
+mediaOutUnreadColor: #6aad60;
+mediaOutUnreadSelectColor: #5aa382;
+mediaInUnreadColor: #999;
+mediaInUnreadSelectColor: #7b95aa;
+mediaUnreadSize: 4px;
+mediaUnreadSkip: 5px;
 mediaSaveDelta: 14px; // between bubble and download
 mediaSaveButton: flatButton(btnDefFlat) {
 	color: #507da2;
@@ -954,6 +991,25 @@ btnAttachEmoji: iconedButton(btnAttachDocument) {
 	width: 32px;
 }

+replySkip: 51px;
+replyColor: #377aae;
+replyHeight: 49px;
+replyTop: 8px;
+replyBottom: 6px;
+replyIconPos: point(13px, 13px);
+replyIcon: sprite(343px, 197px, 24px, 24px);
+replyCancel: iconedButton(btnDefIconed) {
+	icon: sprite(165px, 24px, 14px, 14px);
+	iconPos: point(17px, 17px);
+	downIcon: sprite(165px, 24px, 14px, 14px);
+	downIconPos: point(17px, 18px);
+	bgColor: white;
+	overBgColor: white;
+	width: 49px;
+	height: 49px;
+}
+forwardIcon: sprite(368px, 197px, 24px, 24px);
+
 historyScroll: flatScroll(scrollDef) {
 	barColor: #89a0b47a;
 	bgColor: #89a0b44c;
@@ -995,18 +1051,22 @@ layerPadding: margins(10px, 10px, 10px, 10px);

 boxFont: font(16px);
 boxPadding: margins(18px, 18px, 18px, 18px);
-boxBG: white;//rgb(228, 233, 240);
+boxVerticalMargin: 10px;
+
+boxWidth: 364px;
+boxMaxListHeight: 600px;
+
+boxBG: white;
 boxGrayTitle: #777;

-confirmWidth: 364px;
+boxTitlePos: point(20px, 15px);
+boxTitleFont: font(17px);
+boxTitleHeight: 52px;
+
 confirmMaxHeight: 320px;
 confirmCompressedSkip: 10px;
-addContactWidth: 364px;
 addContactPadding: margins(18px, 24px, 18px, 24px);
 addContactDelta: 14px;
-addContactTitleHeight: 52px;
-addContactTitlePos: point(20px, 15px);
-addContactTitleFont: font(17px);
 inpAddContact: flatInput(inpDefGray) {
 	height: 42px;
 	textMrg: margins(10px, 5px, 10px, 5px);
@@ -1038,6 +1098,7 @@ notifyBorder: #f1f1f1;
 notifyBorderWidth: 1px;
 notifySlowHide: 4000;
 notifyPhotoSize: 62px;
+notifyMacPhotoSize: 64px;
 notifyPhotoPos: point(9px, 9px);
 notifyClosePos: point(1px, 2px);
 notifyClose: iconedButton(btnDefIconed) {
@@ -1162,10 +1223,13 @@ profileNameInput: flatInput(setNameInput) {
 	width: 230px;
 }

-newGroupScroll: flatScroll(scrollDef) {
-	topsh: 0px;
+boxScroll: flatScroll(scrollDef) {
+	topsh: -2px;
 	bottomsh: -2px;
 }
+boxNoTopScroll: flatScroll(boxScroll) {
+	topsh: 0;
+}

 participantInnerAdd: flatButton(btnDefNext) {
 	width: 145px;
@@ -1181,14 +1245,12 @@ participantInnerCancel: flatButton(participantInnerAdd, btnDefBack) {
 participantCancel: flatButton(participantInnerAdd, btnDefBack) {
 	width: 300px;
 }
-participantWidth: 364px;
-participantMaxHeight: 600px;
 participantFilter: flatInput(inpDefFlat) {
 	width: 364px;
 	height: 52px;
 	font: font(16px);
 	textMrg: margins(39px, 11px, 10px, 10px);
-	imgRect: sprite(208px, 28px, 24px, 24px);
+	imgRect: sprite(227px, 21px, 24px, 24px);
 	imgPos: point(10px, 15px);
 }
 participantDelta: 12px;
@@ -1294,7 +1356,7 @@ aboutCloseButton: flatButton(contactsClose) {
 	downTextTop: 16px;
 }
 btnInfoClose: flatButton(aboutCloseButton) {
-	width: confirmWidth;
+	width: boxWidth;
 }

 emojiTextFont: font(16px);
@@ -1306,11 +1368,16 @@ connectingBG: #fffe;
 connectingColor: #777;
 connectingPadding: margins(5px, 5px, 5px, 5px);

-dropdownPadding: margins(10px, 10px, 10px, 10px);
-dropdownShadow: sprite(240px, 35px, 6px, 6px);
-dropdownBorder: 1px;
-dropdownBorderColor: #ebebeb;
-dropdownBackground: white;
+dropdownDef: dropdown {
+	border: 1px;
+	borderColor: #ebebeb;
+
+	padding: margins(10px, 10px, 10px, 10px);
+	shadow: sprite(241px, 46px, 6px, 6px);
+
+	duration: 150;
+	width: 0px;
+}

 dropdownAttachDocument: iconedButton(btnAttachDocument) {
 	iconPos: point(14px, 13px);
@@ -1334,15 +1401,15 @@ dropdownMediaPhotos: iconedButton(dropdownAttachPhoto) {
 	width: 200px;
 }
 dropdownMediaVideos: iconedButton(dropdownMediaPhotos) {
-	icon: sprite(79px, 348px, 24px, 24px);
-	downIcon: sprite(79px, 348px, 24px, 24px);
+	icon: sprite(92px, 348px, 24px, 24px);
+	downIcon: sprite(92px, 348px, 24px, 24px);
 }
 dropdownMediaDocuments: iconedButton(dropdownAttachDocument) {
 	width: 200px;
 }
 dropdownMediaAudios: iconedButton(dropdownMediaDocuments) {
-	icon: sprite(49px, 348px, 24px, 24px);
-	downIcon: sprite(49px, 348px, 24px, 24px);
+	icon: sprite(62px, 348px, 24px, 24px);
+	downIcon: sprite(62px, 348px, 24px, 24px);
 }

 dragFont: font(28px semibold);
@@ -1392,33 +1459,39 @@ emojiScroll: flatScroll(scrollDef) {
 	topsh: 0px;
 	bottomsh: 0px;
 }
-emojiRecentActive: sprite(290px, 287px, 20px, 20px);
-emojiRecentOver: sprite(311px, 287px, 20px, 20px);
 emojiRecent: sprite(6px, 197px, 20px, 20px);
-emojiPeopleActive: sprite(290px, 221px, 20px, 20px);
-emojiPeopleOver: sprite(311px, 221px, 20px, 20px);
+emojiRecentOver: sprite(290px, 221px, 20px, 20px);
+emojiRecentActive: sprite(290px, 242px, 20px, 20px);
 emojiPeople: sprite(27px, 197px, 20px, 20px);
-emojiNatureActive: sprite(245px, 266px, 20px, 20px);
-emojiNatureOver: sprite(266px, 266px, 20px, 20px);
+emojiPeopleOver: sprite(311px, 221px, 20px, 20px);
+emojiPeopleActive: sprite(311px, 242px, 20px, 20px);
 emojiNature: sprite(48px, 197px, 20px, 20px);
-emojiObjectsActive: sprite(290px, 242px, 20px, 20px);
-emojiObjectsOver: sprite(311px, 242px, 20px, 20px);
-emojiObjects: sprite(69px, 197px, 20px, 20px);
-emojiPlacesActive: sprite(245px, 287px, 20px, 20px);
-emojiPlacesOver: sprite(266px, 287px, 20px, 20px);
-emojiPlaces: sprite(90px, 197px, 20px, 20px);
-emojiSymbolsActive: sprite(290px, 266px, 20px, 20px);
-emojiSymbolsOver: sprite(311px, 266px, 20px, 20px);
-emojiSymbols: sprite(111px, 197px, 20px, 20px);
-emojiStickersActive: sprite(311px, 308px, 20px, 20px);
-emojiStickersOver: sprite(354px, 200px, 20px, 20px);
-emojiStickers: sprite(375px, 200px, 20px, 20px);
+emojiNatureOver: sprite(245px, 266px, 20px, 20px);
+emojiNatureActive: sprite(245px, 287px, 20px, 20px);
+emojiFood: sprite(69px, 197px, 20px, 20px);
+emojiFoodOver: sprite(266px, 266px, 20px, 20px);
+emojiFoodActive: sprite(266px, 287px, 20px, 20px);
+emojiCelebration: sprite(90px, 197px, 20px, 20px);
+emojiCelebrationOver: sprite(290px, 266px, 20px, 20px);
+emojiCelebrationActive: sprite(290px, 287px, 20px, 20px);
+emojiActivity: sprite(111px, 197px, 20px, 20px);
+emojiActivityOver: sprite(311px, 266px, 20px, 20px);
+emojiActivityActive: sprite(311px, 287px, 20px, 20px);
+emojiTravel: sprite(132px, 197px, 20px, 20px);
+emojiTravelOver: sprite(321px, 344px, 20px, 20px);
+emojiTravelActive: sprite(321px, 365px, 20px, 20px);
+emojiObjects: sprite(153px, 197px, 20px, 20px);
+emojiObjectsOver: sprite(342px, 344px, 20px, 20px);
+emojiObjectsActive: sprite(342px, 365px, 20px, 20px);
+emojiStickers: sprite(174px, 197px, 20px, 20px);
+emojiStickersOver: sprite(363px, 344px, 20px, 20px);
+emojiStickersActive: sprite(363px, 365px, 20px, 20px);
 rbEmoji: flatCheckbox {
 	textColor: transparent;
 	bgColor: transparent;
 	disColor: transparent;

-	width: 29px;
+	width: 28px;
 	height: 36px;

 	textTop: 0px;
@@ -1455,6 +1528,38 @@ rbEmojiNature: flatCheckbox(rbEmoji) {
 	disImageRect: emojiNature;
 	chkDisImageRect: emojiNatureActive;
 }
+rbEmojiFood: flatCheckbox(rbEmoji) {
+	imageRect: emojiFood;
+	chkImageRect: emojiFoodActive;
+	overImageRect: emojiFoodOver;
+	chkOverImageRect: emojiFoodActive;
+	disImageRect: emojiFood;
+	chkDisImageRect: emojiFoodActive;
+}
+rbEmojiCelebration: flatCheckbox(rbEmoji) {
+	imageRect: emojiCelebration;
+	chkImageRect: emojiCelebrationActive;
+	overImageRect: emojiCelebrationOver;
+	chkOverImageRect: emojiCelebrationActive;
+	disImageRect: emojiCelebration;
+	chkDisImageRect: emojiCelebrationActive;
+}
+rbEmojiActivity: flatCheckbox(rbEmoji) {
+	imageRect: emojiActivity;
+	chkImageRect: emojiActivityActive;
+	overImageRect: emojiActivityOver;
+	chkOverImageRect: emojiActivityActive;
+	disImageRect: emojiActivity;
+	chkDisImageRect: emojiActivityActive;
+}
+rbEmojiTravel: flatCheckbox(rbEmoji) {
+	imageRect: emojiTravel;
+	chkImageRect: emojiTravelActive;
+	overImageRect: emojiTravelOver;
+	chkOverImageRect: emojiTravelActive;
+	disImageRect: emojiTravel;
+	chkDisImageRect: emojiTravelActive;
+}
 rbEmojiObjects: flatCheckbox(rbEmoji) {
 	imageRect: emojiObjects;
 	chkImageRect: emojiObjectsActive;
@@ -1463,22 +1568,6 @@ rbEmojiObjects: flatCheckbox(rbEmoji) {
 	disImageRect: emojiObjects;
 	chkDisImageRect: emojiObjectsActive;
 }
-rbEmojiPlaces: flatCheckbox(rbEmoji) {
-	imageRect: emojiPlaces;
-	chkImageRect: emojiPlacesActive;
-	overImageRect: emojiPlacesOver;
-	chkOverImageRect: emojiPlacesActive;
-	disImageRect: emojiPlaces;
-	chkDisImageRect: emojiPlacesActive;
-}
-rbEmojiSymbols: flatCheckbox(rbEmoji) {
-	imageRect: emojiSymbols;
-	chkImageRect: emojiSymbolsActive;
-	overImageRect: emojiSymbolsOver;
-	chkOverImageRect: emojiSymbolsActive;
-	disImageRect: emojiSymbols;
-	chkDisImageRect: emojiSymbolsActive;
-}
 rbEmojiStickers: flatCheckbox(rbEmojiRecent) {
 	imageRect: emojiStickers;
 	chkImageRect: emojiStickersActive;
@@ -1488,31 +1577,115 @@ rbEmojiStickers: flatCheckbox(rbEmojiRecent) {
 	chkDisImageRect: emojiStickersActive;
 }
 emojiPanPadding: margins(5px, 0px, 0px, 5px);
-emojiPanSize: size(28px, 28px);
-emojiPanSub: 0px;
+emojiPanSize: size(35px, 35px);
 emojiPanDuration: 200;
 emojiPanHover: #f0f0f0;
 emojiPanRound: 2px;

+emojiPanHeader: 25px;
+emojiPanHeaderFont: font(fsize semibold);
+emojiPanHeaderColor: #999;
+emojiPanHeaderLeft: 5px;
+emojiPanHeaderTop: 5px;
+emojiPanHeaderBg: #fffd;
+
+emojiColorsPadding: 5px;
+emojiColorsSep: 1px;
+emojiColorsSepColor: #d5d5d5;
+
 stickerPanRound: 3px;
 stickerPanPadding: 2px;
-stickerPanDelete: sprite(158px, 197px, 12px, 12px);
+stickerPanDelete: sprite(123px, 132px, 12px, 12px);
 stickerPanDeleteOpacity: 0.5;

-medviewNavBarWidth: 132px;
-medviewLightNav: 0.5;
-medviewDarkNav: 1;
-medviewHeaderFont: font(semibold 18px);
-medviewNameFont: font(16px);
-medviewDateFont: font(14px);
-medviewNameTop: 13px;
-medviewDateTop: 39px;
-medviewLeft: sprite(340px, 79px, 28px, 48px);
-medviewRight: sprite(368px, 79px, 28px, 48px);
-medviewDeltaFromLastAction: 5px;
-medviewSwipeDistance: 80px;
+mvBgColor: #222;
+mvBgOpacity: 0.92;
+mvThickFont: font(fsize semibold);
+mvFont: font(fsize);

-medviewSaveMsgCheck: sprite(341px, 174px, 22px, 18px);
+mvTextLeft: 16px;
+mvTextSkip: 10px;
+mvHeaderTop: 48px;
+mvTextTop: 24px;
+mvTextColor: white;
+mvTextOpacity: 0.5;
+mvTextOverOpacity: 1;
+
+mvIconOpacity: 0.45;
+mvIconOverOpacity: 1;
+mvControlBgColor: black;
+mvControlBgOpacity: 0.3;
+mvControlMargin: 0px;
+mvControlSize: 90px;
+mvIconSize: size(60px, 56px);
+
+mvLeft: sprite(320px, 400px, 12px, 22px);
+mvRight: sprite(332px, 400px, 12px, 22px);
+mvClose: sprite(344px, 400px, 18px, 18px);
+mvSave: sprite(362px, 400px, 14px, 19px);
+mvMore: sprite(376px, 400px, 5px, 21px);
+
+mvDropdown: dropdown(dropdownDef) {
+	shadow: sprite(0px, 0px, 0px, 0px);
+	padding: margins(11px, 12px, 11px, 12px);
+
+	border: 0;
+	width: 182px;
+}
+mvButton: iconedButton(btnDefIconed) {
+	bgColor: #383838;
+	overBgColor: #505050;
+	font: font(fsize);
+
+	opacity: 1;
+	overOpacity: 1;
+
+	width: -32px;
+	height: 36px;
+
+	color: white;
+
+	textPos: point(16px, 9px);
+	downTextPos: point(16px, 10px);
+
+	duration: 0;
+}
+mvContextButton: iconedButton(mvButton) {
+	bgColor: #383838E6;
+	overBgColor: #505050E7;
+}
+mvWaitHide: 2000;
+mvHideDuration: 1000;
+mvShowDuration: 200;
+mvFadeDuration: 150;
+
+mvDocPadding: 18px;
+mvDocSize: size(340px, 116px);
+mvDocBg: white;
+mvDocNameTop: 4px;
+mvDocNameFont: font(semibold 14px);
+mvDocNameColor: black;
+mvDocSizeTop: 29px;
+mvDocSizeColor: #808080;
+mvDocExtTop: 35px;
+mvDocExtFont: font(semibold 18px);
+mvDocExtColor: white;
+mvDocExtPadding: 10px;
+mvDocLinksTop: 57px;
+mvDocRed: sprite(0px, 400px, 80px, 80px);
+mvDocYellow: sprite(80px, 400px, 80px, 80px);
+mvDocGreen: sprite(160px, 400px, 80px, 80px);
+mvDocBlue: sprite(240px, 400px, 80px, 80px);
+mvDocLink: linkButton(btnDefLink) {
+	color: #4595d3;
+	overColor: #4595d3;
+	downColor: #4595d3;
+}
+
+mvDeltaFromLastAction: 5px;
+mvSwipeDistance: 80px;
+
+medviewSaveMsgCheck: sprite(311px, 309px, 22px, 18px);
 medviewSaveMsgFont: font(16px);
 medviewSaveMsgPadding: margins(55px, 19px, 29px, 20px);
 medviewSaveMsgCheckPos: point(23px, 21px);
@@ -1522,87 +1695,7 @@ medviewSaveMsgShown: 2000;
 medviewSaveMsgHiding: 2500;
 medviewSaveMsg: #000000b2;

-medviewOverview: iconedButton(btnDefIconed) {
-	bgColor: #0000;
-	overBgColor: #00000040;
-	font: font(16px);
-
-	opacity: 0.77;
-	overOpacity: 1;
-
-	icon: sprite(340px, 129px, 19px, 19px);
-	iconPos: point(16px, 14px);
-	downIcon: sprite(340px, 129px, 19px, 19px);
-	downIconPos: point(16px, 14px);
-
-	width: -69px;
-	height: 47px;
-
-	color: white;
-
-	textPos: point(51px, 13px);
-	downTextPos: point(51px, 14px);
-}
-medviewForward: iconedButton(medviewOverview) {
-	icon: sprite(357px, 58px, 22px, 17px);
-	iconPos: point(16px, 15px);
-	downIcon: sprite(357px, 58px, 22px, 17px);
-	downIconPos: point(16px, 15px);
-
-	width: -69px;
-}
-medviewDelete: iconedButton(medviewForward) {
-	icon: sprite(340px, 58px, 15px, 19px);
-	iconPos: point(16px, 14px);
-	downIcon: sprite(340px, 58px, 15px, 19px);
-	downIconPos: point(16px, 14px);
-}
-medviewClose: iconedButton(medviewOverview) {
-	icon: sprite(340px, 0px, 56px, 56px);
-	iconPos: point(0px, 0px);
-	downIcon: sprite(340px, 0px, 56px, 56px);
-	downIconPos: point(0px, 0px);
-
-	opacity: 0.6;
-
-	width: 56px;
-	height: 56px;
-}
-medviewBottomBar: 87px;
-medviewBG: #272727D9;
-medviewBottomBG: #272727;
-medviewNavOpacity: 0.6;
-medviewCloseOpacity: 0.6;
-medviewNavBGOpacity: 0.4;
-medviewNavOverOpacity: 1;
-medviewCloseOverOpacity: 1;
-medviewNameColor: black;
-medviewDateColor: #999;
-medviewSaveAs: iconedButton(medviewOverview) {
-	bgColor: #38abe6;
-	overBgColor: #299fdc;
-
-	opacity: 1;
-
-	icon: sprite(361px, 129px, 12px, 19px);
-	iconPos: point(18px, 15px);
-	downIcon: sprite(361px, 129px, 12px, 19px);
-	downIconPos: point(18px, 15px);
-
-	width: -62px;
-	height: 47px;
-
-	textPos: point(44px, 13px);
-	downTextPos: point(44px, 14px);
-}
-medviewSaveAsDisabledOpacity: 0.8;
-medviewPolaroid: margins(17px, 18px, 17px, 72px);
-medviewPolaroidMin: size(480px, 360px);
-medviewDocumentSprite: sprite(341px, 150px, 20px, 22px);
-medviewDocumentSpritePos: point(16px, 13px);
-medviewPhotoSprite: sprite(363px, 150px, 23px, 20px);
-medviewPhotoSpritePos: point(14px, 14px);
-medviewTransparentBrush: sprite(148px, 197px, 8px, 8px);
+mvTransparentBrush: sprite(113px, 128px, 8px, 8px);

 overviewPhotoSkip: 10px;
 overviewPhotoMinSize: 100px;
@@ -1648,6 +1741,16 @@ photoLoaderDuration1: 150; // ms fade in
 photoLoaderDuration2: 150; // ms fade out
 photoLoaderAlphaMin: 0.1; // not less than that

+radialSize: size(50px, 50px);
+radialLine: 2px;
+radialDuration: 350;
+radialPeriod: 3000;
+radialBgOpacity: 0.4;
+radialDownload: sprite(346px, 0px, 50px, 50px);
+radialDownloadOpacity: 0.8;
+radialCancel: sprite(378px, 50px, 18px, 18px);
+radialCancelOpacity: 0.7;
+
 overviewLoader: size(34px, 14px);
 overviewLoaderPoint: size(4px, 4px);
 overviewLoaderSkip: 4px;
@@ -1676,6 +1779,7 @@ usernameCancel: flatButton(btnSelectCancel) {

 youtubeIcon: sprite(336px, 221px, 60px, 60px);
 vimeoIcon: sprite(336px, 283px, 60px, 60px);
+videoIcon: sprite(0px, 340px, 60px, 60px);
 locationSize: size(320, 240);

 langsWidth: 220px;
@@ -1687,3 +1791,58 @@ langButton: flatCheckbox(rbDefFlat) {
 langsCloseButton: flatButton(aboutCloseButton) {
 	width: langsWidth;
 }
+
+backgroundPadding: 10px;
+backgroundSize: size(108px, 193px);
+
+passcodeHeaderFont: font(19px);
+passcodeHeaderHeight: 80px;
+passcodeSkip: 40px;
+passcodeInput: flatInput(inpIntroPhone) {
+}
+passcodeSubmit: flatButton(btnIntroNext) {
+	textTop: 15px;
+	overTextTop: 15px;
+	downTextTop: 16px;
+	width: 225px;
+	font: font(19px);
+	overFont: font(19px);
+}
+
+mentionHeight: 40px;
+mentionScroll: flatScroll(scrollDef) {
+	topsh: 0;
+	bottomsh: 0;
+}
+mentionPadding: margins(8px, 5px, 8px, 5px);
+mentionTop: 11px;
+mentionFont: linkFont;
+mentionPhotoSize: msgPhotoSize;
+
+sessionsHeight: 440px;
+sessionHeight: 70px;
+sessionPadding: margins(20px, 10px, 20px, 0);
+sessionsCloseButton: flatButton(aboutCloseButton) {
+	width: boxWidth;
+}
+sessionNameFont: msgNameFont;
+sessionActiveFont: msgDateFont;
+sessionActiveColor: #aaa;
+sessionInfoFont: msgFont;
+sessionInfoColor: dlgTextColor;
+sessionTerminateTop: 30px;
+sessionTerminateSkip: 10px;
+sessionTerminate: iconedButton(notifyClose) {
+	iconPos: point(3px, 3px);
+	downIconPos: point(3px, 4px);
+	width: 16px;
+	height: 16px;
+}
+
+webPageLeft: 10px;
+webPageBar: 2px;
+webPageTitleFont: font(fsize semibold);
+webPageDescriptionFont: font(fsize);
+webPagePhotoSkip: 5px;
+webPagePhotoSize: 100px;
+webPagePhotoDelta: 8px;
--- a/Telegram/Resources/style_classes.txt
+++ b/Telegram/Resources/style_classes.txt
@@ -246,3 +246,14 @@ switcher {

 	duration: number;
 }
+
+dropdown {
+	border: number;
+	borderColor: color;
+
+	padding: margins;
+	shadow: sprite;
+
+	duration: number;
+	width: number;
+}
--- a/Telegram/Setup.iss
+++ b/Telegram/Setup.iss
@@ -24,7 +24,7 @@ DefaultDirName={userappdata}\{#MyAppName}
 DefaultGroupName={#MyAppName}
 AllowNoIcons=yes
 OutputDir=.\..\Win32\Deploy
-OutputBaseFilename=tsetup.{#MyAppVersionZero}
+OutputBaseFilename=tsetup.{#MyAppVersionForExe}
 SetupIconFile=.\SourceFiles\art\icon256.ico
 UninstallDisplayIcon={app}\Telegram.exe
 Compression=lzma
@@ -61,6 +61,7 @@ Type: files; Name: "{app}\log.txt"
 Type: filesandordirs; Name: "{app}\DebugLogs"
 Type: filesandordirs; Name: "{app}\tupdates"
 Type: filesandordirs; Name: "{app}\tdata"
+Type: filesandordirs; Name: "{app}\tcache"
 Type: filesandordirs; Name: "{app}\tdumps"
 Type: dirifempty; Name: "{app}"
 Type: files; Name: "{userappdata}\{#MyAppName}\data"
@@ -69,6 +70,7 @@ Type: files; Name: "{userappdata}\{#MyAppName}\log.txt"
 Type: filesandordirs; Name: "{userappdata}\{#MyAppName}\DebugLogs"
 Type: filesandordirs; Name: "{userappdata}\{#MyAppName}\tupdates"
 Type: filesandordirs; Name: "{userappdata}\{#MyAppName}\tdata"
+Type: filesandordirs; Name: "{userappdata}\{#MyAppName}\tcache"
 Type: filesandordirs; Name: "{userappdata}\{#MyAppName}\tdumps"
 Type: dirifempty; Name: "{userappdata}\{#MyAppName}"

--- a/Telegram/SourceFiles/_other/genemoji.cpp
+++ b/Telegram/SourceFiles/_other/genemoji.cpp
--- a/Telegram/SourceFiles/_other/genstyles.cpp
+++ b/Telegram/SourceFiles/_other/genstyles.cpp
@@ -448,6 +448,7 @@ static const char *variantNames[] = { "dbisOne", "dbisOneAndQuarter", "dbisOneAn
 static const char *variantPostfixes[] = { "", "_125x", "_150x", "_200x" };
 QPixmap *spriteMax = 0;
 QImage *variantSprites = 0;
+int *spriteWidths = 0;
 QImage *variantGrids = 0;

 void readStyleGenToken(const char *&from, const char *end, StyleGenTokenType &tokenType, string &token) {
@@ -1353,17 +1354,22 @@ bool genStyles(const QString &classes_in, const QString &classes_out, const QStr
 	}

 	QImage sprites[variantsCount];
+	int widths[variantsCount] = { 0 };
 	variantSprites = sprites;
+	spriteWidths = widths;

 	QString sprite0(path_to_sprites + "sprite" + QString(variantPostfixes[0]) + ".png"), spriteLast(path_to_sprites + "sprite" + QString(variantPostfixes[variantsCount - 1]) + ".png");
 	variantSprites[0] = QImage(sprite0);
+	spriteWidths[0] = variantSprites[0].width();
 	for (int i = 1; i < variantsCount - 1; ++i) {
 		variantSprites[i] = QImage(adjustPx(variants[i], variantSprites[0].width(), true), adjustPx(variants[i], variantSprites[0].height(), true), QImage::Format_ARGB32_Premultiplied);
+		spriteWidths[i] = variantSprites[i].width();
 		QPainter p(&variantSprites[i]);
 		p.setCompositionMode(QPainter::CompositionMode_Source);
 		p.fillRect(0, 0, variantSprites[i].width(), variantSprites[i].height(), Qt::transparent);
 	}
 	variantSprites[variantsCount - 1] = QImage(spriteLast);
+	spriteWidths[variantsCount - 1] = variantSprites[variantsCount - 1].width();

 	QPixmap spriteMaxPix = QPixmap::fromImage(variantSprites[variantsCount - 1], Qt::ColorOnly);
 	spriteMax = &spriteMaxPix;
@@ -1567,11 +1573,13 @@ Copyright (c) 2014 John Preston, https://desktop.telegram.org\n\
 			tcpp << "\nnamespace style {\n\n";
 			tcpp << "\tFontFamilies _fontFamilies;\n";
 			tcpp << "\tFontDatas _fontsMap;\n";
-			tcpp << "\tColorDatas _colorsMap;\n\n";
+			tcpp << "\tColorDatas _colorsMap;\n";
+			tcpp << "int _spriteWidth = " << spriteWidths[0] << ";\n\n";
 			tcpp << "\tvoid startManager() {\n";
            
            tcpp << "\n\t\tif (cRetina()) {\n";
-            tcpp << "\t\t\tcSetRealScale(dbisOne);\n\n";
+			tcpp << "\t\t\tcSetRealScale(dbisOne);\n";
+			tcpp << "\t\t\t_spriteWidth = " << spriteWidths[variantsCount - 1] << ";\n\n";
            for (int i = 0, l = scalars.size(); i < l; ++i) {
                Scalar &sc(scalars[i]);
                if (sc.second.first == scSprite || sc.first == "spriteFile" || sc.first == "emojisFile" || sc.first == "emojiImgSize") {
@@ -1594,6 +1602,7 @@ Copyright (c) 2014 John Preston, https://desktop.telegram.org\n\
 				const char *varName = variantNames[i];

 				tcpp << "\t\tcase " << varName << ":\n";
+				tcpp << "\t\t\t_spriteWidth = " << spriteWidths[i] << ";\n\n";

 				typedef QMap<string, int> FontFamilies;
 				FontFamilies fontFamilies;
--- a/Telegram/SourceFiles/_other/packer.cpp
+++ b/Telegram/SourceFiles/_other/packer.cpp
@@ -32,6 +32,8 @@ Q_IMPORT_PLUGIN(QWbmpPlugin)
 Q_IMPORT_PLUGIN(QWebpPlugin)
 #endif

+bool DevChannel = false;
+
 const char *publicKey = "\
 -----BEGIN RSA PUBLIC KEY-----\n\
 MIGJAoGBAMA4ViQrjkPZ9xj0lrer3r23JvxOnrtE8nI69XLGSr+sRERz9YnUptnU\n\
@@ -40,8 +42,17 @@ BZpkIfKaRcl6XzNJiN28cVwO1Ui5JSa814UAiDHzWUqCaXUiUEQ6NmNTneiGx2sQ\n\
 -----END RSA PUBLIC KEY-----\
 ";

+const char *publicDevKey = "\
+-----BEGIN RSA PUBLIC KEY-----\n\
+MIGJAoGBALWu9GGs0HED7KG7BM73CFZ6o0xufKBRQsdnq3lwA8nFQEvmdu+g/I1j\n\
+0LQ+0IQO7GW4jAgzF/4+soPDb6uHQeNFrlVx1JS9DZGhhjZ5rf65yg11nTCIHZCG\n\
+w/CVnbwQOw0g5GBwwFV3r0uTTvy44xx8XXxk+Qknu4eBCsmrAFNnAgMBAAE=\n\
+-----END RSA PUBLIC KEY-----\
+";
+
 extern const char *privateKey;
-#include "../../../../TelegramPrivate/packer_private.h" // RSA PRIVATE KEY for update signing
+extern const char *privateDevKey;
+#include "../../../../TelegramPrivate/packer_private.h" // RSA PRIVATE KEYS for update signing

 // sha1 hash
 typedef unsigned char uchar;
@@ -151,6 +162,8 @@ int main(int argc, char *argv[])
 			if (remove.isEmpty()) remove = info.canonicalPath() + "/";
 		} else if (string("-version") == argv[i] && i + 1 < argc) {
 			version = QString(argv[i + 1]).toInt();
+		} else if (string("-dev") == argv[i]) {
+			DevChannel = true;
 		}
 	}

@@ -240,7 +253,12 @@ int main(int argc, char *argv[])

 	size_t compressedLen = compressed.size() - hSize;
 	size_t outPropsSize = LZMA_PROPS_SIZE;
-	int res = LzmaCompress((uchar*)(compressed.data() + hSize), &compressedLen, (const uchar*)(result.constData()), result.size(), (uchar*)(compressed.data() + hSigLen + hShaLen), &outPropsSize, 9, 64 * 1024 * 1024, 0, 0, 0, 0, 0);
+	uchar *_dest = (uchar*)(compressed.data() + hSize);
+	size_t *_destLen = &compressedLen;
+	const uchar *_src = (const uchar*)(result.constData());
+	size_t _srcLen = result.size();
+	uchar *_outProps = (uchar*)(compressed.data() + hSigLen + hShaLen);
+	int res = LzmaCompress(_dest, _destLen, _src, _srcLen, _outProps, &outPropsSize, 9, 64 * 1024 * 1024, 4, 0, 2, 273, 2);
 	if (res != SZ_OK) {
 		cout << "Error in compression: " << res << "\n";
 		return -1;
@@ -388,7 +406,7 @@ int main(int argc, char *argv[])
 	uint32 siglen = 0;

 	cout << "Signing..\n";
-	RSA *prKey = PEM_read_bio_RSAPrivateKey(BIO_new_mem_buf(const_cast<char*>(privateKey), -1), 0, 0, 0);
+	RSA *prKey = PEM_read_bio_RSAPrivateKey(BIO_new_mem_buf(const_cast<char*>(DevChannel ? privateDevKey : privateKey), -1), 0, 0, 0);
 	if (!prKey) {
 		cout << "Could not read RSA private key!\n";
 		return -1;
@@ -411,7 +429,7 @@ int main(int argc, char *argv[])
 	}

 	cout << "Checking signature..\n";
-	RSA *pbKey = PEM_read_bio_RSAPublicKey(BIO_new_mem_buf(const_cast<char*>(publicKey), -1), 0, 0, 0);
+	RSA *pbKey = PEM_read_bio_RSAPublicKey(BIO_new_mem_buf(const_cast<char*>(DevChannel ? publicDevKey : publicKey), -1), 0, 0, 0);
 	if (!pbKey) {
 		cout << "Could not read RSA public key!\n";
 		return -1;
--- a/Telegram/SourceFiles/_other/prepare.cpp
+++ b/Telegram/SourceFiles/_other/prepare.cpp
@@ -1,98 +0,0 @@
-/*
-This file is part of Telegram Desktop,
-the official desktop version of Telegram messaging app, see https://telegram.org
-
-Telegram Desktop is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-It is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE
-Copyright (c) 2014 John Preston, https://desktop.telegram.org
-*/
-#include "prepare.h"
-
-int prepare(QFileInfo f, QStringList paths) {
-	if (paths.isEmpty()) {
-		cout << "No -path args were passed :(\n";
-		return -1;
-	}
-
-	int lastVersion = 0;
-	QString lastVersionStr;
-	QFileInfo last;
-	QFileInfoList l = f.absoluteDir().entryInfoList(QDir::Files);
-	for (QFileInfoList::iterator i = l.begin(), e = l.end(); i != e; ++i) {
-		QRegularExpressionMatch m = QRegularExpression("/tsetup.((\\d+).(\\d+).(\\d+)).exe$").match(i->absoluteFilePath());
-		if (!m.hasMatch()) continue;
-
-		int version = m.captured(2).toInt() * 1000000 + m.captured(3).toInt() * 1000 + m.captured(4).toInt();
-		if (version > lastVersion) {
-			lastVersion = version;
-			lastVersionStr = m.captured(1);
-			last = *i;
-		}
-	}
-
-	if (!lastVersion) {
-		cout << "No tsetup.X.Y.Z.exe found :(\n";
-		return -1;
-	}
-
-	cout << "Last version: " << lastVersionStr.toUtf8().constData() << " (" << lastVersion << "), executing packer..\n";
-
-	QDir dir("deploy/" + lastVersionStr);
-	if (dir.exists()) {
-		cout << "Version " << lastVersionStr.toUtf8().constData() << " already exists in /deploy..\n";
-		return -1;
-	}
-
-	QString packer = QString("Packer.exe -version %1").arg(lastVersion);
-	for (QStringList::iterator i = paths.begin(), e = paths.end(); i != e; ++i) {
-		packer += " -path " + *i;
-	}
-
-	int res = system(packer.toUtf8().constData());
-
-	if (res) return res;
-
-	dir.mkpath(".");
-
-	paths.push_back("Telegram.pdb");
-	paths.push_back("Updater.pdb");
-	paths.push_back("tsetup." + lastVersionStr + ".exe");
-	paths.push_back(QString("tupdate%1").arg(lastVersion));
-	for (QStringList::iterator i = paths.begin(), e = paths.end(); i != e; ++i) {
-		if (!QFile::copy(*i, "deploy/" + lastVersionStr + "/" + *i)) {
-			cout << "Could not copy " << i->toUtf8().constData() << " to deploy/" << lastVersionStr.toUtf8().constData() << "\n";
-			return -1;
-		}
-		cout << "Copied " << i->toUtf8().constData() << "..\n";
-	}
-	for (QStringList::iterator i = paths.begin(), e = paths.end(); i != e; ++i) {
-		QFile::remove(*i);
-	}
-
-	cout << "Update created in deploy/" << lastVersionStr.toUtf8().constData() << "\n";
-
-	return 0;
-}
-
-int main(int argc, char *argv[])
-{
-	QFileInfo f(argv[0]);
-
-	QStringList paths;
-	for (int i = 1; i < argc; ++i) {
-		if (string(argv[i]) == "-path" && i + 1 < argc) {
-			paths.push_back(QString(argv[i + 1]));
-		}
-	}
-	int res = prepare(f, paths);
-	return res;
-}
--- a/Telegram/SourceFiles/_other/updater.cpp
+++ b/Telegram/SourceFiles/_other/updater.cpp
@@ -314,7 +314,7 @@ int APIENTRY WinMain(HINSTANCE instance, HINSTANCE prevInstance, LPSTR cmdParama
 	LPWSTR *args;
 	int argsCount;

-	bool needupdate = false, autostart = false, debug = false, writeprotected = false;
+	bool needupdate = false, autostart = false, debug = false, writeprotected = false, startintray = false, testmode = false;
 	args = CommandLineToArgvW(GetCommandLine(), &argsCount);
 	if (args) {
 		for (int i = 1; i < argsCount; ++i) {
@@ -325,6 +325,10 @@ int APIENTRY WinMain(HINSTANCE instance, HINSTANCE prevInstance, LPSTR cmdParama
 			} else if (equal(args[i], L"-debug")) {
 				debug = _debug = true;
 				openLog();
+			} else if (equal(args[i], L"-startintray")) {
+				startintray = true;
+			} else if (equal(args[i], L"-testmode")) {
+				testmode = true;
 			} else if (equal(args[i], L"-writeprotected") && ++i < argsCount) {
 				writeprotected = true;
 				updateTo = args[i];
@@ -373,6 +377,8 @@ int APIENTRY WinMain(HINSTANCE instance, HINSTANCE prevInstance, LPSTR cmdParama
 	wstring targs;
 	if (autostart) targs += L" -autostart";
 	if (debug) targs += L" -debug";
+	if (startintray) targs += L" -startintray";
+	if (testmode) targs += L" -testmode";

 	bool executed = false;
 	if (writeprotected) { // run un-elevated
--- a/Telegram/SourceFiles/_other/updater_linux.cpp
+++ b/Telegram/SourceFiles/_other/updater_linux.cpp
@@ -303,7 +303,7 @@ int main(int argc, char *argv[]) {

    writeLog("Updater started..");

-    bool needupdate = true, autostart = false, debug = false, tosettings = false;
+    bool needupdate = true, autostart = false, debug = false, tosettings = false, startintray = false, testmode = false;

    char *key = 0;
    for (int i = 1; i < argc; ++i) {
@@ -311,9 +311,13 @@ int main(int argc, char *argv[]) {
            needupdate = false;
        } else if (equal(argv[i], "-autostart")) {
            autostart = true;
-        } else if (equal(argv[i], "-debug")) {
-            debug = _debug = true;
-            openLog();
+		} else if (equal(argv[i], "-debug")) {
+			debug = _debug = true;
+			openLog();
+		} else if (equal(argv[i], "-startintray")) {
+			startintray = true;
+		} else if (equal(argv[i], "-testmode")) {
+			testmode = true;
        } else if (equal(argv[i], "-tosettings")) {
            tosettings = true;
        } else if (equal(argv[i], "-key") && ++i < argc) {
@@ -377,12 +381,14 @@ int main(int argc, char *argv[]) {
    char path[MaxLen] = {0};
    strcpy(path, (exeDir + "Telegram").c_str());

-    char *args[MaxArgsCount] = {0}, p_noupdate[] = "-noupdate", p_autostart[] = "-autostart", p_debug[] = "-debug", p_tosettings[] = "-tosettings", p_key[] = "-key";
+    char *args[MaxArgsCount] = {0}, p_noupdate[] = "-noupdate", p_autostart[] = "-autostart", p_debug[] = "-debug", p_tosettings[] = "-tosettings", p_key[] = "-key", p_startintray[] = "-startintray", p_testmode[] = "-testmode";
    int argIndex = 0;
    args[argIndex++] = path;
    args[argIndex++] = p_noupdate;
    if (autostart) args[argIndex++] = p_autostart;
    if (debug) args[argIndex++] = p_debug;
+	if (startintray) args[argIndex++] = p_startintray;
+	if (testmode) args[argIndex++] = p_testmode;
    if (tosettings) args[argIndex++] = p_tosettings;
    if (key) {
        args[argIndex++] = p_key;
--- a/Telegram/SourceFiles/_other/updater_osx.m
+++ b/Telegram/SourceFiles/_other/updater_osx.m
@@ -78,7 +78,7 @@ int main(int argc, const char * argv[]) {

 	openLog();
 	pid_t procId = 0;
-	BOOL update = YES, toSettings = NO, autoStart = NO;
+	BOOL update = YES, toSettings = NO, autoStart = NO, startInTray = NO, testMode = NO;
 	NSString *key = nil;
 	for (int i = 0; i < argc; ++i) {
 		if ([@"-workpath" isEqualToString:[NSString stringWithUTF8String:argv[i]]]) {
@@ -99,6 +99,10 @@ int main(int argc, const char * argv[]) {
 			autoStart = YES;
 		} else if ([@"-debug" isEqualToString:[NSString stringWithUTF8String:argv[i]]]) {
 			_debug = YES;
+		} else if ([@"-startintray" isEqualToString:[NSString stringWithUTF8String:argv[i]]]) {
+			startInTray = YES;
+		} else if ([@"-testmode" isEqualToString:[NSString stringWithUTF8String:argv[i]]]) {
+			testMode = YES;
 		} else if ([@"-key" isEqualToString:[NSString stringWithUTF8String:argv[i]]]) {
 			if (++i < argc) key = [NSString stringWithUTF8String:argv[i]];
 		}
@@ -128,7 +132,7 @@ int main(int argc, const char * argv[]) {
 	}

 	if (update) {
-		writeLog(@"Starting update files iteration!");
+		writeLog([@"Starting update files iteration, path: " stringByAppendingString: [workDir stringByAppendingString:@"tupdates/ready"]]);

 		NSFileManager *fileManager = [NSFileManager defaultManager];
 		NSString *srcDir = [workDir stringByAppendingString:@"tupdates/ready/"];
@@ -138,6 +142,7 @@ int main(int argc, const char * argv[]) {
 											 includingPropertiesForKeys:keys
 											 options:0
 											 errorHandler:^(NSURL *url, NSError *error) {
+												 writeLog([[[@"Error in enumerating " stringByAppendingString:[url absoluteString]] stringByAppendingString: @" error is: "] stringByAppendingString: [error description]]);
 												 return NO;
 											 }];
 		for (NSURL *url in enumerator) {
@@ -191,6 +196,8 @@ int main(int argc, const char * argv[]) {
 	NSMutableArray *args = [[NSMutableArray alloc] initWithObjects:@"-noupdate", nil];
 	if (toSettings) [args addObject:@"-tosettings"];
 	if (_debug) [args addObject:@"-debug"];
+	if (startInTray) [args addObject:@"-startintray"];
+	if (testMode) [args addObject:@"-testmode"];
 	if (autoStart) [args addObject:@"-autostart"];
 	if (key) {
 		[args addObject:@"-key"];
--- a/Telegram/SourceFiles/apiwrap.cpp
+++ b/Telegram/SourceFiles/apiwrap.cpp
@@ -0,0 +1,290 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop version of Telegram messaging app, see https://telegram.org
+
+Telegram Desktop is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+It is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE
+Copyright (c) 2014 John Preston, https://desktop.telegram.org
+*/
+#include "stdafx.h"
+#include "style.h"
+#include "lang.h"
+
+#include "application.h"
+#include "window.h"
+#include "mainwidget.h"
+#include "apiwrap.h"
+
+#include "localstorage.h"
+
+ApiWrap::ApiWrap(QObject *parent) : QObject(parent) {
+	App::initBackground();
+
+	connect(&_replyToTimer, SIGNAL(timeout()), this, SLOT(resolveReplyTo()));
+	connect(&_webPagesTimer, SIGNAL(timeout()), this, SLOT(resolveWebPages()));
+}
+
+void ApiWrap::init() {
+	App::initMedia();
+}
+
+void ApiWrap::itemRemoved(HistoryItem *item) {
+	if (HistoryReply *reply = item->toHistoryReply()) {
+		ReplyToRequests::iterator i = _replyToRequests.find(reply->replyToId());
+		if (i != _replyToRequests.cend()) {
+			for (QList<HistoryReply*>::iterator j = i->replies.begin(); j != i->replies.end();) {
+				if ((*j) == reply) {
+					j = i->replies.erase(j);
+				} else {
+					++j;
+				}
+			}
+			if (i->replies.isEmpty()) {
+				_replyToRequests.erase(i);
+			}
+		}
+	}
+}
+
+void ApiWrap::itemReplaced(HistoryItem *oldItem, HistoryItem *newItem) {
+	if (HistoryReply *reply = oldItem->toHistoryReply()) {
+		ReplyToRequests::iterator i = _replyToRequests.find(reply->replyToId());
+		if (i != _replyToRequests.cend()) {
+			for (QList<HistoryReply*>::iterator j = i->replies.begin(); j != i->replies.end();) {
+				if ((*j) == reply) {
+					if (HistoryReply *newReply = newItem->toHistoryReply()) {
+						*j = newReply;
+						++j;
+					} else {
+						j = i->replies.erase(j);
+					}
+				} else {
+					++j;
+				}
+			}
+			if (i->replies.isEmpty()) {
+				_replyToRequests.erase(i);
+			}
+		}
+	}
+}
+
+void ApiWrap::requestReplyTo(HistoryReply *reply, MsgId to) {
+	ReplyToRequest &req(_replyToRequests[to]);
+	req.replies.append(reply);
+	if (!req.req) _replyToTimer.start(1);
+}
+
+void ApiWrap::requestFullPeer(PeerData *peer) {
+	if (!peer || _fullRequests.contains(peer)) return;
+	mtpRequestId req;
+	if (peer->chat) {
+		req = MTP::send(MTPmessages_GetFullChat(MTP_int(App::chatFromPeer(peer->id))), rpcDone(&ApiWrap::gotChatFull, peer), rpcFail(&ApiWrap::gotPeerFailed, peer));
+	} else {
+		req = MTP::send(MTPusers_GetFullUser(peer->asUser()->inputUser), rpcDone(&ApiWrap::gotUserFull, peer), rpcFail(&ApiWrap::gotPeerFailed, peer));
+	}
+	_fullRequests.insert(peer, req);
+}
+
+void ApiWrap::requestWebPageDelayed(WebPageData *page) {
+	if (page->pendingTill <= 0) return;
+	_webPagesPending.insert(page, 0);
+	int32 left = (page->pendingTill - unixtime()) * 1000;
+	if (!_webPagesTimer.isActive() || left <= _webPagesTimer.remainingTime()) {
+		_webPagesTimer.start((left < 0 ? 0 : left) + 1);
+	}
+}
+
+void ApiWrap::clearWebPageRequest(WebPageData *page) {
+	_webPagesPending.remove(page);
+	if (_webPagesPending.isEmpty() && _webPagesTimer.isActive()) _webPagesTimer.stop();
+}
+
+void ApiWrap::clearWebPageRequests() {
+	_webPagesPending.clear();
+	_webPagesTimer.stop();
+}
+
+void ApiWrap::gotChatFull(PeerData *peer, const MTPmessages_ChatFull &result) {
+	const MTPDmessages_chatFull &d(result.c_messages_chatFull());
+	const MTPDchatFull &f(d.vfull_chat.c_chatFull());
+	App::feedUsers(d.vusers);
+	App::feedChats(d.vchats);
+	App::feedParticipants(f.vparticipants);
+	PhotoData *photo = App::feedPhoto(f.vchat_photo);
+	ChatData *chat = peer->asChat();
+	if (chat) {
+		if (photo) {
+			chat->photoId = photo->id;
+			photo->chat = chat;
+		}
+		chat->invitationUrl = (f.vexported_invite.type() == mtpc_chatInviteExported) ? qs(f.vexported_invite.c_chatInviteExported().vlink) : QString();
+	}
+
+	App::main()->gotNotifySetting(MTP_inputNotifyPeer(peer->input), f.vnotify_settings);
+
+	_fullRequests.remove(peer);
+	emit fullPeerLoaded(peer);
+}
+
+void ApiWrap::gotUserFull(PeerData *peer, const MTPUserFull &result) {
+	const MTPDuserFull &d(result.c_userFull());
+	App::feedUsers(MTP_vector<MTPUser>(1, d.vuser));
+	App::feedPhoto(d.vprofile_photo);
+	App::feedUserLink(MTP_int(App::userFromPeer(peer->id)), d.vlink.c_contacts_link().vmy_link, d.vlink.c_contacts_link().vforeign_link);
+	App::main()->gotNotifySetting(MTP_inputNotifyPeer(peer->input), d.vnotify_settings);
+
+	_fullRequests.remove(peer);
+	emit fullPeerLoaded(peer);
+}
+
+bool ApiWrap::gotPeerFailed(PeerData *peer, const RPCError &error) {
+	if (error.type().startsWith(qsl("FLOOD_WAIT_"))) return false;
+
+	_fullRequests.remove(peer);
+	return true;
+}
+
+void ApiWrap::resolveReplyTo() {
+	if (_replyToRequests.isEmpty()) return;
+
+	QVector<MTPint> ids;
+	ids.reserve(_replyToRequests.size());
+	for (ReplyToRequests::const_iterator i = _replyToRequests.cbegin(), e = _replyToRequests.cend(); i != e; ++i) {
+		if (!i.value().req) {
+			ids.push_back(MTP_int(i.key()));
+		}
+	}
+	if (!ids.isEmpty()) {
+		mtpRequestId req = MTP::send(MTPmessages_GetMessages(MTP_vector<MTPint>(ids)), rpcDone(&ApiWrap::gotReplyTo));
+		for (ReplyToRequests::iterator i = _replyToRequests.begin(), e = _replyToRequests.end(); i != e; ++i) {
+			i.value().req = req;
+		}
+	}
+}
+
+void ApiWrap::resolveWebPages() {
+	QVector<MTPint> ids;
+	const WebPageItems &items(App::webPageItems());
+	ids.reserve(_webPagesPending.size());
+	int32 t = unixtime(), m = INT_MAX;
+	for (WebPagesPending::const_iterator i = _webPagesPending.cbegin(), e = _webPagesPending.cend(); i != e; ++i) {
+		if (i.value()) continue;
+		if (i.key()->pendingTill <= t) {
+			WebPageItems::const_iterator j = items.constFind(i.key());
+			if (j != items.cend() && !j.value().isEmpty()) {
+				ids.push_back(MTP_int(j.value().begin().key()->id));
+			}
+		} else {
+			m = qMin(m, i.key()->pendingTill - t);
+		}
+	}
+	if (!ids.isEmpty()) {
+		mtpRequestId req = MTP::send(MTPmessages_GetMessages(MTP_vector<MTPint>(ids)), rpcDone(&ApiWrap::gotWebPages));
+		for (WebPagesPending::iterator i = _webPagesPending.begin(); i != _webPagesPending.cend(); ++i) {
+			if (i.value()) continue;
+			if (i.key()->pendingTill <= t) {
+				i.value() = req;
+			}
+		}
+	}
+	if (m < INT_MAX) _webPagesTimer.start(m * 1000);
+}
+
+void ApiWrap::gotReplyTo(const MTPmessages_Messages &msgs, mtpRequestId req) {
+	switch (msgs.type()) {
+	case mtpc_messages_messages:
+		App::feedUsers(msgs.c_messages_messages().vusers);
+		App::feedChats(msgs.c_messages_messages().vchats);
+		App::feedMsgs(msgs.c_messages_messages().vmessages, -1);
+		break;
+
+	case mtpc_messages_messagesSlice:
+		App::feedUsers(msgs.c_messages_messagesSlice().vusers);
+		App::feedChats(msgs.c_messages_messagesSlice().vchats);
+		App::feedMsgs(msgs.c_messages_messagesSlice().vmessages, -1);
+		break;
+	}
+	for (ReplyToRequests::iterator i = _replyToRequests.begin(); i != _replyToRequests.cend();) {
+		if (i.value().req == req) {
+			for (QList<HistoryReply*>::const_iterator j = i.value().replies.cbegin(), e = i.value().replies.cend(); j != e; ++j) {
+				if (*j) {
+					(*j)->updateReplyTo(true);
+				} else {
+					App::main()->updateReplyTo();
+				}
+			}
+			i = _replyToRequests.erase(i);
+		} else {
+			++i;
+		}
+	}
+}
+
+void ApiWrap::gotWebPages(const MTPmessages_Messages &msgs, mtpRequestId req) {
+	const QVector<MTPMessage> *v = 0;
+	switch (msgs.type()) {
+	case mtpc_messages_messages:
+		App::feedUsers(msgs.c_messages_messages().vusers);
+		App::feedChats(msgs.c_messages_messages().vchats);
+		v = &msgs.c_messages_messages().vmessages.c_vector().v;
+		break;
+
+	case mtpc_messages_messagesSlice:
+		App::feedUsers(msgs.c_messages_messagesSlice().vusers);
+		App::feedChats(msgs.c_messages_messagesSlice().vchats);
+		v = &msgs.c_messages_messagesSlice().vmessages.c_vector().v;
+		break;
+	}
+
+	QMap<int32, int32> msgsIds; // copied from feedMsgs
+	for (int32 i = 0, l = v->size(); i < l; ++i) {
+		const MTPMessage &msg(v->at(i));
+		switch (msg.type()) {
+		case mtpc_message: msgsIds.insert(msg.c_message().vid.v, i); break;
+		case mtpc_messageEmpty: msgsIds.insert(msg.c_messageEmpty().vid.v, i); break;
+		case mtpc_messageService: msgsIds.insert(msg.c_messageService().vid.v, i); break;
+		}
+	}
+
+	MainWidget *m = App::main();
+	for (QMap<int32, int32>::const_iterator i = msgsIds.cbegin(), e = msgsIds.cend(); i != e; ++i) {
+		HistoryItem *item = App::histories().addToBack(v->at(*i), -1);
+		if (item) {
+			item->initDimensions();
+			if (m) m->itemResized(item);
+		}
+	}
+
+	const WebPageItems &items(App::webPageItems());
+	for (WebPagesPending::iterator i = _webPagesPending.begin(); i != _webPagesPending.cend();) {
+		if (i.value() == req) {
+			if (i.key()->pendingTill > 0) {
+				i.key()->pendingTill = -1;
+				WebPageItems::const_iterator j = items.constFind(i.key());
+				if (j != items.cend()) {
+					for (HistoryItemsMap::const_iterator k = j.value().cbegin(), e = j.value().cend(); k != e; ++k) {
+						k.key()->initDimensions();
+						if (m) m->itemResized(k.key());
+					}
+				}
+			}
+			i = _webPagesPending.erase(i);
+		} else {
+			++i;
+		}
+	}
+}
+
+ApiWrap::~ApiWrap() {
+	App::deinitMedia(false);
+}
--- a/Telegram/SourceFiles/apiwrap.h
+++ b/Telegram/SourceFiles/apiwrap.h
@@ -0,0 +1,74 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop version of Telegram messaging app, see https://telegram.org
+
+Telegram Desktop is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+It is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE
+Copyright (c) 2014 John Preston, https://desktop.telegram.org
+*/
+#pragma once
+
+class ApiWrap : public QObject, public RPCSender {
+	Q_OBJECT
+
+public:
+
+	ApiWrap(QObject *parent);
+	void init();
+
+	void itemRemoved(HistoryItem *item);
+	void itemReplaced(HistoryItem *oldItem, HistoryItem *newItem);
+		
+	void requestReplyTo(HistoryReply *reply, MsgId to);
+
+	void requestFullPeer(PeerData *peer);
+
+	void requestWebPageDelayed(WebPageData *page);
+	void clearWebPageRequest(WebPageData *page);
+	void clearWebPageRequests();
+
+	~ApiWrap();
+
+signals:
+
+	void fullPeerLoaded(PeerData *peer);
+
+public slots:
+
+	void resolveReplyTo();
+	void resolveWebPages();
+
+private:
+
+	void gotReplyTo(const MTPmessages_Messages &result, mtpRequestId req);
+	struct ReplyToRequest {
+		ReplyToRequest() : req(0) {
+		}
+		mtpRequestId req;
+		QList<HistoryReply*> replies;
+	};
+	typedef QMap<MsgId, ReplyToRequest> ReplyToRequests;
+	ReplyToRequests _replyToRequests;
+	SingleTimer _replyToTimer;
+
+	void gotChatFull(PeerData *peer, const MTPmessages_ChatFull &result);
+	void gotUserFull(PeerData *peer, const MTPUserFull &result);
+	bool gotPeerFailed(PeerData *peer, const RPCError &err);
+	typedef QMap<PeerData*, mtpRequestId> FullRequests;
+	FullRequests _fullRequests;
+
+	void gotWebPages(const MTPmessages_Messages &result, mtpRequestId req);
+	typedef QMap<WebPageData*, mtpRequestId> WebPagesPending;
+	WebPagesPending _webPagesPending;
+	SingleTimer _webPagesTimer;
+
+};
--- a/Telegram/SourceFiles/app.cpp
+++ b/Telegram/SourceFiles/app.cpp
--- a/Telegram/SourceFiles/app.h
+++ b/Telegram/SourceFiles/app.h
@@ -23,6 +23,7 @@ class Application;
 class Window;
 class MainWidget;
 class SettingsWidget;
+class ApiWrap;
 class Font;
 class Color;
 class FileUploader;
@@ -33,13 +34,16 @@ typedef QMap<HistoryItem*, bool> HistoryItemsMap;
 typedef QHash<VideoData*, HistoryItemsMap> VideoItems;
 typedef QHash<AudioData*, HistoryItemsMap> AudioItems;
 typedef QHash<DocumentData*, HistoryItemsMap> DocumentItems;
+typedef QHash<WebPageData*, HistoryItemsMap> WebPageItems;

 namespace App {
 	Application *app();
 	Window *wnd();
 	MainWidget *main();
 	SettingsWidget *settings();
+	bool passcoded();
 	FileUploader *uploader();
+	ApiWrap *api();

 	void showSettings();
 	void logOut();
@@ -66,20 +70,24 @@ namespace App {
 	int32 onlineForSort(int32 online, int32 now);
 	int32 onlineWillChangeIn(int32 onlineOnServer, int32 nowOnServer);
 	QString onlineText(UserData *user, int32 nowOnServer, bool precise = false);
+	bool onlineColorUse(int32 online, int32 now);

-	UserData *feedUsers(const MTPVector<MTPUser> &users); // returnes last user
-	void feedChats(const MTPVector<MTPChat> &chats);
+	UserData *feedUsers(const MTPVector<MTPUser> &users); // returns last user
+	ChatData *feedChats(const MTPVector<MTPChat> &chats); // returns last chat
 	void feedParticipants(const MTPChatParticipants &p);
 	void feedParticipantAdd(const MTPDupdateChatParticipantAdd &d);
 	void feedParticipantDelete(const MTPDupdateChatParticipantDelete &d);
-	void feedMsgs(const MTPVector<MTPMessage> &msgs, bool newMsgs = false);
+	void feedMsgs(const MTPVector<MTPMessage> &msgs, int msgsState = 0); // 2 - new read message, 1 - new unread message, 0 - not new message, -1 - searched message
 	void feedWereRead(const QVector<MTPint> &msgsIds);
+	void feedInboxRead(const PeerId &peer, int32 upTo);
+	void feedOutboxRead(const PeerId &peer, int32 upTo);
 	void feedWereDeleted(const QVector<MTPint> &msgsIds);
 	void feedUserLinks(const MTPVector<MTPcontacts_Link> &links);
-	void feedUserLink(MTPint userId, const MTPcontacts_MyLink &myLink, const MTPcontacts_ForeignLink &foreignLink);
-	void feedMessageMedia(MsgId msgId, const MTPMessage &msg);
+	void feedUserLink(MTPint userId, const MTPContactLink &myLink, const MTPContactLink &foreignLink);
 	int32 maxMsgId();

+	ImagePtr image(const MTPPhotoSize &size);
+
 	PhotoData *feedPhoto(const MTPPhoto &photo, const PreparedPhotoThumbs &thumbs);
 	PhotoData *feedPhoto(const MTPPhoto &photo, PhotoData *convert = 0);
 	PhotoData *feedPhoto(const MTPDphoto &photo, PhotoData *convert = 0);
@@ -88,6 +96,9 @@ namespace App {
 	DocumentData *feedDocument(const MTPdocument &document, const QPixmap &thumb);
 	DocumentData *feedDocument(const MTPdocument &document, DocumentData *convert = 0);
 	DocumentData *feedDocument(const MTPDdocument &document, DocumentData *convert = 0);
+	WebPageData *feedWebPage(const MTPDwebPage &webpage, WebPageData *convert = 0);
+	WebPageData *feedWebPage(const MTPDwebPagePending &webpage, WebPageData *convert = 0);
+	WebPageData *feedWebPage(const MTPWebPage &webpage);

 	UserData *userLoaded(const PeerId &user);
 	ChatData *chatLoaded(const PeerId &chat);
@@ -105,15 +116,16 @@ namespace App {
 	QString peerName(const PeerData *peer, bool forDialogs = false);
 	PhotoData *photo(const PhotoId &photo, PhotoData *convert = 0, const uint64 &access = 0, int32 user = 0, int32 date = 0, const ImagePtr &thumb = ImagePtr(), const ImagePtr &medium = ImagePtr(), const ImagePtr &full = ImagePtr());
 	VideoData *video(const VideoId &video, VideoData *convert = 0, const uint64 &access = 0, int32 user = 0, int32 date = 0, int32 duration = 0, int32 w = 0, int32 h = 0, const ImagePtr &thumb = ImagePtr(), int32 dc = 0, int32 size = 0);
-	AudioData *audio(const AudioId &audio, AudioData *convert = 0, const uint64 &access = 0, int32 user = 0, int32 date = 0, int32 duration = 0, int32 dc = 0, int32 size = 0);
+	AudioData *audio(const AudioId &audio, AudioData *convert = 0, const uint64 &access = 0, int32 user = 0, int32 date = 0, const QString &mime = QString(), int32 duration = 0, int32 dc = 0, int32 size = 0);
 	DocumentData *document(const DocumentId &document, DocumentData *convert = 0, const uint64 &access = 0, int32 date = 0, const QVector<MTPDocumentAttribute> &attributes = QVector<MTPDocumentAttribute>(), const QString &mime = QString(), const ImagePtr &thumb = ImagePtr(), int32 dc = 0, int32 size = 0);
+	WebPageData *webPage(const WebPageId &webPage, WebPageData *convert = 0, const QString &type = QString(), const QString &url = QString(), const QString &displayUrl = QString(), const QString &siteName = QString(), const QString &title = QString(), const QString &description = QString(), PhotoData *photo = 0, int32 duration = 0, const QString &author = QString(), int32 pendingTill = -2);
 	ImageLinkData *imageLink(const QString &imageLink, ImageLinkType type = InvalidImageLink, const QString &url = QString());
 	void forgetMedia();

 	MTPPhoto photoFromUserPhoto(MTPint userId, MTPint date, const MTPUserProfilePhoto &photo);

 	Histories &histories();
-	History *history(const PeerId &peer, int32 unreadCnt = 0);
+	History *history(const PeerId &peer, int32 unreadCnt = 0, int32 maxInboxRead = 0);
 	History *historyLoaded(const PeerId &peer);
 	HistoryItem *histItemById(MsgId itemId);
 	HistoryItem *historyRegItem(HistoryItem *item);
@@ -121,6 +133,8 @@ namespace App {
 	void historyUnregItem(HistoryItem *item);
 	void historyClearMsgs();
 	void historyClearItems();
+	void historyRegReply(HistoryReply *reply, HistoryItem *to);
+	void historyUnregReply(HistoryReply *reply, HistoryItem *to);
 //	void deleteHistory(const PeerId &peer);

 	void historyRegRandom(uint64 randomId, MsgId itemId);
@@ -140,26 +154,15 @@ namespace App {
 	void mousedItem(HistoryItem *item);
 	HistoryItem *mousedItem();

-	QPixmap &sprite();
-	QPixmap &emojis();
-	const QPixmap &emojiSingle(const EmojiData *emoji, int32 fontHeight);
+	const QPixmap &sprite();
+	const QPixmap &emojis();
+	const QPixmap &emojisLarge();
+	const QPixmap &emojiSingle(EmojiPtr emoji, int32 fontHeight);

 	void initMedia();
 	void deinitMedia(bool completely = true);
 	void playSound();

-	void writeConfig();
-	void readConfig();
-	void writeUserConfig();
-	void readUserConfig();
-
-	void muteHistory(History *history);
-	void unmuteHistory(History *history);
-	void writeAllMuted(QDataStream &stream);
-	void readAllMuted(QDataStream &stream);
-	void readOneMuted(QDataStream &stream);
-	bool isPeerMuted(const PeerId &peer);
-
 	void checkImageCacheSize();

 	bool isValidPhone(QString phone);
@@ -183,11 +186,39 @@ namespace App {
 	void unregDocumentItem(DocumentData *data, HistoryItem *item);
 	const DocumentItems &documentItems();

+	void regWebPageItem(WebPageData *data, HistoryItem *item);
+	void unregWebPageItem(WebPageData *data, HistoryItem *item);
+	const WebPageItems &webPageItems();
+
+	void regMuted(PeerData *peer, int32 changeIn);
+	void unregMuted(PeerData *peer);
+	void updateMuted();
+
 	void setProxySettings(QNetworkAccessManager &manager);
 	void setProxySettings(QTcpSocket &socket);

 	void searchByHashtag(const QString &tag);
-	void openUserByName(const QString &username);
+	void openUserByName(const QString &username, bool toProfile = false);
+	void joinGroupByHash(const QString &hash);
 	void openLocalUrl(const QString &url);

+	void initBackground(int32 id = DefaultChatBackground, const QImage &p = QImage(), bool nowrite = false);
+
+	style::color msgServiceBG();
+	style::color historyScrollBarColor();
+	style::color historyScrollBgColor();
+	style::color historyScrollBarOverColor();
+	style::color historyScrollBgOverColor();
+	style::color introPointHoverColor();
+
+	struct WallPaper {
+		WallPaper(int32 id, ImagePtr thumb, ImagePtr full) : id(id), thumb(thumb), full(full) {
+		}
+		int32 id;
+		ImagePtr thumb;
+		ImagePtr full;
+	};
+	typedef QList<WallPaper> WallPapers;
+	DeclareSetting(WallPapers, ServerBackgrounds);
+
 };
--- a/Telegram/SourceFiles/application.cpp
+++ b/Telegram/SourceFiles/application.cpp
@@ -22,7 +22,6 @@ Copyright (c) 2014 John Preston, https://desktop.telegram.org
 #include "pspecific.h"
 #include "fileuploader.h"
 #include "mainwidget.h"
-#include "supporttl.h"

 #include "lang.h"
 #include "boxes/confirmbox.h"
@@ -47,41 +46,33 @@ namespace {
 		}
 	}

-	class _DebugWaiter : public QObject {
+	class EventFilterForMac : public QObject {
 	public:

-		_DebugWaiter(QObject *parent) : QObject(parent), _debugState(0) {
+		EventFilterForMac(QObject *parent) : QObject(parent) {

 		}
 		bool eventFilter(QObject *o, QEvent *e) {
 			if (e->type() == QEvent::KeyPress) {
 				QKeyEvent *ev = static_cast<QKeyEvent*>(e);
-				switch (_debugState) {
-				case 0: if (ev->key() == Qt::Key_F12) _debugState = 1; break;
-				case 1: if (ev->key() == Qt::Key_F11) _debugState = 2; else if (ev->key() != Qt::Key_F12) _debugState = 0; break;
-				case 2: if (ev->key() == Qt::Key_F10) _debugState = 3; else if (ev->key() != Qt::Key_F11) _debugState = 0; break;
-				case 3: if (ev->key() == Qt::Key_F11) _debugState = 4; else if (ev->key() != Qt::Key_F10) _debugState = 0; break;
-				case 4: if (ev->key() == Qt::Key_F12) offerDebug(); if (ev->key() != Qt::Key_F11) _debugState = 0; break;
-				}
-
-				if (cPlatform() == dbipMac && ev->key() == Qt::Key_W && (ev->modifiers() & (Qt::MetaModifier | Qt::ControlModifier))) {
+				if (ev->key() == Qt::Key_W && (ev->modifiers() & (Qt::MetaModifier | Qt::ControlModifier))) {
 					if (cWorkMode() == dbiwmTrayOnly || cWorkMode() == dbiwmWindowAndTray) {
 						App::wnd()->minimizeToTray();
 						return true;
+					} else {
+						App::wnd()->hide();
+						App::wnd()->updateIsActive(cOfflineBlurTimeout());
+						App::wnd()->updateGlobalMenu();
+						return true;
 					}
+				} else if (ev->key() == Qt::Key_M && (ev->modifiers() & (Qt::MetaModifier | Qt::ControlModifier))) {
+					App::wnd()->setWindowState(Qt::WindowMinimized);
+					return true;
 				}
 			}
 			return QObject::eventFilter(o, e);
 		}
-		void offerDebug() {
-			ConfirmBox *box = new ConfirmBox(lang(lng_sure_enable_debug));
-			connect(box, SIGNAL(confirmed()), App::app(), SLOT(onEnableDebugMode()));
-			App::wnd()->showLayer(box);
-		}

-	private:
-
-		int _debugState;
 	};
 }

@@ -102,12 +93,10 @@ Application::Application(int &argc, char **argv) : PsApplication(argc, argv),
 	}
 	mainApp = this;

-	installEventFilter(new _DebugWaiter(this));
+	if (cPlatform() == dbipMac) {
+		installEventFilter(new EventFilterForMac(this));
+	}

-#if defined Q_OS_LINUX || defined Q_OS_LINUX64
-    QFontDatabase::addApplicationFont(qsl(":/gui/art/fonts/DejaVuSans.ttf"));
-    QFontDatabase::addApplicationFont(qsl(":/gui/art/fonts/NanumMyeongjo-Regular.ttf"));
-#endif
    QFontDatabase::addApplicationFont(qsl(":/gui/art/fonts/OpenSans-Regular.ttf"));
    QFontDatabase::addApplicationFont(qsl(":/gui/art/fonts/OpenSans-Bold.ttf"));
    QFontDatabase::addApplicationFont(qsl(":/gui/art/fonts/OpenSans-Semibold.ttf"));
@@ -127,6 +116,8 @@ Application::Application(int &argc, char **argv) : PsApplication(argc, argv),
        cSetRetina(true);
        cSetRetinaFactor(devicePixelRatio());
        cSetIntRetinaFactor(int32(cRetinaFactor()));
+		cSetConfigScale(dbisOne);
+		cSetRealScale(dbisOne);
    }

 	if (cLang() < languageTest) {
@@ -155,7 +146,6 @@ Application::Application(int &argc, char **argv) : PsApplication(argc, argv),

 	installTranslator(_translator = new Translator());

-	Local::start();
 	style::startManager();
 	anim::startManager();
 	historyInit();
@@ -177,8 +167,8 @@ Application::Application(int &argc, char **argv) : PsApplication(argc, argv),
 	connect(this, SIGNAL(updateFailed()), this, SLOT(onUpdateFailed()));
 	connect(this, SIGNAL(updateReady()), this, SLOT(onUpdateReady()));
 	connect(this, SIGNAL(applicationStateChanged(Qt::ApplicationState)), this, SLOT(onAppStateChanged(Qt::ApplicationState)));
-	connect(&writeUserConfigTimer, SIGNAL(timeout()), this, SLOT(onWriteUserConfig()));
-	writeUserConfigTimer.setSingleShot(true);
+	//connect(&writeUserConfigTimer, SIGNAL(timeout()), this, SLOT(onWriteUserConfig()));
+	//writeUserConfigTimer.setSingleShot(true);

 	connect(&killDownloadSessionsTimer, SIGNAL(timeout()), this, SLOT(killDownloadSessions()));

@@ -194,7 +184,7 @@ void Application::onAppUpdate(const MTPhelp_AppUpdate &response) {
    updateRequestId = 0;

 	cSetLastUpdateCheck(unixtime());
-	App::writeConfig();
+	Local::writeSettings();
 	if (response.type() == mtpc_help_noAppUpdate) {
 		startUpdateCheck();
 	} else {
@@ -208,7 +198,7 @@ void Application::onAppUpdate(const MTPhelp_AppUpdate &response) {
 bool Application::onAppUpdateFail() {
 	updateRequestId = 0;
 	cSetLastUpdateCheck(unixtime());
-	App::writeConfig();
+	Local::writeSettings();
 	startUpdateCheck();
 	return true;
 }
@@ -242,7 +232,7 @@ void Application::updateGotCurrent() {
 		emit updateLatest();
 	}
 	startUpdateCheck(true);
-	App::writeConfig();
+	Local::writeSettings();
 }

 void Application::updateFailedCurrent(QNetworkReply::NetworkError e) {
@@ -262,7 +252,7 @@ void Application::onUpdateReady() {
 	updateCheckTimer.stop();

 	cSetLastUpdateCheck(unixtime());
-	App::writeConfig();
+	Local::writeSettings();
 }

 void Application::onUpdateFailed() {
@@ -274,7 +264,7 @@ void Application::onUpdateFailed() {
 	}

 	cSetLastUpdateCheck(unixtime());
-	App::writeConfig();
+	Local::writeSettings();
 }

 void Application::regPhotoUpdate(const PeerId &peer, MsgId msgId) {
@@ -310,9 +300,9 @@ void Application::selfPhotoCleared(const MTPUserProfilePhoto &result) {
 	emit peerPhotoDone(App::self()->id);
 }

-void Application::chatPhotoCleared(PeerId peer, const MTPmessages_StatedMessage &result) {
+void Application::chatPhotoCleared(PeerId peer, const MTPUpdates &updates) {
 	if (App::main()) {
-		App::main()->sentFullDataReceived(0, result);
+		App::main()->sentUpdatesReceived(updates);
 	}
 	cancelPhotoUpdate(peer);
 	emit peerPhotoDone(peer);
@@ -327,16 +317,18 @@ void Application::selfPhotoDone(const MTPphotos_Photo &result) {
 	emit peerPhotoDone(App::self()->id);
 }

-void Application::chatPhotoDone(PeerId peer, const MTPmessages_StatedMessage &result) {
+void Application::chatPhotoDone(PeerId peer, const MTPUpdates &updates) {
 	if (App::main()) {
-		App::main()->sentFullDataReceived(0, result);
+		App::main()->sentUpdatesReceived(updates);
 	}
 	cancelPhotoUpdate(peer);
 	emit peerPhotoDone(peer);
 }

-bool Application::peerPhotoFail(PeerId peer, const RPCError &e) {
-	LOG(("Application Error: update photo failed %1: %2").arg(e.type()).arg(e.description()));
+bool Application::peerPhotoFail(PeerId peer, const RPCError &error) {
+	if (error.type().startsWith(qsl("FLOOD_WAIT_"))) return false;
+
+	LOG(("Application Error: update photo failed %1: %2").arg(error.type()).arg(error.description()));
 	cancelPhotoUpdate(peer);
 	emit peerPhotoFail(peer);
 	return true;
@@ -350,12 +342,6 @@ void Application::peerClearPhoto(PeerId peer) {
 	}
 }

-void Application::writeUserConfigIn(uint64 ms) {
-	if (!writeUserConfigTimer.isActive()) {
-		writeUserConfigTimer.start(ms);
-	}
-}
-
 void Application::killDownloadSessionsStart(int32 dc) {
 	if (killDownloadSessionTimes.constFind(dc) == killDownloadSessionTimes.cend()) {
 		killDownloadSessionTimes.insert(dc, getms() + MTPAckSendWaiting + MTPKillFileSessionTimeout);
@@ -376,12 +362,9 @@ void Application::checkLocalTime() {
 	if (App::main()) App::main()->checkLastUpdate(checkms());
 }

-void Application::onWriteUserConfig() {
-	App::writeUserConfig();
-}
-
 void Application::onAppStateChanged(Qt::ApplicationState state) {
 	checkLocalTime();
+	if (window) window->updateIsActive((state == Qt::ApplicationActive) ? cOnlineFocusTimeout() : cOfflineBlurTimeout());
 }

 void Application::killDownloadSessions() {
@@ -419,8 +402,14 @@ void Application::photoUpdated(MsgId msgId, const MTPInputFile &file) {
 	}
 }

-void Application::onEnableDebugMode() {
-	if (!cDebug()) {
+void Application::onSwitchDebugMode() {
+	if (cDebug()) {
+		QFile(cWorkingDir() + qsl("tdata/withdebug")).remove();
+		cSetDebug(false);
+		cSetRestarting(true);
+		cSetRestartingToSettings(true);
+		App::quit();
+	} else {
 		logsInitDebug();
 		cSetDebug(true);
 		QFile f(cWorkingDir() + qsl("tdata/withdebug"));
@@ -428,8 +417,25 @@ void Application::onEnableDebugMode() {
 			f.write("1");
 			f.close();
 		}
+		App::wnd()->hideLayer();
 	}
-	App::wnd()->hideLayer();
+}
+
+void Application::onSwitchTestMode() {
+	if (cTestMode()) {
+		QFile(cWorkingDir() + qsl("tdata/withtestmode")).remove();
+		cSetTestMode(false);
+	} else {
+		QFile f(cWorkingDir() + qsl("tdata/withtestmode"));
+		if (f.open(QIODevice::WriteOnly)) {
+			f.write("1");
+			f.close();
+		}
+		cSetTestMode(true);
+	}
+	cSetRestarting(true);
+	cSetRestartingToSettings(true);
+	App::quit();
 }

 Application::UpdatingState Application::updatingState() {
@@ -475,13 +481,13 @@ void Application::uploadProfilePhoto(const QImage &tosend, const PeerId &peerId)

 	PhotoId id = MTP::nonce<PhotoId>();

-	MTPPhoto photo(MTP_photo(MTP_long(id), MTP_long(0), MTP_int(MTP::authedId()), MTP_int(unixtime()), MTP_string(""), MTP_geoPointEmpty(), MTP_vector<MTPPhotoSize>(photoSizes)));
+	MTPPhoto photo(MTP_photo(MTP_long(id), MTP_long(0), MTP_int(MTP::authedId()), MTP_int(unixtime()), MTP_geoPointEmpty(), MTP_vector<MTPPhotoSize>(photoSizes)));

 	QString file, filename;
 	int32 filesize = 0;
 	QByteArray data;

-	ReadyLocalMedia ready(ToPreparePhoto, file, filename, filesize, data, id, id, qsl("jpg"), peerId, photo, photoThumbs, MTP_documentEmpty(MTP_long(0)), jpeg, false);
+	ReadyLocalMedia ready(ToPreparePhoto, file, filename, filesize, data, id, id, qsl("jpg"), peerId, photo, photoThumbs, MTP_documentEmpty(MTP_long(0)), jpeg, false, 0);

 	connect(App::uploader(), SIGNAL(photoReady(MsgId, const MTPInputFile &)), App::app(), SLOT(photoUpdated(MsgId, const MTPInputFile &)), Qt::UniqueConnection);

@@ -508,8 +514,8 @@ void Application::startUpdateCheck(bool forceWait) {
 	updateCheckTimer.stop();
 	if (updateRequestId || updateThread || updateReply || !cAutoUpdate()) return;
 	
-	int32 updateInSecs = cLastUpdateCheck() + 3600 + (rand() % 3600) - unixtime();
-	bool sendRequest = (updateInSecs <= 0 || updateInSecs > 7200);
+	int32 updateInSecs = cLastUpdateCheck() + UpdateDelayConstPart + (rand() % UpdateDelayRandPart) - unixtime();
+	bool sendRequest = (updateInSecs <= 0 || updateInSecs > (UpdateDelayConstPart + UpdateDelayRandPart));
 	if (!sendRequest && !forceWait) {
 		QDir updates(cWorkingDir() + "tupdates");
 		if (updates.exists()) {
@@ -524,7 +530,10 @@ void Application::startUpdateCheck(bool forceWait) {
    if (cManyInstance() && !cDebug()) return; // only main instance is updating

 	if (sendRequest) {
-		QNetworkRequest checkVersion(cUpdateURL());
+		QUrl url(cUpdateURL());
+		if (DevChannel) url.setQuery("dev=1");
+		QString u = url.toString();
+		QNetworkRequest checkVersion(url);
 		if (updateReply) updateReply->deleteLater();

 		App::setProxySettings(updateManager);
@@ -648,48 +657,63 @@ void Application::socketError(QLocalSocket::LocalSocketError e) {
 	startApp();
 }

+void Application::checkMapVersion() {
+	if (Local::oldMapVersion() < AppVersion) {
+		psRegisterCustomScheme();
+		if (Local::oldMapVersion()) {
+			QString versionFeatures;
+			if (DevChannel && Local::oldMapVersion() < 8012) {
+				versionFeatures = QString::fromUtf8("\xe2\x80\x94 New emojis support added\n\xe2\x80\x94 Emojis and stickers panel improved").replace('@', qsl("@") + QChar(0x200D));
+			} else if (!DevChannel && Local::oldMapVersion() < 8011) {
+				versionFeatures = lang(lng_new_version_text).trimmed();
+			}
+			if (!versionFeatures.isEmpty()) {
+				versionFeatures = lng_new_version_wrap(lt_version, QString::fromStdWString(AppVersionStr), lt_changes, versionFeatures, lt_link, qsl("https://desktop.telegram.org/#changelog"));
+				window->serviceNotification(versionFeatures);
+			}
+		}
+	}
+}
+
 void Application::startApp() {
+	cChangeTimeFormat(QLocale::system().timeFormat(QLocale::ShortFormat));
+
 	DEBUG_LOG(("Application Info: starting app.."));

-	Local::ReadMapState state = Local::readMap(QByteArray());
-
-	DEBUG_LOG(("Application Info: local map read.."));
-	App::readUserConfig();
-	if (!Local::oldKey().created()) {
-		Local::createOldKey();
-		cSetNeedConfigResave(true);
-	}
-	if (cNeedConfigResave()) {
-		App::writeConfig();
-		App::writeUserConfig();
-		cSetNeedConfigResave(false);
-	}
-	DEBUG_LOG(("Application Info: user config read.."));
+	QMimeDatabase().mimeTypeForName(qsl("text/plain")); // create mime database

 	window->createWinId();
 	window->init();

 	DEBUG_LOG(("Application Info: window created.."));
-	readSupportTemplates();

-	MTP::start();
-	
+	initImageLinkManager();
+	App::initMedia();
+
+	Local::ReadMapState state = Local::readMap(QByteArray());
+	if (state == Local::ReadMapPassNeeded) {
+		cSetHasPasscode(true);
+		DEBUG_LOG(("Application Info: passcode nneded.."));
+	} else {
+		DEBUG_LOG(("Application Info: local map read.."));
+		MTP::start();
+	}
+
 	MTP::setStateChangedHandler(mtpStateChanged);
 	MTP::setSessionResetHandler(mtpSessionReset);

 	DEBUG_LOG(("Application Info: MTP started.."));

-	initImageLinkManager();
-	App::initMedia();
-
 	DEBUG_LOG(("Application Info: showing."));
-
-	if (MTP::authedId()) {
-		window->setupMain(false);
+	if (state == Local::ReadMapPassNeeded) {
+		window->setupPasscode(false);
 	} else {
-		window->setupIntro(false);
+		if (MTP::authedId()) {
+			window->setupMain(false);
+		} else {
+			window->setupIntro(false);
+		}
 	}
-
 	window->firstShow();

 	if (cStartToSettings()) {
@@ -697,19 +721,12 @@ void Application::startApp() {
 	}

 	QNetworkProxyFactory::setUseSystemConfiguration(true);
-	if (Local::oldMapVersion() < AppVersion) {
-		psRegisterCustomScheme();
-		if (Local::oldMapVersion() && Local::oldMapVersion() < 7005) {
-			QString versionFeatures(lng_new_version7005(lt_version, QString::fromStdWString(AppVersionStr), lt_link, qsl("https://desktop.telegram.org/#changelog")));
-			if (!versionFeatures.isEmpty()) {
-				window->serviceNotification(versionFeatures);
-			}
-		}
+	
+	if (state != Local::ReadMapPassNeeded) {
+		checkMapVersion();
 	}

-//	if (!cLangErrors().isEmpty()) {
-//		window->showLayer(new ConfirmBox("Custom lang failed :(\n\nError: " + cLangErrors(), true, lang(lng_close)));
-//	}
+	window->updateIsActive(cOnlineFocusTimeout());
 }

 void Application::socketDisconnected() {
@@ -832,9 +849,14 @@ Application::~Application() {

 	delete window;

-	style::stopManager();
-	Local::stop();
+	delete cChatBackground();
+	cSetChatBackground(0);

+	delete cChatDogImage();
+	cSetChatDogImage(0);
+
+	style::stopManager();
+	
 	delete _translator;
 }

--- a/Telegram/SourceFiles/application.h
+++ b/Telegram/SourceFiles/application.h
@@ -64,9 +64,9 @@ public:
 	void stopUpdate();

 	void selfPhotoCleared(const MTPUserProfilePhoto &result);
-	void chatPhotoCleared(PeerId peer, const MTPmessages_StatedMessage &result);
+	void chatPhotoCleared(PeerId peer, const MTPUpdates &updates);
 	void selfPhotoDone(const MTPphotos_Photo &result);
-	void chatPhotoDone(PeerId peerId, const MTPmessages_StatedMessage &rersult);
+	void chatPhotoDone(PeerId peerId, const MTPUpdates &updates);
 	bool peerPhotoFail(PeerId peerId, const RPCError &e);
 	void peerClearPhoto(PeerId peer);

@@ -76,6 +76,7 @@ public:
 	void killDownloadSessionsStop(int32 dc);

 	void checkLocalTime();
+	void checkMapVersion();

 signals:

@@ -106,8 +107,8 @@ public slots:

 	void photoUpdated(MsgId msgId, const MTPInputFile &file);

-	void onEnableDebugMode();
-	void onWriteUserConfig();
+	void onSwitchDebugMode();
+	void onSwitchTestMode();

 	void killDownloadSessions();
 	void onAppStateChanged(Qt::ApplicationState state);
@@ -131,6 +132,8 @@ private:
 	ClientSockets clients;
 	bool closing;

+	uint64 lastActionTime;
+
 	void execExternal(const QString &cmd);

 	Window *window;
--- a/Telegram/SourceFiles/art/bg.jpg
+++ b/Telegram/SourceFiles/art/bg.jpg
--- a/Telegram/SourceFiles/art/bg0.png
+++ b/Telegram/SourceFiles/art/bg0.png
--- a/Telegram/SourceFiles/art/bg_125x.png
+++ b/Telegram/SourceFiles/art/bg_125x.png
--- a/Telegram/SourceFiles/art/bg_150x.png
+++ b/Telegram/SourceFiles/art/bg_150x.png
--- a/Telegram/SourceFiles/art/bg_200x.png
+++ b/Telegram/SourceFiles/art/bg_200x.png
--- a/Telegram/SourceFiles/art/emoji.png
+++ b/Telegram/SourceFiles/art/emoji.png
--- a/Telegram/SourceFiles/art/emoji.webp
+++ b/Telegram/SourceFiles/art/emoji.webp
--- a/Telegram/SourceFiles/art/emoji_125x.png
+++ b/Telegram/SourceFiles/art/emoji_125x.png
--- a/Telegram/SourceFiles/art/emoji_125x.webp
+++ b/Telegram/SourceFiles/art/emoji_125x.webp
--- a/Telegram/SourceFiles/art/emoji_150x.png
+++ b/Telegram/SourceFiles/art/emoji_150x.png
--- a/Telegram/SourceFiles/art/emoji_150x.webp
+++ b/Telegram/SourceFiles/art/emoji_150x.webp
--- a/Telegram/SourceFiles/art/emoji_200x.png
+++ b/Telegram/SourceFiles/art/emoji_200x.png
--- a/Telegram/SourceFiles/art/emoji_200x.webp
+++ b/Telegram/SourceFiles/art/emoji_200x.webp
--- a/Telegram/SourceFiles/art/emoji_250x.webp
+++ b/Telegram/SourceFiles/art/emoji_250x.webp
--- a/Telegram/SourceFiles/art/emojisprite_0.png
+++ b/Telegram/SourceFiles/art/emojisprite_0.png
--- a/Telegram/SourceFiles/art/emojisprite_1.png
+++ b/Telegram/SourceFiles/art/emojisprite_1.png
--- a/Telegram/SourceFiles/art/emojisprite_2.png
+++ b/Telegram/SourceFiles/art/emojisprite_2.png
--- a/Telegram/SourceFiles/art/emojisprite_3.png
+++ b/Telegram/SourceFiles/art/emojisprite_3.png
--- a/Telegram/SourceFiles/art/emojisprite_4.png
+++ b/Telegram/SourceFiles/art/emojisprite_4.png
--- a/Telegram/SourceFiles/art/fonts/DejaVuSans.ttf
+++ b/Telegram/SourceFiles/art/fonts/DejaVuSans.ttf
--- a/Telegram/SourceFiles/art/fonts/NanumMyeongjo-Regular.ttf
+++ b/Telegram/SourceFiles/art/fonts/NanumMyeongjo-Regular.ttf
--- a/Telegram/SourceFiles/art/sprite.png
+++ b/Telegram/SourceFiles/art/sprite.png
--- a/Telegram/SourceFiles/art/sprite_200x.png
+++ b/Telegram/SourceFiles/art/sprite_200x.png
--- a/Telegram/SourceFiles/audio.cpp
+++ b/Telegram/SourceFiles/audio.cpp
@@ -51,6 +51,7 @@ bool _checkALError() {
 }

 void audioInit() {
+	uint64 ms = getms();
 	if (audioDevice) return;

 	audioDevice = alcOpenDevice(NULL);
@@ -148,6 +149,8 @@ void audioInit() {
 	if (!_checkALError()) return audioFinish();

 	voicemsgs = new VoiceMessages();
+	alcSuspendContext(audioContext);
+	LOG(("Audio init time: %1").arg(getms() - ms));
 }

 bool audioWorks() {
@@ -157,7 +160,9 @@ bool audioWorks() {
 void audioPlayNotify() {
 	if (!audioWorks()) return;

+	audioVoice()->processContext();
 	alSourcePlay(notifySource);
+	emit audioVoice()->faderOnTimer();
 }

 void audioFinish() {
@@ -307,6 +312,7 @@ void VoiceMessages::pauseresume() {
 			updateCurrentStarted();
 		}
 		_data[_current].state = VoiceMessageResuming;
+		processContext();
 		alSourcePlay(_data[_current].source);
 	break;
 	case VoiceMessageStarting:
@@ -328,15 +334,25 @@ void VoiceMessages::currentState(AudioData **audio, VoiceMessageState *state, in
 	if (duration) *duration = _data[_current].duration;
 }

+void VoiceMessages::processContext() {
+	_fader->processContext();
+}
+
 VoiceMessages *audioVoice() {
 	return voicemsgs;
 }

-VoiceMessagesFader::VoiceMessagesFader(QThread *thread) : _timer(this) {
+VoiceMessagesFader::VoiceMessagesFader(QThread *thread) : _timer(this), _suspendFlag(false) {
 	moveToThread(thread);
 	_timer.moveToThread(thread);
+	_suspendTimer.moveToThread(thread);
+
 	_timer.setSingleShot(true);
 	connect(&_timer, SIGNAL(timeout()), this, SLOT(onTimer()));
+
+	_suspendTimer.setSingleShot(true);
+	connect(&_suspendTimer, SIGNAL(timeout()), this, SLOT(onSuspendTimer()));
+	connect(this, SIGNAL(stopSuspend()), this, SLOT(onSuspendTimerStop()), Qt::QueuedConnection);
 }

 void VoiceMessagesFader::onInit() {
@@ -398,12 +414,7 @@ void VoiceMessagesFader::onTimer() {
 					if (m.state == VoiceMessagePausing || m.state == VoiceMessageFinishing) {
 						newGain = 1. - newGain;
 					}
-					if (newGain < 0) {
-						int a = 0, b;
-						b = a;
-					}
 					alSourcef(m.source, AL_GAIN, newGain);
-					LOG(("Now volume is: %1").arg(newGain));
 				}
 			} else if (playing && (state == AL_PLAYING || !m.loading)) {
 				if (state != AL_PLAYING) {
@@ -428,13 +439,44 @@ void VoiceMessagesFader::onTimer() {
 			if (fading) hasFading = true;
 		}
 	}
+	if (!hasPlaying) {
+		ALint state = AL_INITIAL;
+		alGetSourcei(notifySource, AL_SOURCE_STATE, &state);
+		if (_checkALError() && state == AL_PLAYING) {
+			hasPlaying = true;
+		}
+	}
 	if (hasFading) {
 		_timer.start(AudioFadeTimeout);
+		processContext();
 	} else if (hasPlaying) {
 		_timer.start(AudioCheckPositionTimeout);
+		processContext();
+	} else {
+		QMutexLocker lock(&_suspendMutex);
+		_suspendFlag = true;
+		_suspendTimer.start(AudioSuspendTimeout);
 	}
 }

+void VoiceMessagesFader::onSuspendTimer() {
+	QMutexLocker lock(&_suspendMutex);
+	if (_suspendFlag) {
+		alcSuspendContext(audioContext);
+	}
+}
+
+void VoiceMessagesFader::onSuspendTimerStop() {
+	if (_suspendTimer.isActive()) _suspendTimer.stop();
+}
+
+void VoiceMessagesFader::processContext() {
+	QMutexLocker lock(&_suspendMutex);
+	_suspendFlag = false;
+	emit stopSuspend();
+	alcProcessContext(audioContext);
+}
+
 struct VoiceMessagesLoader::Loader {
 	QString fname;
 	QByteArray data;
@@ -554,7 +596,7 @@ void VoiceMessagesLoader::onLoad(AudioData *audio) {

 		int ret = op_read_stereo(l->file, pcm, sizeof(pcm) / sizeof(*pcm));
 		if (ret < 0) {
-			{
+			/*{
 				QMutexLocker lock(&voicemsgsMutex);
 				VoiceMessages *voice = audioVoice();
 				if (voice) {
@@ -563,9 +605,11 @@ void VoiceMessagesLoader::onLoad(AudioData *audio) {
 						m.state = VoiceMessageStopped;
 					}
 				}
-			}
-			LOG(("Audio Error: op_read_stereo failed, error code %1").arg(ret));
-			return loadError(j);
+			}*/
+			LOG(("Audio Error: op_read_stereo failed, error code %1 (corrupted voice message?)").arg(ret));
+			finished = true;
+			break;
+//			return loadError(j);
 		}

 		int li = op_current_link(l->file);
@@ -681,6 +725,7 @@ void VoiceMessagesLoader::onLoad(AudioData *audio) {
 		alGetSourcei(m.source, AL_SOURCE_STATE, &state);
 		if (_checkALError()) {
 			if (state != AL_PLAYING) {
+				voice->processContext();
 				alSourcePlay(m.source);
 				emit needToCheck();
 			}
--- a/Telegram/SourceFiles/audio.h
+++ b/Telegram/SourceFiles/audio.h
@@ -48,6 +48,7 @@ public:
 	void pauseresume();

 	void currentState(AudioData **audio, VoiceMessageState *state = 0, int64 *position = 0, int64 *duration = 0);
+	void processContext();

 	~VoiceMessages();

@@ -112,6 +113,7 @@ class VoiceMessagesFader : public QObject {
 public:

 	VoiceMessagesFader(QThread *thread);
+	void processContext();

 signals:

@@ -120,14 +122,20 @@ signals:
 	void audioStopped(AudioData *audio);
 	void needToPreload(AudioData *audio);

+	void stopSuspend();
+
 public slots:

 	void onInit();
 	void onTimer();
+	void onSuspendTimer();
+	void onSuspendTimerStop();

 private:

-	QTimer _timer;
+	QTimer _timer, _suspendTimer;
+	QMutex _suspendMutex;
+	bool _suspendFlag;

 };

--- a/Telegram/SourceFiles/boxes/aboutbox.cpp
+++ b/Telegram/SourceFiles/boxes/aboutbox.cpp
@@ -24,12 +24,10 @@ Copyright (c) 2014 John Preston, https://desktop.telegram.org

 AboutBox::AboutBox() :
 _done(this, lang(lng_about_done), st::aboutCloseButton),
-_version(this, qsl("[a href=\"https://desktop.telegram.org/#changelog\"]") + textClean(lng_about_version(lt_version, QString::fromWCharArray(AppVersionStr))) + qsl("[/a]"), st::aboutVersion, st::defaultTextStyle),
-_text(this, lang(lng_about_text), st::aboutLabel, st::aboutTextStyle),
-_hiding(false), a_opacity(0, 1) {
+_version(this, qsl("[a href=\"https://desktop.telegram.org/#changelog\"]") + textClean(lng_about_version(lt_version, QString::fromWCharArray(AppVersionStr) + (DevChannel ? " dev" : ""))) + qsl("[/a]"), st::aboutVersion, st::defaultTextStyle),
+_text(this, lang(lng_about_text), st::aboutLabel, st::aboutTextStyle) {
 	
-	_width = st::aboutWidth;
-	_height = st::aboutHeight;
+	resizeMaxHeight(st::aboutWidth, st::aboutHeight);

 	_version.move(0, st::aboutVersionTop);
 	_text.move(0, st::aboutTextTop);
@@ -37,15 +35,11 @@ _hiding(false), a_opacity(0, 1) {
 	_headerWidth = st::aboutHeaderFont->m.width(qsl("Telegram "));
 	_subheaderWidth = st::aboutSubheaderFont->m.width(qsl("Desktop"));

-	_done.move(0, _height - _done.height());
+	_done.move(0, height() - _done.height());

 	connect(&_done, SIGNAL(clicked()), this, SLOT(onClose()));

-	resize(_width, _height);
-
-	showAll();
-	_cache = myGrab(this, rect());
-	hideAll();
+	prepare();
 }

 void AboutBox::hideAll() {
@@ -63,65 +57,21 @@ void AboutBox::showAll() {
 void AboutBox::keyPressEvent(QKeyEvent *e) {
 	if (e->key() == Qt::Key_Enter || e->key() == Qt::Key_Return) {
 		onClose();
-	} else if (e->key() == Qt::Key_Escape) {
-		onClose();
+	} else {
+		AbstractBox::keyPressEvent(e);
 	}
 }

-void AboutBox::parentResized() {
-	QSize s = parentWidget()->size();
-	setGeometry((s.width() - _width) / 2, (s.height() - _height) / 2, _width, _height);
-	update();
-}
-
 void AboutBox::paintEvent(QPaintEvent *e) {
 	QPainter p(this);
-	if (_cache.isNull()) {
-		if (!_hiding || a_opacity.current() > 0.01) {
-			// fill bg
-			p.fillRect(0, 0, _width, _height, st::boxBG->b);
+	if (paint(p)) return;

-			p.drawPixmap(QPoint((_width - st::aboutIcon.pxWidth()) / 2, st::aboutIconTop), App::sprite(), st::aboutIcon);
+	p.drawPixmap(QPoint((width() - st::aboutIcon.pxWidth()) / 2, st::aboutIconTop), App::sprite(), st::aboutIcon);

-			p.setPen(st::black->p);
-			p.setFont(st::aboutHeaderFont->f);
-            p.drawText((_width - (_headerWidth + _subheaderWidth)) / 2, st::aboutHeaderTop + st::aboutHeaderFont->ascent, qsl("Telegram"));
+	p.setPen(st::black->p);
+	p.setFont(st::aboutHeaderFont->f);
+	p.drawText((width() - (_headerWidth + _subheaderWidth)) / 2, st::aboutHeaderTop + st::aboutHeaderFont->ascent, qsl("Telegram"));

-			p.setFont(st::aboutSubheaderFont->f);
-            p.drawText((_width - (_headerWidth + _subheaderWidth)) / 2 + _headerWidth, st::aboutHeaderTop + st::aboutSubheaderFont->ascent, qsl("Desktop"));
-		}
-	} else {
-		p.setOpacity(a_opacity.current());
-		p.drawPixmap(0, 0, _cache);
-	}
-}
-
-void AboutBox::animStep(float64 ms) {
-	if (ms >= 1) {
-		a_opacity.finish();
-		_cache = QPixmap();
-		if (!_hiding) {
-			showAll();
-			setFocus();
-		}
-	} else {
-		a_opacity.update(ms, anim::linear);
-	}
-	update();
-}
-
-void AboutBox::onClose() {
-	emit closed();
-}
-
-void AboutBox::startHide() {
-	_hiding = true;
-	if (_cache.isNull()) {
-		_cache = myGrab(this, rect());
-		hideAll();
-	}
-	a_opacity.start(0);
-}
-
-AboutBox::~AboutBox() {
+	p.setFont(st::aboutSubheaderFont->f);
+	p.drawText((width() - (_headerWidth + _subheaderWidth)) / 2 + _headerWidth, st::aboutHeaderTop + st::aboutSubheaderFont->ascent, qsl("Desktop"));
 }
--- a/Telegram/SourceFiles/boxes/aboutbox.h
+++ b/Telegram/SourceFiles/boxes/aboutbox.h
@@ -17,37 +17,25 @@ Copyright (c) 2014 John Preston, https://desktop.telegram.org
 */
 #pragma once

-#include "layerwidget.h"
+#include "abstractbox.h"

-class AboutBox : public LayeredWidget {
+class AboutBox : public AbstractBox {
 	Q_OBJECT

 public:

 	AboutBox();
-	void parentResized();
-	void animStep(float64 ms);
 	void keyPressEvent(QKeyEvent *e);
 	void paintEvent(QPaintEvent *e);
-	void startHide();
-	~AboutBox();
-
-public slots:
-
-	void onClose();
-
-private:
+	
+protected:

 	void hideAll();
 	void showAll();

-	int32 _width, _height;
+private:
+
 	BottomButton _done;
 	FlatLabel _version, _text;
 	int32 _headerWidth, _subheaderWidth;
-
-	bool _hiding;
-	QPixmap _cache;
-
-	anim::fvalue a_opacity;
 };
--- a/Telegram/SourceFiles/boxes/abstractbox.cpp
+++ b/Telegram/SourceFiles/boxes/abstractbox.cpp
@@ -0,0 +1,161 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop version of Telegram messaging app, see https://telegram.org
+
+Telegram Desktop is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+It is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE
+Copyright (c) 2014 John Preston, https://desktop.telegram.org
+*/
+#include "stdafx.h"
+#include "lang.h"
+
+#include "localstorage.h"
+
+#include "abstractbox.h"
+#include "mainwidget.h"
+#include "window.h"
+
+AbstractBox::AbstractBox() : _maxHeight(0), _hiding(false), a_opacity(0, 1) {
+	resize(st::boxWidth, 0);
+}
+
+void AbstractBox::prepare() {
+	showAll();
+	_cache = myGrab(this, rect());
+	hideAll();
+}
+
+void AbstractBox::keyPressEvent(QKeyEvent *e) {
+	if (e->key() == Qt::Key_Escape) {
+		onClose();
+	} else {
+		LayeredWidget::keyPressEvent(e);
+	}
+}
+
+void AbstractBox::parentResized() {
+	int32 newHeight = countHeight();
+	setGeometry((App::wnd()->width() - width()) / 2, (App::wnd()->height() - newHeight) / 2, width(), newHeight);
+	update();
+}
+
+bool AbstractBox::paint(QPainter &p) {
+	bool result = true;
+	if (_cache.isNull()) {
+		result = (_hiding && a_opacity.current() < 0.01);
+
+		// fill bg
+		p.fillRect(rect(), st::boxBG->b);
+	} else {
+		p.setOpacity(a_opacity.current());
+		p.drawPixmap(0, 0, _cache);
+	}
+	return result;
+}
+
+void AbstractBox::paintTitle(Painter &p, const QString &title, bool withShadow) {
+	if (withShadow) {
+		// paint shadow
+		p.fillRect(0, st::boxTitleHeight, width(), st::scrollDef.topsh, st::scrollDef.shColor->b);
+	}
+
+	// paint box title
+	p.setFont(st::boxTitleFont->f);
+	p.setPen(st::black->p);
+	p.drawTextLeft(st::boxTitlePos.x(), st::boxTitlePos.y(), width(), title);
+}
+
+void AbstractBox::paintGrayTitle(QPainter &p, const QString &title) {
+	// draw box title
+	p.setFont(st::boxFont->f);
+	p.setPen(st::boxGrayTitle->p);
+	p.drawText(QRect(st::boxTitlePos.x(), st::boxTitlePos.y(), width() - 2 * st::boxTitlePos.x(), st::boxFont->height), title, style::al_top);
+}
+
+void AbstractBox::paintEvent(QPaintEvent *e) {
+	QPainter p(this);
+	if (paint(p)) return;
+}
+
+void AbstractBox::animStep(float64 ms) {
+	if (ms >= 1) {
+		a_opacity.finish();
+		_cache = QPixmap();
+		if (!_hiding) {
+			showAll();
+			showDone();
+		}
+	} else {
+		a_opacity.update(ms, anim::linear);
+	}
+	update();
+}
+
+void AbstractBox::setMaxHeight(int32 maxHeight) {
+	resizeMaxHeight(width(), maxHeight);
+}
+
+void AbstractBox::resizeMaxHeight(int32 newWidth, int32 maxHeight) {
+	if (width() != newWidth || _maxHeight != maxHeight) {
+		QRect g(geometry());
+		_maxHeight = maxHeight;
+		resize(newWidth, countHeight());
+		if (parentWidget()) parentWidget()->update(geometry().united(g).marginsAdded(QMargins(st::boxShadow.pxWidth(), st::boxShadow.pxHeight(), st::boxShadow.pxWidth(), st::boxShadow.pxHeight())));
+	}
+}
+
+int32 AbstractBox::countHeight() const {
+	return qMin(_maxHeight, App::wnd()->height() - int32(2 * st::boxVerticalMargin));
+}
+
+void AbstractBox::onClose() {
+	closePressed();
+	emit closed();
+}
+
+void AbstractBox::startHide() {
+	_hiding = true;
+	if (_cache.isNull()) {
+		_cache = myGrab(this, rect());
+		hideAll();
+	}
+	a_opacity.start(0);
+}
+
+ScrollableBox::ScrollableBox(const style::flatScroll &scroll) : AbstractBox(),
+_scroll(this, scroll), _innerPtr(0), _topSkip(st::boxTitleHeight), _bottomSkip(0) {
+}
+
+void ScrollableBox::resizeEvent(QResizeEvent *e) {
+	_scroll.setGeometry(0, _topSkip, width(), height() - _topSkip - _bottomSkip);
+}
+
+void ScrollableBox::init(QWidget *inner, int32 bottomSkip, int32 topSkip) {
+	_bottomSkip = bottomSkip;
+	_topSkip = topSkip;
+	_innerPtr = inner;
+	_scroll.setWidget(_innerPtr);
+	_scroll.setFocusPolicy(Qt::NoFocus);
+	ScrollableBox::resizeEvent(0);
+}
+
+void ScrollableBox::hideAll() {
+	_scroll.hide();
+}
+
+void ScrollableBox::showAll() {
+	_scroll.show();
+}
+
+ItemListBox::ItemListBox(const style::flatScroll &scroll) : ScrollableBox(scroll) {
+	setMaxHeight(st::boxMaxListHeight);
+}
--- a/Telegram/SourceFiles/boxes/abstractbox.h
+++ b/Telegram/SourceFiles/boxes/abstractbox.h
@@ -0,0 +1,95 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop version of Telegram messaging app, see https://telegram.org
+
+Telegram Desktop is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+It is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE
+Copyright (c) 2014 John Preston, https://desktop.telegram.org
+*/
+#pragma once
+
+#include "layerwidget.h"
+
+class AbstractBox : public LayeredWidget {
+	Q_OBJECT
+
+public:
+
+	AbstractBox();
+	void parentResized();
+	void animStep(float64 ms);
+	void keyPressEvent(QKeyEvent *e);
+	void paintEvent(QPaintEvent *e);
+	void startHide();
+	
+public slots:
+
+	void onClose();
+
+protected:
+
+	void prepare();
+	bool paint(QPainter &p);
+	void paintTitle(Painter &p, const QString &title, bool withShadow);
+	void paintGrayTitle(QPainter &p, const QString &title);
+	void setMaxHeight(int32 maxHeight);
+	void resizeMaxHeight(int32 newWidth, int32 maxHeight);
+
+	virtual void closePressed() {
+	}
+	virtual void hideAll() {
+	}
+	virtual void showAll() {
+	}
+	virtual void showDone() {
+		setFocus();
+	}
+
+private:
+
+	int32 _maxHeight;
+	int32 countHeight() const;
+
+	bool _hiding;
+	QPixmap _cache;
+
+	anim::fvalue a_opacity;
+};
+
+class ScrollableBox : public AbstractBox {
+public:
+
+	ScrollableBox(const style::flatScroll &scroll);
+	void resizeEvent(QResizeEvent *e);
+	
+protected:
+
+	void init(QWidget *inner, int32 bottomSkip = 0, int32 topSkip = st::boxTitleHeight);
+
+	virtual void hideAll();
+	virtual void showAll();
+
+	ScrollArea _scroll;
+
+private:
+
+	QWidget *_innerPtr;
+	int32 _topSkip, _bottomSkip;
+
+};
+
+class ItemListBox : public ScrollableBox {
+public:
+
+	ItemListBox(const style::flatScroll &scroll);
+
+};
--- a/Telegram/SourceFiles/boxes/addcontactbox.cpp
+++ b/Telegram/SourceFiles/boxes/addcontactbox.cpp
@@ -31,7 +31,7 @@ AddContactBox::AddContactBox(QString fname, QString lname, QString phone) :
    _firstInput(this, st::inpAddContact, lang(lng_signup_firstname), fname),
    _lastInput(this, st::inpAddContact, lang(lng_signup_lastname), lname),
    _phoneInput(this, st::inpAddContact, lang(lng_contact_phone), phone.isEmpty() ? phone : App::formatPhone(phone)),
-	_contactId(0), _addRequest(0), a_opacity(0, 1), _hiding(false) {
+	_contactId(0), _addRequest(0) {

 	if (!phone.isEmpty()) {
 		_phoneInput.setDisabled(true);
@@ -48,45 +48,32 @@ AddContactBox::AddContactBox(PeerData *peer) :
    _firstInput(this, st::inpAddContact, lang(peer->chat ? lng_dlg_new_group_name : lng_signup_firstname), peer->chat ? peer->name : peer->asUser()->firstName),
    _lastInput(this, st::inpAddContact, lang(lng_signup_lastname), peer->chat ? QString() : peer->asUser()->lastName),
    _phoneInput(this, st::inpAddContact, lang(lng_contact_phone)),
-	_contactId(0), _addRequest(0), a_opacity(0, 1), _hiding(false) {
+	_contactId(0), _addRequest(0) {

 	initBox();
 }

 void AddContactBox::initBox() {
-	_width = st::addContactWidth;
 	if (_peer) {
 		if (_peer->chat) {
 			_boxTitle = lang(lng_edit_group_title);
-			_height = st::addContactTitleHeight + st::addContactPadding.top() + 1 * _firstInput.height() + st::addContactPadding.bottom() + _addButton.height();
+			setMaxHeight(st::boxTitleHeight + st::addContactPadding.top() + 1 * _firstInput.height() + st::addContactPadding.bottom() + _addButton.height());
 		} else {
 			_boxTitle = lang(_peer == App::self() ? lng_edit_self_title : lng_edit_contact_title);
-			_height = st::addContactTitleHeight + st::addContactPadding.top() + 2 * _firstInput.height() + 1 * st::addContactDelta + st::addContactPadding.bottom() + _addButton.height();
+			setMaxHeight(st::boxTitleHeight + st::addContactPadding.top() + 2 * _firstInput.height() + 1 * st::addContactDelta + st::addContactPadding.bottom() + _addButton.height());
 		}
 	} else {
 		bool readyToAdd = !_phoneInput.text().isEmpty() && (!_firstInput.text().isEmpty() || !_lastInput.text().isEmpty());
 		_boxTitle = lang(readyToAdd ? lng_confirm_contact_data : lng_enter_contact_data);
-		_height = st::addContactTitleHeight + st::addContactPadding.top() + 3 * _firstInput.height() + 2 * st::addContactDelta + st::addContactPadding.bottom() + _addButton.height();
+		setMaxHeight(st::boxTitleHeight + st::addContactPadding.top() + 3 * _firstInput.height() + 2 * st::addContactDelta + st::addContactPadding.bottom() + _addButton.height());
 	}
-	_firstInput.setGeometry(st::addContactPadding.left(), st::addContactTitleHeight + st::addContactPadding.top(), _width - st::addContactPadding.left() - st::addContactPadding.right(), _firstInput.height());
-	_lastInput.setGeometry(st::addContactPadding.left(), _firstInput.y() + _firstInput.height() + st::addContactDelta, _firstInput.width(), _firstInput.height());
-	_phoneInput.setGeometry(st::addContactPadding.left(), _lastInput.y() + _lastInput.height() + st::addContactDelta, _lastInput.width(), _lastInput.height());
-
-	int32 buttonTop = (_peer ? (_peer->chat ? _firstInput : _lastInput) : _phoneInput).y() + _phoneInput.height() + st::addContactPadding.bottom();
-	_cancelButton.move(0, buttonTop);
-	_addButton.move(_width - _addButton.width(), buttonTop);
-	_retryButton.move(_width - _retryButton.width(), buttonTop);
 	_retryButton.hide();

 	connect(&_addButton, SIGNAL(clicked()), this, SLOT(onSend()));
 	connect(&_retryButton, SIGNAL(clicked()), this, SLOT(onRetry()));
-	connect(&_cancelButton, SIGNAL(clicked()), this, SLOT(onCancel()));
+	connect(&_cancelButton, SIGNAL(clicked()), this, SLOT(onClose()));

-	resize(_width, _height);
-
-	showAll();
-	_cache = myGrab(this, rect());
-	hideAll();
+	prepare();
 }

 void AddContactBox::hideAll() {
@@ -114,6 +101,14 @@ void AddContactBox::showAll() {
 	_cancelButton.show();
 }

+void AddContactBox::showDone() {
+	if ((_firstInput.text().isEmpty() && _lastInput.text().isEmpty()) || _phoneInput.isHidden() || !_phoneInput.isEnabled()) {
+		_firstInput.setFocus();
+	} else {
+		_phoneInput.setFocus();
+	}
+}
+
 void AddContactBox::keyPressEvent(QKeyEvent *e) {
 	if (e->key() == Qt::Key_Enter || e->key() == Qt::Key_Return) {
 		if (_firstInput.hasFocus()) {
@@ -154,65 +149,40 @@ void AddContactBox::keyPressEvent(QKeyEvent *e) {
 				onSend();
 			}
 		}
-	} else if (e->key() == Qt::Key_Escape) {
-		onCancel();
+	} else {
+		AbstractBox::keyPressEvent(e);
 	}
 }

-void AddContactBox::parentResized() {
-	QSize s = parentWidget()->size();
-	setGeometry((s.width() - _width) / 2, (s.height() - _height) / 2, _width, _height);
-	update();
-}
-
 void AddContactBox::paintEvent(QPaintEvent *e) {
-	QPainter p(this);
-	if (_cache.isNull()) {
-		if (!_hiding || a_opacity.current() > 0.01) {
-			// fill bg
-			p.fillRect(QRect(QPoint(0, 0), size()), st::boxBG->b);
+	Painter p(this);
+	if (paint(p)) return;

-			// paint shadows
-			if (_retryButton.isHidden()) {
-				p.fillRect(0, st::addContactTitleHeight, _width, st::scrollDef.topsh, st::scrollDef.shColor->b);
-			}
-			p.fillRect(0, size().height() - st::btnSelectCancel.height - st::scrollDef.bottomsh, _width, st::scrollDef.bottomsh, st::scrollDef.shColor->b);
-
-			// paint button sep
-			p.fillRect(st::btnSelectCancel.width, size().height() - st::btnSelectCancel.height, st::lineWidth, st::btnSelectCancel.height, st::btnSelectSep->b);
-
-			// draw box title / text
-			p.setPen(st::black->p);
-			p.setFont(st::addContactTitleFont->f);
-			if (_retryButton.isHidden()) {
-				p.drawText(st::addContactTitlePos.x(), st::addContactTitlePos.y() + st::addContactTitleFont->ascent, _boxTitle);
-			} else {
-				int32 h = size().height() - st::boxPadding.top() * 2 - _retryButton.height() - st::boxPadding.bottom();
-				p.drawText(QRect(st::boxPadding.left(), st::boxPadding.top(), _width - st::boxPadding.left() - st::boxPadding.right(), h), lng_contact_not_joined(lt_name, _sentName), style::al_topleft);
-			}
-		}
+	if (_retryButton.isHidden()) {
+		paintTitle(p, _boxTitle, true);
 	} else {
-		p.setOpacity(a_opacity.current());
-		p.drawPixmap(0, 0, _cache);
+		// draw box text
+		p.setPen(st::black->p);
+		p.setFont(st::boxTitleFont->f);
+		int32 h = size().height() - st::boxPadding.top() * 2 - _retryButton.height() - st::boxPadding.bottom();
+		p.drawText(QRect(st::boxPadding.left(), st::boxPadding.top(), width() - st::boxPadding.left() - st::boxPadding.right(), h), lng_contact_not_joined(lt_name, _sentName), style::al_topleft);
 	}
+
+	// paint shadows
+	p.fillRect(0, size().height() - st::btnSelectCancel.height - st::scrollDef.bottomsh, width(), st::scrollDef.bottomsh, st::scrollDef.shColor->b);
+
+	// paint button sep
+	p.fillRect(st::btnSelectCancel.width, size().height() - st::btnSelectCancel.height, st::lineWidth, st::btnSelectCancel.height, st::btnSelectSep->b);
 }

-void AddContactBox::animStep(float64 dt) {
-	if (dt >= 1) {
-		a_opacity.finish();
-		_cache = QPixmap();
-		if (!_hiding) {
-			showAll();
-			if ((_firstInput.text().isEmpty() && _lastInput.text().isEmpty()) || _phoneInput.isHidden() || !_phoneInput.isEnabled()) {
-				_firstInput.setFocus();
-			} else {
-				_phoneInput.setFocus();
-			}
-		}
-	} else {
-		a_opacity.update(dt, anim::linear);
-	}
-	update();
+void AddContactBox::resizeEvent(QResizeEvent *e) {
+	_firstInput.setGeometry(st::addContactPadding.left(), st::boxTitleHeight + st::addContactPadding.top(), width() - st::addContactPadding.left() - st::addContactPadding.right(), _firstInput.height());
+	_lastInput.setGeometry(st::addContactPadding.left(), _firstInput.y() + _firstInput.height() + st::addContactDelta, _firstInput.width(), _firstInput.height());
+	_phoneInput.setGeometry(st::addContactPadding.left(), _lastInput.y() + _lastInput.height() + st::addContactDelta, _lastInput.width(), _lastInput.height());
+
+	_cancelButton.move(0, height() - _cancelButton.height());
+	_addButton.move(width() - _addButton.width(), height() - _addButton.height());
+	_retryButton.move(width() - _retryButton.width(), height() - _retryButton.height());
 }

 void AddContactBox::onSend() {
@@ -256,7 +226,8 @@ void AddContactBox::onSaveSelfDone(const MTPUser &user) {
 }

 bool AddContactBox::onSaveSelfFail(const RPCError &error) {
-	_addRequest = 0;
+	if (error.type().startsWith(qsl("FLOOD_WAIT_"))) return false;
+
 	QString err(error.type());
 	QString firstName = textOneLine(_firstInput.text()), lastName = textOneLine(_lastInput.text());
 	if (err == "NAME_NOT_MODIFIED") {
@@ -277,6 +248,8 @@ bool AddContactBox::onSaveSelfFail(const RPCError &error) {
 }

 bool AddContactBox::onSaveFail(const RPCError &error) {
+	if (error.type().startsWith(qsl("FLOOD_WAIT_"))) return false;
+
 	_addRequest = 0;
 	QString err(error.type());
 	QString firstName = _firstInput.text().trimmed(), lastName = _lastInput.text().trimmed();
@@ -294,7 +267,7 @@ bool AddContactBox::onSaveFail(const RPCError &error) {
 }

 void AddContactBox::onImportDone(const MTPcontacts_ImportedContacts &res) {
-	if (_hiding || !App::main()) return;
+	if (isHidden() || !App::main()) return;

 	const MTPDcontacts_importedContacts &d(res.c_contacts_importedContacts());
 	App::feedUsers(d.vusers);
@@ -320,17 +293,15 @@ void AddContactBox::onImportDone(const MTPcontacts_ImportedContacts &res) {
 		_lastInput.hide();
 		_phoneInput.hide();
 		_retryButton.show();
-		int32 theight = st::addContactTitleFont->m.boundingRect(0, 0, _width - st::boxPadding.left() - st::boxPadding.right(), 1, Qt::TextWordWrap, lng_contact_not_joined(lt_name, _sentName)).height();
+		int32 theight = st::boxTitleFont->m.boundingRect(0, 0, width() - st::boxPadding.left() - st::boxPadding.right(), 1, Qt::TextWordWrap, lng_contact_not_joined(lt_name, _sentName)).height();
 		int32 h = st::boxPadding.top() * 2 + theight + _retryButton.height() + st::boxPadding.bottom();
-		resize(_width, h);
-		_retryButton.move(_retryButton.x(), h - _retryButton.height());
-		_cancelButton.move(_cancelButton.x(), h - _retryButton.height());
+		setMaxHeight(h);
 		update();
 	}
 }

-void AddContactBox::onSaveChatDone(const MTPmessages_StatedMessage &result) {
-	App::main()->sentFullDataReceived(0, result);
+void AddContactBox::onSaveChatDone(const MTPUpdates &updates) {
+	App::main()->sentUpdatesReceived(updates);
 	emit closed();
 }

@@ -340,10 +311,6 @@ void AddContactBox::onSaveUserDone(const MTPcontacts_ImportedContacts &res) {
 	emit closed();
 }

-void AddContactBox::onCancel() {
-	emit closed();
-}
-
 void AddContactBox::onRetry() {
 	_addRequest = 0;
 	_contactId = 0;
@@ -359,18 +326,6 @@ void AddContactBox::onRetry() {
 	_phoneInput.setDisabled(false);
 	_retryButton.hide();
 	_firstInput.setFocus();
-	resize(_width, _height);
+	setMaxHeight(st::boxTitleHeight + st::addContactPadding.top() + 3 * _firstInput.height() + 2 * st::addContactDelta + st::addContactPadding.bottom() + _addButton.height());
 	update();
 }
-
-void AddContactBox::startHide() {
-	_hiding = true;
-	if (_cache.isNull()) {
-		_cache = myGrab(this, rect());
-		hideAll();
-	}
-	a_opacity.start(0);
-}
-
-AddContactBox::~AddContactBox() {
-}
--- a/Telegram/SourceFiles/boxes/addcontactbox.h
+++ b/Telegram/SourceFiles/boxes/addcontactbox.h
@@ -17,39 +17,38 @@ Copyright (c) 2014 John Preston, https://desktop.telegram.org
 */
 #pragma once

-#include "layerwidget.h"
+#include "abstractbox.h"

-class AddContactBox : public LayeredWidget, public RPCSender {
+class AddContactBox : public AbstractBox, public RPCSender {
 	Q_OBJECT

 public:

 	AddContactBox(QString fname = QString(), QString lname = QString(), QString phone = QString());
 	AddContactBox(PeerData *peer);
-	void parentResized();
-	void animStep(float64 dt);
 	void keyPressEvent(QKeyEvent *e);
 	void paintEvent(QPaintEvent *e);
-	void startHide();
-	~AddContactBox();
+	void resizeEvent(QResizeEvent *e);

 public slots:

 	void onSend();
 	void onRetry();
-	void onCancel();

-private:
+protected:

 	void hideAll();
 	void showAll();
+	void showDone();
+
+private:

 	void onImportDone(const MTPcontacts_ImportedContacts &res);

 	void onSaveSelfDone(const MTPUser &user);
 	bool onSaveSelfFail(const RPCError &error);

-	void onSaveChatDone(const MTPmessages_StatedMessage &result);
+	void onSaveChatDone(const MTPUpdates &updates);
 	void onSaveUserDone(const MTPcontacts_ImportedContacts &res);
 	bool onSaveFail(const RPCError &e);

@@ -58,17 +57,11 @@ private:
 	PeerData *_peer;
 	QString _boxTitle;

-	int32 _width, _height;
 	FlatButton _addButton, _retryButton, _cancelButton;
 	FlatInput _firstInput, _lastInput, _phoneInput;

 	uint64 _contactId;

-	QPixmap _cache;
-
 	mtpRequestId _addRequest;
 	QString _sentName;
-
-	anim::fvalue a_opacity;
-	bool _hiding;
 };
--- a/Telegram/SourceFiles/boxes/addparticipantbox.cpp
+++ b/Telegram/SourceFiles/boxes/addparticipantbox.cpp
@@ -1,685 +0,0 @@
-/*
-This file is part of Telegram Desktop,
-the official desktop version of Telegram messaging app, see https://telegram.org
-
-Telegram Desktop is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-It is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE
-Copyright (c) 2014 John Preston, https://desktop.telegram.org
-*/
-#include "stdafx.h"
-#include "lang.h"
-
-#include "addparticipantbox.h"
-#include "mainwidget.h"
-#include "window.h"
-
-AddParticipantInner::AddParticipantInner(ChatData *chat) : _chat(chat),
-_contacts(&App::main()->contactsList()),
-_sel(0),
-_filteredSel(-1),
-_mouseSel(false),
-_selCount(0),
-_addContactLnk(this, lang(lng_add_contact_button)) {
-
-	connect(&_addContactLnk, SIGNAL(clicked()), App::wnd(), SLOT(onShowAddContact()));
-
-	for (DialogRow *r = _contacts->list.begin; r != _contacts->list.end; r = r->next) {
-		r->attached = 0;
-	}
-
-	_filter = qsl("a");
-	updateFilter();
-
-	connect(App::main(), SIGNAL(dialogRowReplaced(DialogRow*,DialogRow*)), this, SLOT(onDialogRowReplaced(DialogRow*,DialogRow*)));
-	connect(App::main(), SIGNAL(peerUpdated(PeerData*)), this, SLOT(peerUpdated(PeerData*)));
-	connect(App::main(), SIGNAL(peerNameChanged(PeerData*,const PeerData::Names&,const PeerData::NameFirstChars&)), this, SLOT(peerUpdated(PeerData*)));
-	connect(App::main(), SIGNAL(peerPhotoChanged(PeerData*)), this, SLOT(peerUpdated(PeerData*)));
-}
-
-void AddParticipantInner::peerUpdated(PeerData *peer) {
-	if (!peer || peer == _chat) {
-		if (_chat->forbidden) {
-			App::wnd()->hideLayer();
-		} else if (!_chat->participants.isEmpty() || _chat->count <= 0) {
-			for (ContactsData::iterator i = _contactsData.begin(), e = _contactsData.end(); i != e; ++i ) {
-				delete i.value();
-			}
-			_contactsData.clear();
-			for (DialogRow *row = _contacts->list.begin; row->next; row = row->next) {
-				row->attached = 0;
-			}
-			if (!_filter.isEmpty()) {
-				for (int32 j = 0, s = _filtered.size(); j < s; ++j) {
-					_filtered[j]->attached = 0;
-				}
-			}
-		}
-	} else if (!peer->chat) {
-		ContactsData::iterator i = _contactsData.find(peer->asUser());
-		if (i != _contactsData.cend()) {
-			for (DialogRow *row = _contacts->list.begin; row->next; row = row->next) {
-				if (row->attached == i.value()) row->attached = 0;
-			}
-			if (!_filter.isEmpty()) {
-				for (int32 j = 0, s = _filtered.size(); j < s; ++j) {
-					if (_filtered[j]->attached == i.value()) _filtered[j]->attached = 0;
-				}
-			}
-			delete i.value();
-			_contactsData.erase(i);
-		}
-	}
-		
-	parentWidget()->update();
-}
-
-void AddParticipantInner::loadProfilePhotos(int32 yFrom) {
-	int32 yTo = yFrom + (parentWidget() ? parentWidget()->height() : App::wnd()->height()) * 5;
-	MTP::clearLoaderPriorities();
-
-	if (yTo < 0) return;
-	if (yFrom < 0) yFrom = 0;
-
-	int32 rh = st::profileListPhotoSize + st::profileListPadding.height() * 2;
-	if (_filter.isEmpty()) {
-		if (_contacts->list.count) {
-			_contacts->list.adjustCurrent(yFrom, rh);
-			for (
-				DialogRow *preloadFrom = _contacts->list.current;
-				preloadFrom != _contacts->list.end && preloadFrom->pos * rh < yTo;
-				preloadFrom = preloadFrom->next
-			) {
-				preloadFrom->history->peer->photo->load();
-			}
-		}
-	} else if (!_filtered.isEmpty()) {
-		int32 from = yFrom / rh;
-		if (from < 0) from = 0;
-		if (from < _filtered.size()) {
-			int32 to = (yTo / rh) + 1;
-			if (to > _filtered.size()) to = _filtered.size();
-
-			for (; from < to; ++from) {
-				_filtered[from]->history->peer->photo->load();
-			}
-		}
-	}
-}
-
-AddParticipantInner::ContactData *AddParticipantInner::contactData(DialogRow *row) {
-	ContactData *data = (ContactData*)row->attached;
-	if (!data) {
-		UserData *user = row->history->peer->asUser();
-		ContactsData::const_iterator i = _contactsData.constFind(user);
-		if (i == _contactsData.cend()) {
-			_contactsData.insert(user, data = new ContactData());
-			data->inchat = _chat->participants.constFind(user) != _chat->participants.cend();
-			data->check = false;
-			data->name.setText(st::profileListNameFont, user->name, _textNameOptions);
-			data->online = App::onlineText(user, _time);
-		} else {
-			data = i.value();
-		}
-		row->attached = data;
-	}
-	return data;
-}
-
-void AddParticipantInner::paintDialog(QPainter &p, DialogRow *row, bool sel) {
-	int32 left = st::profileListPadding.width();
-
-	UserData *user = row->history->peer->asUser();
-	ContactData *data = contactData(row);
-
-	if (data->inchat || data->check || _selCount + _chat->count >= cMaxGroupCount()) {
-		sel = false;
-	}
-
-	if (sel || data->inchat || data->check) {
-		p.fillRect(0, 0, width(), 2 * st::profileListPadding.height() + st::profileListPhotoSize, ((data->inchat || data->check) ? st::profileActiveBG : st::profileHoverBG)->b);
-	}
-
-	p.drawPixmap(left, st::profileListPadding.height(), user->photo->pix(st::profileListPhotoSize));
-
-	if (data->inchat || data->check) {
-		p.setPen(st::white->p);
-	} else {
-		p.setPen(st::profileListNameColor->p);
-	}
-	data->name.drawElided(p, left + st::profileListPhotoSize + st::profileListPadding.width(), st::profileListNameTop, width() - st::participantDelta - st::profileListPadding.width() * 2 - st::profileListPhotoSize - st::profileListPadding.width() * 2);
-
-	if (sel || data->check) {
-		p.drawPixmap(QPoint(width() - st::profileCheckRect.pxWidth() - st::profileCheckDeltaX, st::profileListPadding.height() + (st::profileListPhotoSize - st::profileCheckRect.pxHeight()) / 2 - st::profileCheckDeltaY), App::sprite(), (data->check ? st::profileCheckActiveRect : st::profileCheckRect));
-	}
-
-	p.setFont(st::profileSubFont->f);
-	if (data->inchat || data->check) {
-		p.setPen(st::white->p);
-	} else {
-		p.setPen((user->onlineTill >= _time ? st::profileOnlineColor : st::profileOfflineColor)->p);
-	}
-	p.drawText(left + st::profileListPhotoSize + st::profileListPadding.width(), st::profileListPadding.height() + st::profileListPhotoSize - st::profileListStatusBottom, data->online);
-}
-
-void AddParticipantInner::paintEvent(QPaintEvent *e) {
-	QRect r(e->rect());
-	QPainter p(this);
-
-	_time = unixtime();
-	p.fillRect(r, st::white->b);
-
-	int32 yFrom = r.top();
-	int32 rh = st::profileListPhotoSize + st::profileListPadding.height() * 2;
-	if (_filter.isEmpty()) {
-		if (_contacts->list.count) {
-			_contacts->list.adjustCurrent(yFrom, rh);
-
-			DialogRow *drawFrom = _contacts->list.current;
-			p.translate(0, drawFrom->pos * rh);
-			while (drawFrom != _contacts->list.end && drawFrom->pos * rh < r.bottom()) {
-				paintDialog(p, drawFrom, (drawFrom == _sel));
-				p.translate(0, rh);
-				drawFrom = drawFrom->next;
-			}
-		} else {
-			p.setFont(st::noContactsFont->f);
-			p.setPen(st::noContactsColor->p);
-			p.drawText(QRect(0, 0, width(), st::noContactsHeight - (cContactsReceived() ? st::noContactsFont->height : 0)), lang(cContactsReceived() ? lng_no_contacts : lng_contacts_loading), style::al_center);
-		}
-	} else {
-		if (_filtered.isEmpty()) {
-			p.setFont(st::noContactsFont->f);
-			p.setPen(st::noContactsColor->p);
-			p.drawText(QRect(0, 0, width(), st::noContactsHeight), lang(lng_contacts_not_found), style::al_center);
-		} else {
-			int32 from = yFrom / rh;
-			if (from < 0) from = 0;
-			if (from < _filtered.size()) {
-				int32 to = (r.bottom() / rh) + 1;
-				if (to > _filtered.size()) to = _filtered.size();
-
-				p.translate(0, from * rh);
-				for (; from < to; ++from) {
-					paintDialog(p, _filtered[from], (_filteredSel == from));
-					p.translate(0, rh);
-				}
-			}
-		}
-	}
-}
-
-void AddParticipantInner::enterEvent(QEvent *e) {
-	setMouseTracking(true);
-}
-
-void AddParticipantInner::leaveEvent(QEvent *e) {
-	setMouseTracking(false);
-	updateSel();
-}
-
-void AddParticipantInner::mouseMoveEvent(QMouseEvent *e) {
-	_mouseSel = true;
-	_lastMousePos = e->globalPos();
-	updateSel();
-}
-
-void AddParticipantInner::mousePressEvent(QMouseEvent *e) {
-	_mouseSel = true;
-	_lastMousePos = e->globalPos();
-	updateSel();
-	if (e->button() == Qt::LeftButton) {
-		chooseParticipant();
-	}
-}
-
-void AddParticipantInner::chooseParticipant() {
-	_time = unixtime();
-	int32 rh = st::profileListPhotoSize + st::profileListPadding.height() * 2, from;
-	if (_filter.isEmpty()) {
-		if (!_sel || contactData(_sel)->inchat) return;
-		changeCheckState(_sel);
-	} else {
-		if (_filteredSel < 0 || _filteredSel >= _filtered.size() || contactData(_filtered[_filteredSel])->inchat) return;
-
-		DialogRow *row = _filtered[_filteredSel];
-		changeCheckState(row);
-
-		PeerData *peer = row->history->peer;
-		emit selectAllQuery();
-	}
-	parentWidget()->update();
-}
-
-void AddParticipantInner::changeCheckState(DialogRow *row) {
-	if (contactData(row)->check) {
-		contactData(row)->check = false;
-		--_selCount;
-	} else if (_selCount + _chat->count < cMaxGroupCount()) {
-		contactData(row)->check = true;
-		++_selCount;
-	}
-}
-
-ChatData *AddParticipantInner::chat() {
-	return _chat;
-}
-
-QVector<UserData*> AddParticipantInner::selected() {
-	QVector<UserData*> result;
-	result.reserve(_contactsData.size());
-	for (ContactsData::const_iterator i = _contactsData.cbegin(), e = _contactsData.cend(); i != e; ++i) {
-		if (i.value()->check) {
-			result.push_back(i.key());
-		}
-	}
-	return result;
-}
-
-void AddParticipantInner::updateSel() {
-	if (!_mouseSel) return;
-
-	QPoint p(mapFromGlobal(_lastMousePos));
-	int32 rh = st::profileListPhotoSize + st::profileListPadding.height() * 2;
-	if (_filter.isEmpty()) {
-		DialogRow *newSel = rect().contains(p) ? _contacts->list.rowAtY(p.y(), rh) : 0;
-		if (newSel != _sel) {
-			_sel = newSel;
-			parentWidget()->update();
-		}		
-	} else {
-		int32 newFilteredSel = (p.y() >= 0 && rect().contains(p)) ? (p.y() / rh) : -1;
-		if (newFilteredSel != _filteredSel) {
-			_filteredSel = newFilteredSel;
-			parentWidget()->update();
-		}
-	}
-}
-
-void AddParticipantInner::updateFilter(QString filter) {
-	filter = textSearchKey(filter);
-
-	_time = unixtime();
-	QStringList f;
-	if (!filter.isEmpty()) {
-		QStringList filterList = filter.split(cWordSplit(), QString::SkipEmptyParts);
-		int l = filterList.size();
-
-		f.reserve(l);
-		for (int i = 0; i < l; ++i) {
-			QString filterName = filterList[i].trimmed();
-			if (filterName.isEmpty()) continue;
-			f.push_back(filterName);
-		}
-		filter = f.join(' ');
-	}
-	if (_filter != filter) {
-		int32 rh = (st::profileListPhotoSize + st::profileListPadding.height() * 2);
-		_filter = filter;
-		if (_filter.isEmpty()) {
-			if (_contacts->list.count) {
-				if (!_addContactLnk.isHidden()) _addContactLnk.hide();
-				resize(width(), _contacts->list.count * rh);
-				_sel = _contacts->list.begin;
-				while (_sel->next->next &&& contactData(_sel)->inchat) {
-					_sel = _sel->next;
-				}
-			} else {
-				resize(width(), st::noContactsHeight);
-				if (cContactsReceived()) {
-					if (_addContactLnk.isHidden()) _addContactLnk.show();
-				} else {
-					if (!_addContactLnk.isHidden()) _addContactLnk.hide();
-				}
-			}
-		} else {
-			if (!_addContactLnk.isHidden()) _addContactLnk.hide();
-			QStringList::const_iterator fb = f.cbegin(), fe = f.cend(), fi;
-
-			_filtered.clear();
-			if (!f.isEmpty()) {
-				DialogsList *dialogsToFilter = 0;
-				if (_contacts->list.count) {
-					for (fi = fb; fi != fe; ++fi) {
-						DialogsIndexed::DialogsIndex::iterator i = _contacts->index.find(fi->at(0));
-						if (i == _contacts->index.cend()) {
-							dialogsToFilter = 0;
-							break;
-						}
-						if (!dialogsToFilter || dialogsToFilter->count > i.value()->count) {
-							dialogsToFilter = i.value();
-						}
-					}
-				}
-				if (dialogsToFilter && dialogsToFilter->count) {
-					_filtered.reserve(dialogsToFilter->count);
-					for (DialogRow *i = dialogsToFilter->begin, *e = dialogsToFilter->end; i != e; i = i->next) {
-						const PeerData::Names &names(i->history->peer->names);
-						PeerData::Names::const_iterator nb = names.cbegin(), ne = names.cend(), ni;
-						for (fi = fb; fi != fe; ++fi) {
-							QString filterName(*fi);
-							for (ni = nb; ni != ne; ++ni) {
-								if (ni->startsWith(*fi)) {
-									break;
-								}
-							}
-							if (ni == ne) {
-								break;
-							}
-						}
-						if (fi == fe) {
-							i->attached = 0;
-							_filtered.push_back(i);
-						}
-					}
-				}
-			}
-			_filteredSel = _filtered.isEmpty() ? -1 : 0;
-			while (_filteredSel < _filtered.size() - 1 && contactData(_filtered[_filteredSel])->inchat) {
-				++_filteredSel;
-			}
-
-			if (!_filtered.isEmpty()) {
-				resize(width(), _filtered.size() * rh);
-			} else {
-				resize(width(), st::noContactsHeight);
-			}
-		}
-		if (parentWidget()) parentWidget()->update();
-		loadProfilePhotos(0);
-	}
-}
-
-void AddParticipantInner::onDialogRowReplaced(DialogRow *oldRow, DialogRow *newRow) {
-	if (!_filter.isEmpty()) {
-		for (FilteredDialogs::iterator i = _filtered.begin(), e = _filtered.end(); i != e;) {
-			if (*i == oldRow) { // this row is shown in filtered and maybe is in contacts!
-				if (newRow) {
-					*i = newRow;
-					++i;
-				} else {
-					i = _filtered.erase(i);
-				}
-			} else {
-				++i;
-			}
-		}
-		if (_filteredSel >= _filtered.size()) {
-			_filteredSel = -1;
-		}
-	} else {
-		if (_sel == oldRow) {
-			_sel = newRow;
-		}
-	}
-	_mouseSel = false;
-	int32 rh = (st::profileListPhotoSize + st::profileListPadding.height() * 2);
-	int32 newh = (_filter.isEmpty() ? _contacts->list.count : _filtered.size()) * rh;
-	resize(width(), newh);
-}
-
-AddParticipantInner::~AddParticipantInner() {
-	for (ContactsData::iterator i = _contactsData.begin(), e = _contactsData.end(); i != e; ++i) {
-		delete *i;
-	}
-}
-
-void AddParticipantInner::resizeEvent(QResizeEvent *e) {
-	_addContactLnk.move((width() - _addContactLnk.width()) / 2, (st::noContactsHeight + st::noContactsFont->height) / 2);
-}
-
-void AddParticipantInner::selectSkip(int32 dir) {
-	_time = unixtime();
-	_mouseSel = false;
-	int32 rh = st::profileListPhotoSize + st::profileListPadding.height() * 2, origDir = dir;
-	if (_filter.isEmpty()) {
-		if (_sel) {
-			if (dir > 0) {
-				while (dir && _sel->next->next) {
-					_sel = _sel->next;
-					--dir;
-				}
-				while (contactData(_sel)->inchat && _sel->next->next) {
-					_sel = _sel->next;
-				}
-				if (contactData(_sel)->inchat) {
-					while (contactData(_sel)->inchat && _sel->prev) {
-						_sel = _sel->prev;
-					}
-				}
-			} else {
-				while (dir && _sel->prev) {
-					_sel = _sel->prev;
-					++dir;
-				}
-				while (contactData(_sel)->inchat && _sel->prev) {
-					_sel = _sel->prev;
-				}
-				if (contactData(_sel)->inchat) {
-					while (contactData(_sel)->inchat && _sel->next->next) {
-						_sel = _sel->next;
-					}
-				}
-			}
-		} else if (dir > 0 && _contacts->list.count) {
-			_sel = _contacts->list.begin;
-			while (contactData(_sel)->inchat && _sel->next->next) {
-				_sel = _sel->next;
-			}
-		}
-		if (_sel) {
-			if (contactData(_sel)->inchat) {
-				_sel = 0;
-			} else {
-				emit mustScrollTo(_sel->pos * rh, (_sel->pos + 1) * rh);
-			}
-		}
-	} else {
-		if (dir > 0) {
-			if (_filteredSel < 0 && dir > 1) {
-				_filteredSel = 0;
-			}
-			_filteredSel += dir;
-			while (_filteredSel < _filtered.size() - 1 && contactData(_filtered[_filteredSel])->inchat) {
-				++_filteredSel;
-			}
-			if (_filteredSel >= _filtered.size()) {
-				_filteredSel = _filtered.size() - 1;
-			}
-			while (_filteredSel > 0 && contactData(_filtered[_filteredSel])->inchat) {
-				--_filteredSel;
-			}
-		} else if (_filteredSel > 0) {
-			_filteredSel += dir;
-			if (_filteredSel < 0) {
-				_filteredSel = 0;
-			}
-			if (_filteredSel < _filtered.size() - 1) {
-				while (_filteredSel > 0 && contactData(_filtered[_filteredSel])->inchat) {
-					--_filteredSel;
-				}
-			}
-			while (_filteredSel < _filtered.size() - 1 && contactData(_filtered[_filteredSel])->inchat) {
-				++_filteredSel;
-			}
-		}
-		if (_filteredSel >= 0) {
-			if (contactData(_filtered[_filteredSel])->inchat) {
-				_filteredSel = -1;
-			} else {
-				emit mustScrollTo(_filteredSel * rh, (_filteredSel + 1) * rh);
-			}
-		}
-	}
-	parentWidget()->update();
-}
-
-void AddParticipantInner::selectSkipPage(int32 h, int32 dir) {
-	int32 rh = st::profileListPhotoSize + st::profileListPadding.height() * 2;
-	int32 points = h / rh;
-	if (!points) return;
-	selectSkip(points * dir);
-}
-
-AddParticipantBox::AddParticipantBox(ChatData *chat) :
-	_scroll(this, st::newGroupScroll), _inner(chat),
-	_filter(this, st::contactsFilter, lang(lng_participant_filter)),
-	_invite(this, lang(lng_participant_invite), st::btnSelectDone),
-	_cancel(this, lang(lng_cancel), st::btnSelectCancel),
-	_hiding(false), a_opacity(0, 1), af_opacity(anim::linear) {
-
-	_width = st::participantWidth;
-	_height = App::wnd()->height() - st::boxPadding.top() - st::boxPadding.bottom();
-	if (_height > st::participantMaxHeight) _height = st::participantMaxHeight;
-
-	resize(_width, _height);
-
-	_scroll.setWidget(&_inner);
-	_scroll.setFocusPolicy(Qt::NoFocus);
-
-	connect(&_invite, SIGNAL(clicked()), this, SLOT(onInvite()));
-	connect(&_cancel, SIGNAL(clicked()), this, SIGNAL(closed()));
-	connect(&_scroll, SIGNAL(scrolled()), &_inner, SLOT(updateSel()));
-	connect(&_scroll, SIGNAL(scrolled()), this, SLOT(onScroll()));
-	connect(&_filter, SIGNAL(changed()), this, SLOT(onFilterUpdate()));
-	connect(&_filter, SIGNAL(cancelled()), this, SLOT(onClose()));
-	connect(&_inner, SIGNAL(mustScrollTo(int,int)), &_scroll, SLOT(scrollToY(int,int)));
-	connect(&_inner, SIGNAL(selectAllQuery()), &_filter, SLOT(selectAll()));
-
-	showAll();
-	_cache = myGrab(this, rect());
-	hideAll();
-}
-
-void AddParticipantBox::hideAll() {
-	_filter.hide();
-	_scroll.hide();
-	_cancel.hide();
-	_invite.hide();
-}
-
-void AddParticipantBox::showAll() {
-	_filter.show();
-	_scroll.show();
-	_cancel.show();
-	_invite.show();
-}
-
-void AddParticipantBox::keyPressEvent(QKeyEvent *e) {
-	if (e->key() == Qt::Key_Escape) {
-		onClose();
-	} else if (e->key() == Qt::Key_Return || e->key() == Qt::Key_Enter) {
-		_inner.chooseParticipant();
-	} else if (e->key() == Qt::Key_Down) {
-		_inner.selectSkip(1);
-	} else if (e->key() == Qt::Key_Up) {
-		_inner.selectSkip(-1);
-	} else if (e->key() == Qt::Key_PageDown) {
-		_inner.selectSkipPage(_scroll.height(), 1);
-	} else if (e->key() == Qt::Key_PageUp) {
-		_inner.selectSkipPage(_scroll.height(), -1);
-	} else {
-		e->ignore();
-	}
-}
-
-void AddParticipantBox::parentResized() {
-	QSize s = parentWidget()->size();
-	_height = App::wnd()->height() - st::boxPadding.top() - st::boxPadding.bottom();
-	if (_height > st::participantMaxHeight) _height = st::participantMaxHeight;
-	setGeometry((s.width() - _width) / 2, (s.height() - _height) / 2, _width, _height);
-	update();
-}
-
-void AddParticipantBox::paintEvent(QPaintEvent *e) {
-	QPainter p(this);
-	if (_cache.isNull()) {
-		if (!_hiding || a_opacity.current() > 0.01) {
-			// fill bg
-			p.fillRect(QRect(QPoint(0, 0), size()), st::boxBG->b);
-
-			// paint shadows
-			p.fillRect(0, st::participantFilter.height, _width, st::scrollDef.topsh, st::scrollDef.shColor->b);
-			p.fillRect(0, size().height() - st::btnSelectCancel.height - st::scrollDef.bottomsh, _width, st::scrollDef.bottomsh, st::scrollDef.shColor->b);
-
-			// paint button sep
-			p.fillRect(st::btnSelectCancel.width, size().height() - st::btnSelectCancel.height, st::lineWidth, st::btnSelectCancel.height, st::btnSelectSep->b);
-
-			// draw box title / text
-			p.setPen(st::black->p);
-			p.setFont(st::addContactTitleFont->f);
-			p.drawText(st::addContactTitlePos.x(), st::addContactTitlePos.y() + st::addContactTitleFont->ascent, lang(lng_profile_add_participant));
-		}
-	} else {
-		p.setOpacity(a_opacity.current());
-		p.drawPixmap(0, 0, _cache);
-	}
-}
-
-void AddParticipantBox::resizeEvent(QResizeEvent *e) {
-	LayeredWidget::resizeEvent(e);
-	_filter.move(st::newGroupNamePadding.left(), st::contactsAdd.height + st::newGroupNamePadding.top());
-	_inner.resize(_width, _inner.height());
-	_scroll.resize(_width, _height - st::contactsAdd.height - st::newGroupNamePadding.top() - _filter.height() - st::newGroupNamePadding.bottom() - _cancel.height());
-	_scroll.move(0, _filter.y() + _filter.height() + st::newGroupNamePadding.bottom());
-	_invite.move(width() - _invite.width(), _height - _invite.height());
-	_cancel.move(0, _height - _cancel.height());
-}
-
-void AddParticipantBox::animStep(float64 dt) {
-	if (dt >= 1) {
-		a_opacity.finish();
-		_cache = QPixmap();
-		if (!_hiding) {
-			showAll();
-			_filter.setFocus();
-		}
-	} else {
-		a_opacity.update(dt, af_opacity);
-	}
-	update();
-}
-
-void AddParticipantBox::startHide() {
-	_hiding = true;
-	if (_cache.isNull()) {
-		_cache = myGrab(this, rect());
-		hideAll();
-	}
-	a_opacity.start(0);
-}
-
-void AddParticipantBox::onFilterUpdate() {
-	_scroll.scrollToY(0);
-	_inner.updateFilter(_filter.text());
-}
-
-void AddParticipantBox::onClose() {
-	emit closed();
-}
-
-void AddParticipantBox::onInvite() {
-	QVector<UserData*> users(_inner.selected());
-	if (users.isEmpty()) {
-		_filter.setFocus();
-		return;
-	}
-
-	App::main()->addParticipants(_inner.chat(), users);
-}
-
-void AddParticipantBox::onScroll() {
-	_inner.loadProfilePhotos(_scroll.scrollTop());
-}
-
-AddParticipantBox::~AddParticipantBox() {
-
-}
--- a/Telegram/SourceFiles/boxes/addparticipantbox.h
+++ b/Telegram/SourceFiles/boxes/addparticipantbox.h
@@ -1,133 +0,0 @@
-/*
-This file is part of Telegram Desktop,
-the official desktop version of Telegram messaging app, see https://telegram.org
-
-Telegram Desktop is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-It is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE
-Copyright (c) 2014 John Preston, https://desktop.telegram.org
-*/
-#pragma once
-
-#include "layerwidget.h"
-
-class AddParticipantInner : public QWidget, public RPCSender {
-	Q_OBJECT
-
-public:
-
-	AddParticipantInner(ChatData *chat);
-
-	void paintEvent(QPaintEvent *e);
-	void enterEvent(QEvent *e);
-	void leaveEvent(QEvent *e);
-	void mouseMoveEvent(QMouseEvent *e);
-	void mousePressEvent(QMouseEvent *e);
-	void resizeEvent(QResizeEvent *e);
-	
-	void paintDialog(QPainter &p, DialogRow *row, bool sel);
-	void updateFilter(QString filter = QString());
-
-	void selectSkip(int32 dir);
-	void selectSkipPage(int32 h, int32 dir);
-
-	void loadProfilePhotos(int32 yFrom);
-	void chooseParticipant();
-	void changeCheckState(DialogRow *row);
-
-	ChatData *chat();
-	QVector<UserData*> selected();
-
-	~AddParticipantInner();
-
-signals:
-
-	void mustScrollTo(int ymin, int ymax);
-	void selectAllQuery();
-
-public slots:
-
-	void onDialogRowReplaced(DialogRow *oldRow, DialogRow *newRow);
-
-	void updateSel();
-	void peerUpdated(PeerData *peer);
-
-private:
-
-	ChatData *_chat;
-
-	int32 _time;
-
-	DialogsIndexed *_contacts;
-	DialogRow *_sel;
-	QString _filter;
-	typedef QVector<DialogRow*> FilteredDialogs;
-	FilteredDialogs _filtered;
-	int32 _filteredSel;
-	bool _mouseSel;
-
-	int32 _selCount;
-
-	typedef struct {
-		Text name;
-		QString online;
-		bool inchat;
-		bool check;
-	} ContactData;
-	typedef QMap<UserData*, ContactData*> ContactsData;
-	ContactsData _contactsData;
-
-	ContactData *contactData(DialogRow *row);
-
-	QPoint _lastMousePos;
-	LinkButton _addContactLnk;
-
-};
-
-class AddParticipantBox : public LayeredWidget {
-	Q_OBJECT
-
-public:
-
-	AddParticipantBox(ChatData *chat);
-	void parentResized();
-	void animStep(float64 dt);
-	void keyPressEvent(QKeyEvent *e);
-	void paintEvent(QPaintEvent *e);
-	void resizeEvent(QResizeEvent *e);
-	void startHide();
-	~AddParticipantBox();
-
-public slots:
-
-	void onFilterUpdate();
-	void onClose();
-	void onScroll();
-	void onInvite();
-
-private:
-
-	void hideAll();
-	void showAll();
-
-	ScrollArea _scroll;
-	AddParticipantInner _inner;
-	int32 _width, _height;
-	FlatInput _filter;
-	FlatButton _invite, _cancel;
-
-	bool _hiding;
-
-	QPixmap _cache;
-
-	anim::fvalue a_opacity;
-	anim::transition af_opacity;
-};
--- a/Telegram/SourceFiles/boxes/autolockbox.cpp
+++ b/Telegram/SourceFiles/boxes/autolockbox.cpp
@@ -0,0 +1,92 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop version of Telegram messaging app, see https://telegram.org
+
+Telegram Desktop is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+It is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE
+Copyright (c) 2014 John Preston, https://desktop.telegram.org
+*/
+#include "stdafx.h"
+#include "lang.h"
+
+#include "localstorage.h"
+
+#include "autolockbox.h"
+#include "confirmbox.h"
+#include "mainwidget.h"
+#include "window.h"
+
+AutoLockBox::AutoLockBox() :
+_done(this, lang(lng_about_done), st::langsCloseButton) {
+
+	bool haveTestLang = (cLang() == languageTest);
+
+	int32 opts[] = { 60, 300, 3600, 18000 }, cnt = sizeof(opts) / sizeof(opts[0]);
+
+	resizeMaxHeight(st::langsWidth, st::boxTitleHeight + st::langsPadding.top() + st::langsPadding.bottom() + cnt * (st::langPadding.top() + st::rbDefFlat.height + st::langPadding.bottom()) + _done.height());
+
+	int32 y = st::boxTitleHeight + st::langsPadding.top();
+	_options.reserve(cnt);
+	for (int32 i = 0; i < cnt; ++i) {
+		int32 v = opts[i];
+		_options.push_back(new FlatRadiobutton(this, qsl("autolock"), v, (v % 3600) ? lng_passcode_autolock_minutes(lt_count, v / 60) : lng_passcode_autolock_hours(lt_count, v / 3600), (cAutoLock() == v), st::langButton));
+		_options.back()->move(st::langsPadding.left() + st::langPadding.left(), y + st::langPadding.top());
+		y += st::langPadding.top() + _options.back()->height() + st::langPadding.bottom();
+		connect(_options.back(), SIGNAL(changed()), this, SLOT(onChange()));
+	}
+
+	connect(&_done, SIGNAL(clicked()), this, SLOT(onClose()));
+
+	_done.move(0, height() - _done.height());
+	prepare();
+}
+
+void AutoLockBox::hideAll() {
+	_done.hide();
+	for (int32 i = 0, l = _options.size(); i < l; ++i) {
+		_options[i]->hide();
+	}
+}
+
+void AutoLockBox::showAll() {
+	_done.show();
+	for (int32 i = 0, l = _options.size(); i < l; ++i) {
+		_options[i]->show();
+	}
+}
+
+void AutoLockBox::paintEvent(QPaintEvent *e) {
+	Painter p(this);
+	if (paint(p)) return;
+
+	paintTitle(p, lang(lng_passcode_autolock), true);
+}
+
+void AutoLockBox::onChange() {
+	if (isHidden()) return;
+
+	for (int32 i = 0, l = _options.size(); i < l; ++i) {
+		int32 v = _options[i]->val();
+		if (_options[i]->checked()) {
+			cSetAutoLock(v);
+			Local::writeUserSettings();
+		}
+	}
+	App::wnd()->checkAutoLock();
+	onClose();
+}
+
+AutoLockBox::~AutoLockBox() {
+	for (int32 i = 0, l = _options.size(); i < l; ++i) {
+		delete _options[i];
+	}
+}
--- a/Telegram/SourceFiles/boxes/autolockbox.h
+++ b/Telegram/SourceFiles/boxes/autolockbox.h
@@ -17,5 +17,28 @@ Copyright (c) 2014 John Preston, https://desktop.telegram.org
 */
 #pragma once

-void readSupportTemplates();
-const QString &supportTemplate(const QString &key);
+#include "abstractbox.h"
+
+class AutoLockBox : public AbstractBox {
+	Q_OBJECT
+
+public:
+
+	AutoLockBox();
+	void paintEvent(QPaintEvent *e);
+	~AutoLockBox();
+
+public slots:
+
+	void onChange();
+
+protected:
+
+	void hideAll();
+	void showAll();
+
+private:
+
+	QVector<FlatRadiobutton*> _options;
+	BottomButton _done;
+};
--- a/Telegram/SourceFiles/boxes/backgroundbox.cpp
+++ b/Telegram/SourceFiles/boxes/backgroundbox.cpp
@@ -0,0 +1,216 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop version of Telegram messaging app, see https://telegram.org
+
+Telegram Desktop is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+It is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE
+Copyright (c) 2014 John Preston, https://desktop.telegram.org
+*/
+#include "stdafx.h"
+#include "lang.h"
+
+#include "backgroundbox.h"
+#include "mainwidget.h"
+#include "window.h"
+#include "settingswidget.h"
+
+BackgroundInner::BackgroundInner() :
+_bgCount(0), _rows(0), _over(-1), _overDown(-1) {
+	if (App::cServerBackgrounds().isEmpty()) {
+		resize(BackgroundsInRow * (st::backgroundSize.width() + st::backgroundPadding) + st::backgroundPadding, 2 * (st::backgroundSize.height() + st::backgroundPadding) + st::backgroundPadding);
+		MTP::send(MTPaccount_GetWallPapers(), rpcDone(&BackgroundInner::gotWallpapers));
+	} else {
+		updateWallpapers();
+	}
+	setMouseTracking(true);
+}
+
+void BackgroundInner::gotWallpapers(const MTPVector<MTPWallPaper> &result) {
+	App::WallPapers wallpapers;
+
+	wallpapers.push_back(App::WallPaper(0, ImagePtr(st::msgBG0), ImagePtr(st::msgBG0)));
+	const QVector<MTPWallPaper> &v(result.c_vector().v);
+	for (int i = 0, l = v.size(); i < l; ++i) {
+		const MTPWallPaper w(v.at(i));
+		switch (w.type()) {
+		case mtpc_wallPaper: {
+			const MTPDwallPaper &d(w.c_wallPaper());
+			const QVector<MTPPhotoSize> &sizes(d.vsizes.c_vector().v);
+			const MTPPhotoSize *thumb = 0, *full = 0;
+			int32 thumbLevel = -1, fullLevel = -1;
+			for (QVector<MTPPhotoSize>::const_iterator j = sizes.cbegin(), e = sizes.cend(); j != e; ++j) {
+				char size = 0;
+				int32 w = 0, h = 0;
+				switch (j->type()) {
+				case mtpc_photoSize: {
+					const string &s(j->c_photoSize().vtype.c_string().v);
+					if (s.size()) size = s[0];
+					w = j->c_photoSize().vw.v;
+					h = j->c_photoSize().vh.v;
+				} break;
+
+				case mtpc_photoCachedSize: {
+					const string &s(j->c_photoCachedSize().vtype.c_string().v);
+					if (s.size()) size = s[0];
+					w = j->c_photoCachedSize().vw.v;
+					h = j->c_photoCachedSize().vh.v;
+				} break;
+				}
+				if (!size || !w || !h) continue;
+
+				int32 newThumbLevel = qAbs((st::backgroundSize.width() * cIntRetinaFactor()) - w), newFullLevel = qAbs(2560 - w);
+				if (thumbLevel < 0 || newThumbLevel < thumbLevel) {
+					thumbLevel = newThumbLevel;
+					thumb = &(*j);
+				}
+				if (fullLevel < 0 || newFullLevel < fullLevel) {
+					fullLevel = newFullLevel;
+					full = &(*j);
+				}
+			}
+			if (thumb && full && full->type() != mtpc_photoSizeEmpty) {
+				wallpapers.push_back(App::WallPaper(d.vid.v ? d.vid.v : INT_MAX, App::image(*thumb), App::image(*full)));
+			}
+		} break;
+
+		case mtpc_wallPaperSolid: {
+			const MTPDwallPaperSolid &d(w.c_wallPaperSolid());
+		} break;
+		}
+	}
+
+	App::cSetServerBackgrounds(wallpapers);
+	updateWallpapers();
+}
+
+void BackgroundInner::updateWallpapers() {
+	_bgCount = App::cServerBackgrounds().size();
+	_rows = _bgCount / BackgroundsInRow;
+	if (_bgCount % BackgroundsInRow) ++_rows;
+
+	resize(BackgroundsInRow * (st::backgroundSize.width() + st::backgroundPadding) + st::backgroundPadding, _rows * (st::backgroundSize.height() + st::backgroundPadding) + st::backgroundPadding);
+	for (int i = 0; i < BackgroundsInRow * 3; ++i) {
+		if (i >= _bgCount) break;
+
+		App::cServerBackgrounds().at(i).thumb->load();
+	}
+}
+
+void BackgroundInner::paintEvent(QPaintEvent *e) {
+	QRect r(e->rect());
+	QPainter p(this);
+
+	if (_rows) {
+		for (int i = 0; i < _rows; ++i) {
+			if ((st::backgroundSize.height() + st::backgroundPadding) * (i + 1) <= r.top()) continue;
+			for (int j = 0; j < BackgroundsInRow; ++j) {
+				int index = i * BackgroundsInRow + j;
+				if (index >= _bgCount) break;
+
+				const App::WallPaper &paper(App::cServerBackgrounds().at(index));
+				paper.thumb->load();
+
+				int x = st::backgroundPadding + j * (st::backgroundSize.width() + st::backgroundPadding);
+				int y = st::backgroundPadding + i * (st::backgroundSize.height() + st::backgroundPadding);
+
+				const QPixmap &pix(paper.thumb->pix(st::backgroundSize.width(), st::backgroundSize.height()));
+				p.drawPixmap(x, y, pix);
+
+				if (paper.id == cChatBackgroundId()) {
+					p.drawPixmap(QPoint(x + st::backgroundSize.width() - st::overviewPhotoChecked.pxWidth(), y + st::backgroundSize.height() - st::overviewPhotoChecked.pxHeight()), App::sprite(), st::overviewPhotoChecked);
+				}
+			}
+		}
+	} else {
+		p.setFont(st::noContactsFont->f);
+		p.setPen(st::noContactsColor->p);
+		p.drawText(QRect(0, 0, width(), st::noContactsHeight), lang(lng_contacts_loading), style::al_center);
+	}
+}
+
+void BackgroundInner::mouseMoveEvent(QMouseEvent *e) {
+	int x = e->pos().x(), y = e->pos().y();
+	int row = int((y - st::backgroundPadding) / (st::backgroundSize.height() + st::backgroundPadding));
+	if (y - row * (st::backgroundSize.height() + st::backgroundPadding) > st::backgroundPadding + st::backgroundSize.height()) row = _rows + 1;
+
+	int col = int((x - st::backgroundPadding) / (st::backgroundSize.width() + st::backgroundPadding));
+	if (x - col * (st::backgroundSize.width() + st::backgroundPadding) > st::backgroundPadding + st::backgroundSize.width()) row = _rows + 1;
+
+	int newOver = row * BackgroundsInRow + col;
+	if (newOver >= _bgCount) newOver = -1;
+	if (newOver != _over) {
+		_over = newOver;
+		setCursor((_over >= 0 || _overDown >= 0) ? style::cur_pointer : style::cur_default);
+	}
+}
+
+void BackgroundInner::mousePressEvent(QMouseEvent *e) {
+	_overDown = _over;
+}
+
+void BackgroundInner::mouseReleaseEvent(QMouseEvent *e) {
+	if (_overDown == _over && _over >= 0) {
+		emit backgroundChosen(_over);
+	} else if (_over < 0) {
+		setCursor(style::cur_default);
+	}
+}
+
+BackgroundInner::~BackgroundInner() {
+}
+
+void BackgroundInner::resizeEvent(QResizeEvent *e) {
+}
+
+BackgroundBox::BackgroundBox() : ItemListBox(st::boxScroll), _inner(),
+_close(this, lang(lng_contacts_done), st::contactsClose) {
+
+	init(&_inner, _close.height(), st::boxFont->height + st::newGroupNamePadding.top() + st::newGroupNamePadding.bottom());
+
+	connect(&_close, SIGNAL(clicked()), this, SLOT(onClose()));
+	connect(&_inner, SIGNAL(backgroundChosen(int)), this, SLOT(onBackgroundChosen(int)));
+
+	prepare();
+}
+
+void BackgroundBox::hideAll() {
+	ItemListBox::hideAll();
+	_close.hide();
+}
+
+void BackgroundBox::showAll() {
+	ItemListBox::showAll();
+	_close.show();
+	_close.raise();
+}
+
+void BackgroundBox::paintEvent(QPaintEvent *e) {
+	QPainter p(this);
+	if (paint(p)) return;
+
+	paintGrayTitle(p, lang(lng_backgrounds_header));
+}
+
+void BackgroundBox::resizeEvent(QResizeEvent *e) {
+	ItemListBox::resizeEvent(e);
+	_inner.resize(width(), _inner.height());
+	_close.move(0, height() - _close.height());
+}
+
+void BackgroundBox::onBackgroundChosen(int index) {
+	if (index >= 0 && index < App::cServerBackgrounds().size()) {
+		const App::WallPaper &paper(App::cServerBackgrounds().at(index));
+		if (App::main()) App::main()->setChatBackground(paper);
+		if (App::settings()) App::settings()->needBackgroundUpdate(!paper.id);
+	}
+	emit closed();
+}
--- a/Telegram/SourceFiles/boxes/backgroundbox.h
+++ b/Telegram/SourceFiles/boxes/backgroundbox.h
@@ -0,0 +1,73 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop version of Telegram messaging app, see https://telegram.org
+
+Telegram Desktop is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+It is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE
+Copyright (c) 2014 John Preston, https://desktop.telegram.org
+*/
+#pragma once
+
+#include "abstractbox.h"
+
+class BackgroundInner : public QWidget, public RPCSender {
+	Q_OBJECT
+
+public:
+
+	BackgroundInner();
+
+	void paintEvent(QPaintEvent *e);
+	void mouseMoveEvent(QMouseEvent *e);
+	void mousePressEvent(QMouseEvent *e);
+	void mouseReleaseEvent(QMouseEvent *e);
+	void resizeEvent(QResizeEvent *e);
+
+	~BackgroundInner();
+
+signals:
+
+	void backgroundChosen(int index);
+
+private:
+
+	void gotWallpapers(const MTPVector<MTPWallPaper> &result);
+	void updateWallpapers();
+
+	int32 _bgCount, _rows;
+	int32 _over, _overDown;
+
+};
+
+class BackgroundBox : public ItemListBox {
+	Q_OBJECT
+
+public:
+
+	BackgroundBox();
+	void paintEvent(QPaintEvent *e);
+	void resizeEvent(QResizeEvent *e);
+
+public slots:
+
+	void onBackgroundChosen(int index);
+
+protected:
+
+	void hideAll();
+	void showAll();
+
+private:
+
+	BackgroundInner _inner;
+	BottomButton _close;
+};
--- a/Telegram/SourceFiles/boxes/confirmbox.cpp
+++ b/Telegram/SourceFiles/boxes/confirmbox.cpp
@@ -29,11 +29,11 @@ TextParseOptions _confirmBoxTextOptions = {
 	Qt::LayoutDirectionAuto, // dir
 };

-ConfirmBox::ConfirmBox(const QString &text, const QString &doneText, const QString &cancelText) : _infoMsg(false),
-_confirm(this, doneText.isEmpty() ? lang(lng_continue) : doneText, st::btnSelectDone),
-_cancel(this, cancelText.isEmpty() ? lang(lng_cancel) : cancelText, st::btnSelectCancel),
+ConfirmBox::ConfirmBox(const QString &text, const QString &doneText, const QString &cancelText, const style::flatButton &doneStyle, const style::flatButton &cancelStyle) : _infoMsg(false),
+_confirm(this, doneText.isEmpty() ? lang(lng_continue) : doneText, doneStyle),
+_cancel(this, cancelText.isEmpty() ? lang(lng_cancel) : cancelText, cancelStyle),
 _close(this, QString(), st::btnInfoClose),
-_text(100), _hiding(false), a_opacity(0, 1), af_opacity(anim::linear) {
+_text(100) {
 	init(text);
 }

@@ -41,40 +41,32 @@ ConfirmBox::ConfirmBox(const QString &text, bool noDone, const QString &cancelTe
 _confirm(this, QString(), st::btnSelectDone),
 _cancel(this, QString(), st::btnSelectCancel),
 _close(this, cancelText.isEmpty() ? lang(lng_close) : cancelText, st::btnInfoClose),
-_text(100), _hiding(false), a_opacity(0, 1), af_opacity(anim::linear) {
+_text(100) {
 	init(text);
 }

 void ConfirmBox::init(const QString &text) {
 	_text.setText(st::boxFont, text, (_infoMsg ? _confirmBoxTextOptions : _textPlainOptions));

-	_width = st::confirmWidth;
-	_textWidth = _width - st::boxPadding.left() - st::boxPadding.right();
+	_textWidth = st::boxWidth - st::boxPadding.left() - st::boxPadding.right();
 	_textHeight = _text.countHeight(_textWidth);
-	_height = st::boxPadding.top() + _textHeight + st::boxPadding.bottom() + (_infoMsg ? _close.height() : _confirm.height());
+	setMaxHeight(st::boxPadding.top() + _textHeight + st::boxPadding.bottom() + (_infoMsg ? _close.height() : _confirm.height()));

 	if (_infoMsg) {
 		_confirm.hide();
 		_cancel.hide();
-		_close.move(0, st::boxPadding.top() + _textHeight + st::boxPadding.bottom());

-		connect(&_close, SIGNAL(clicked()), this, SLOT(onCancel()));
+		connect(&_close, SIGNAL(clicked()), this, SLOT(onClose()));

 		setMouseTracking(_text.hasLinks());
 	} else {
-		_confirm.move(_width - _confirm.width(), st::boxPadding.top() + _textHeight + st::boxPadding.bottom());
-		_cancel.move(0, st::boxPadding.top() + _textHeight + st::boxPadding.bottom());
 		_close.hide();

 		connect(&_confirm, SIGNAL(clicked()), this, SIGNAL(confirmed()));
-		connect(&_cancel, SIGNAL(clicked()), this, SLOT(onCancel()));
+		connect(&_cancel, SIGNAL(clicked()), this, SLOT(onClose()));
 	}

-	resize(_width, _height);
-
-	showAll();
-	_cache = myGrab(this, rect());
-	hideAll();
+	prepare();
 }

 void ConfirmBox::mouseMoveEvent(QMouseEvent *e) {
@@ -122,7 +114,7 @@ void ConfirmBox::updateLink() {
 void ConfirmBox::updateHover() {
 	QPoint m(mapFromGlobal(_lastMousePos));
 	bool wasMy = (_myLink == textlnkOver());
-	_myLink = _text.link(m.x() - st::boxPadding.left(), m.y() - st::boxPadding.top(), _textWidth, (_text.maxWidth() < _width) ? style::al_center : style::al_left);
+	_myLink = _text.link(m.x() - st::boxPadding.left(), m.y() - st::boxPadding.top(), _textWidth, (_text.maxWidth() < width()) ? style::al_center : style::al_left);
 	if (_myLink != textlnkOver()) {
 		if (wasMy || _myLink || rect().contains(m)) {
 			textlnkOver(_myLink);
@@ -132,6 +124,10 @@ void ConfirmBox::updateHover() {
 	}
 }

+void ConfirmBox::closePressed() {
+	emit cancelled();
+}
+
 void ConfirmBox::hideAll() {
 	_confirm.hide();
 	_cancel.hide();
@@ -150,70 +146,34 @@ void ConfirmBox::showAll() {
 void ConfirmBox::keyPressEvent(QKeyEvent *e) {
 	if (e->key() == Qt::Key_Enter || e->key() == Qt::Key_Return) {
 		emit confirmed();
-	} else if (e->key() == Qt::Key_Escape) {
-		onCancel();
+	} else {
+		AbstractBox::keyPressEvent(e);
 	}
 }

-void ConfirmBox::parentResized() {
-	QSize s = parentWidget()->size();
-	setGeometry((s.width() - _width) / 2, (s.height() - _height) / 2, _width, _height);
-	update();
-}
-
 void ConfirmBox::paintEvent(QPaintEvent *e) {
 	QPainter p(this);
-	if (_cache.isNull()) {
-		if (!_hiding || a_opacity.current() > 0.01) {
-			// fill bg
-			p.fillRect(0, 0, _width, _height, st::boxBG->b);
+	if (paint(p)) return;

-			if (!_infoMsg) {
-				// paint shadows
-				p.fillRect(0, _height - st::btnSelectCancel.height - st::scrollDef.bottomsh, _width, st::scrollDef.bottomsh, st::scrollDef.shColor->b);
+	if (!_infoMsg) {
+		// paint shadows
+		p.fillRect(0, height() - st::btnSelectCancel.height - st::scrollDef.bottomsh, width(), st::scrollDef.bottomsh, st::scrollDef.shColor->b);

-				// paint button sep
-				p.fillRect(st::btnSelectCancel.width, _height - st::btnSelectCancel.height, st::lineWidth, st::btnSelectCancel.height, st::btnSelectSep->b);
-			}
+		// paint button sep
+		p.fillRect(st::btnSelectCancel.width, height() - st::btnSelectCancel.height, st::lineWidth, st::btnSelectCancel.height, st::btnSelectSep->b);
+	}

-			// draw box title / text
-			p.setFont(st::boxFont->f);
-			p.setPen(st::black->p);
-			_text.draw(p, st::boxPadding.left(), st::boxPadding.top(), _textWidth, (_text.maxWidth() < _width) ? style::al_center : style::al_left);
-		}
+	// draw box title / text
+	p.setFont(st::boxFont->f);
+	p.setPen(st::black->p);
+	_text.draw(p, st::boxPadding.left(), st::boxPadding.top(), _textWidth, (_text.maxWidth() < width()) ? style::al_center : style::al_left);
+}
+
+void ConfirmBox::resizeEvent(QResizeEvent *e) {
+	if (_infoMsg) {
+		_close.move(0, st::boxPadding.top() + _textHeight + st::boxPadding.bottom());
 	} else {
-		p.setOpacity(a_opacity.current());
-		p.drawPixmap(0, 0, _cache);
+		_confirm.move(width() - _confirm.width(), st::boxPadding.top() + _textHeight + st::boxPadding.bottom());
+		_cancel.move(0, st::boxPadding.top() + _textHeight + st::boxPadding.bottom());
 	}
 }
-
-void ConfirmBox::animStep(float64 ms) {
-	if (ms >= 1) {
-		a_opacity.finish();
-		_cache = QPixmap();
-		if (!_hiding) {
-			showAll();
-			setFocus();
-		}
-	} else {
-		a_opacity.update(ms, af_opacity);
-	}
-	update();
-}
-
-void ConfirmBox::onCancel() {
-	emit cancelled();
-	emit closed();
-}
-
-void ConfirmBox::startHide() {
-	_hiding = true;
-	if (_cache.isNull()) {
-		_cache = myGrab(this, rect());
-		hideAll();
-	}
-	a_opacity.start(0);
-}
-
-ConfirmBox::~ConfirmBox() {
-}
--- a/Telegram/SourceFiles/boxes/confirmbox.h
+++ b/Telegram/SourceFiles/boxes/confirmbox.h
@@ -17,35 +17,34 @@ Copyright (c) 2014 John Preston, https://desktop.telegram.org
 */
 #pragma once

-#include "layerwidget.h"
+#include "abstractbox.h"

-class ConfirmBox : public LayeredWidget, public RPCSender {
+class ConfirmBox : public AbstractBox, public RPCSender {
 	Q_OBJECT

 public:

-	ConfirmBox(const QString &text, const QString &doneText = QString(), const QString &cancelText = QString());
+	ConfirmBox(const QString &text, const QString &doneText = QString(), const QString &cancelText = QString(), const style::flatButton &doneStyle = st::btnSelectDone, const style::flatButton &cancelStyle = st::btnSelectCancel);
 	ConfirmBox(const QString &text, bool noDone, const QString &cancelText = QString());
-	void parentResized();
-	void animStep(float64 ms);
 	void keyPressEvent(QKeyEvent *e);
 	void paintEvent(QPaintEvent *e);
+	void resizeEvent(QResizeEvent *e);
 	void mouseMoveEvent(QMouseEvent *e);
 	void mousePressEvent(QMouseEvent *e);
 	void mouseReleaseEvent(QMouseEvent *e);
 	void leaveEvent(QEvent *e);
 	void updateLink();
-	void startHide();
-	~ConfirmBox();

 signals:

 	void confirmed();
 	void cancelled();

-public slots:
+protected:

-	void onCancel();
+	void closePressed();
+	void hideAll();
+	void showAll();

 private:

@@ -53,21 +52,11 @@ private:

 	bool _infoMsg;

-	void hideAll();
-	void showAll();
-
-	int32 _width, _height;
 	FlatButton _confirm, _cancel;
 	BottomButton _close;
 	Text _text;
 	int32 _textWidth, _textHeight;

-	bool _hiding;
-	QPixmap _cache;
-
-	anim::fvalue a_opacity;
-	anim::transition af_opacity;
-
 	void updateHover();

 	QPoint _lastMousePos;
--- a/Telegram/SourceFiles/boxes/connectionbox.cpp
+++ b/Telegram/SourceFiles/boxes/connectionbox.cpp
@@ -18,6 +18,8 @@ Copyright (c) 2014 John Preston, https://desktop.telegram.org
 #include "stdafx.h"
 #include "lang.h"

+#include "localstorage.h"
+
 #include "connectionbox.h"
 #include "mainwidget.h"
 #include "window.h"
@@ -31,13 +33,10 @@ ConnectionBox::ConnectionBox() :
 	_passwordInput(this, st::inpConnectionPassword, lang(lng_connection_password_ph), cConnectionProxy().password),
 	_autoRadio(this, qsl("conn_type"), dbictAuto, lang(lng_connection_auto_rb), (cConnectionType() == dbictAuto)),
 	_httpProxyRadio(this, qsl("conn_type"), dbictHttpProxy, lang(lng_connection_http_proxy_rb), (cConnectionType() == dbictHttpProxy)),
-	_tcpProxyRadio(this, qsl("conn_type"), dbictTcpProxy, lang(lng_connection_tcp_proxy_rb), (cConnectionType() == dbictTcpProxy)),
-	a_opacity(0, 1), _hiding(false) {
-
-	_width = st::addContactWidth;
+	_tcpProxyRadio(this, qsl("conn_type"), dbictTcpProxy, lang(lng_connection_tcp_proxy_rb), (cConnectionType() == dbictTcpProxy)) {

 	connect(&_saveButton, SIGNAL(clicked()), this, SLOT(onSave()));
-	connect(&_cancelButton, SIGNAL(clicked()), this, SLOT(onCancel()));
+	connect(&_cancelButton, SIGNAL(clicked()), this, SLOT(onClose()));

 	connect(&_autoRadio, SIGNAL(changed()), this, SLOT(onChange()));
 	connect(&_httpProxyRadio, SIGNAL(changed()), this, SLOT(onChange()));
@@ -45,9 +44,7 @@ ConnectionBox::ConnectionBox() :

 	_passwordInput.setEchoMode(QLineEdit::Password);

-	showAll();
-	_cache = myGrab(this, rect());
-	hideAll();
+	prepare();
 }

 void ConnectionBox::hideAll() {
@@ -69,7 +66,48 @@ void ConnectionBox::showAll() {
 	_httpProxyRadio.show();
 	_tcpProxyRadio.show();

-	_autoRadio.move(st::boxPadding.left(), st::addContactTitleHeight + st::connectionSkip);
+	int32 h = st::boxTitleHeight + st::connectionSkip + _autoRadio.height() + st::connectionSkip + _httpProxyRadio.height() + st::connectionSkip + _tcpProxyRadio.height() + st::connectionSkip;
+	if (_httpProxyRadio.checked() || _tcpProxyRadio.checked()) {
+		h += 2 * st::boxPadding.top() + 2 * _hostInput.height();
+		_hostInput.show();
+		_portInput.show();
+		_userInput.show();
+		_passwordInput.show();
+	} else {
+		_hostInput.hide();
+		_portInput.hide();
+		_userInput.hide();
+		_passwordInput.hide();
+	}
+
+	_saveButton.show();
+	_cancelButton.show();
+
+	setMaxHeight(h + _saveButton.height());
+	resizeEvent(0);
+}
+
+void ConnectionBox::showDone() {
+	if (!_hostInput.isHidden()) {
+		_hostInput.setFocus();
+	}
+}
+
+void ConnectionBox::paintEvent(QPaintEvent *e) {
+	Painter p(this);
+	if (paint(p)) return;
+
+	paintTitle(p, lang(lng_connection_header), true);
+
+	// paint shadow
+	p.fillRect(0, height() - st::btnSelectCancel.height - st::scrollDef.bottomsh, width(), st::scrollDef.bottomsh, st::scrollDef.shColor->b);
+
+	// paint button sep
+	p.fillRect(st::btnSelectCancel.width, height() - st::btnSelectCancel.height, st::lineWidth, st::btnSelectCancel.height, st::btnSelectSep->b);
+}
+
+void ConnectionBox::resizeEvent(QResizeEvent *e) {
+	_autoRadio.move(st::boxPadding.left(), st::boxTitleHeight + st::connectionSkip);
 	_httpProxyRadio.move(st::boxPadding.left(), _autoRadio.y() + _autoRadio.height() + st::connectionSkip);

 	int32 inputy = 0;
@@ -84,85 +122,16 @@ void ConnectionBox::showAll() {
 	}

 	if (inputy) {
-		_hostInput.show();
-		_portInput.show();
-		_userInput.show();
-		_passwordInput.show();
 		_hostInput.move(st::boxPadding.left() + st::rbDefFlat.textLeft, inputy);
-		_portInput.move(_width - st::boxPadding.right() - _portInput.width(), inputy);
+		_portInput.move(width() - st::boxPadding.right() - _portInput.width(), inputy);
 		_userInput.move(st::boxPadding.left() + st::rbDefFlat.textLeft, _hostInput.y() + _hostInput.height() + st::boxPadding.top());
-		_passwordInput.move(_width - st::boxPadding.right() - _passwordInput.width(), _userInput.y());
-	} else {
-		_hostInput.hide();
-		_portInput.hide();
-		_userInput.hide();
-		_passwordInput.hide();
+		_passwordInput.move(width() - st::boxPadding.right() - _passwordInput.width(), _userInput.y());
 	}

-	_saveButton.show();
-	_cancelButton.show();
-
 	int32 buttony = (_tcpProxyRadio.checked() ? (_userInput.y() + _userInput.height()) : (_tcpProxyRadio.y() + _tcpProxyRadio.height())) + st::connectionSkip;

-	_saveButton.move(_width - _saveButton.width(), buttony);
+	_saveButton.move(width() - _saveButton.width(), buttony);
 	_cancelButton.move(0, buttony);
-
-	_height = _saveButton.y() + _saveButton.height();
-	resize(_width, _height);
-}
-
-void ConnectionBox::keyPressEvent(QKeyEvent *e) {
-	if (e->key() == Qt::Key_Enter || e->key() == Qt::Key_Return) {
-	} else if (e->key() == Qt::Key_Escape) {
-		onCancel();
-	}
-}
-
-void ConnectionBox::parentResized() {
-	QSize s = parentWidget()->size();
-	setGeometry((s.width() - _width) / 2, (s.height() - _height) / 2, _width, _height);
-	update();
-}
-
-void ConnectionBox::paintEvent(QPaintEvent *e) {
-	QPainter p(this);
-	if (_cache.isNull()) {
-		if (!_hiding || a_opacity.current() > 0.01) {
-			// fill bg
-			p.fillRect(0, 0, _width, _height, st::boxBG->b);
-
-			// paint shadows
-			p.fillRect(0, st::addContactTitleHeight, _width, st::scrollDef.topsh, st::scrollDef.shColor->b);
-			p.fillRect(0, _height - st::btnSelectCancel.height - st::scrollDef.bottomsh, _width, st::scrollDef.bottomsh, st::scrollDef.shColor->b);
-
-			// paint button sep
-			p.fillRect(st::btnSelectCancel.width, _height - st::btnSelectCancel.height, st::lineWidth, st::btnSelectCancel.height, st::btnSelectSep->b);
-
-			// draw box title / text
-			p.setFont(st::addContactTitleFont->f);
-			p.setPen(st::black->p);
-			p.drawText(st::addContactTitlePos.x(), st::addContactTitlePos.y() + st::addContactTitleFont->ascent, lang(lng_connection_header));
-		}
-	} else {
-		p.setOpacity(a_opacity.current());
-		p.drawPixmap(0, 0, _cache);
-	}
-}
-
-void ConnectionBox::animStep(float64 dt) {
-	if (dt >= 1) {
-		a_opacity.finish();
-		_cache = QPixmap();
-		if (!_hiding) {
-			showAll();
-			if (!_hostInput.isHidden()) {
-				_hostInput.setFocus();
-			}
-		}
-	} else {
-		a_opacity.update(dt, anim::linear);
-	}
-	update();
 }

 void ConnectionBox::onChange() {
@@ -203,24 +172,8 @@ void ConnectionBox::onSave() {
 		QNetworkProxyFactory::setUseSystemConfiguration(false);
 		QNetworkProxyFactory::setUseSystemConfiguration(true);
 	}
-	App::writeConfig();
+	Local::writeSettings();
 	MTP::restart();
 	reinitImageLinkManager();
 	emit closed();
 }
-
-void ConnectionBox::onCancel() {
-	emit closed();
-}
-
-void ConnectionBox::startHide() {
-	_hiding = true;
-	if (_cache.isNull()) {
-		_cache = myGrab(this, rect());
-		hideAll();
-	}
-	a_opacity.start(0);
-}
-
-ConnectionBox::~ConnectionBox() {
-}
--- a/Telegram/SourceFiles/boxes/connectionbox.h
+++ b/Telegram/SourceFiles/boxes/connectionbox.h
@@ -17,42 +17,34 @@ Copyright (c) 2014 John Preston, https://desktop.telegram.org
 */
 #pragma once

-#include "layerwidget.h"
 #include "gui/phoneinput.h"
+#include "abstractbox.h"

-class ConnectionBox : public LayeredWidget {
+class ConnectionBox : public AbstractBox {
 	Q_OBJECT

 public:

 	ConnectionBox();
-	void parentResized();
-	void animStep(float64 dt);
-	void keyPressEvent(QKeyEvent *e);
 	void paintEvent(QPaintEvent *e);
-	void startHide();
-	~ConnectionBox();
+	void resizeEvent(QResizeEvent *e);

 public slots:

 	void onChange();
 	void onSave();
-	void onCancel();

-private:
+protected:

 	void hideAll();
 	void showAll();
+	void showDone();
+
+private:

 	FlatButton _saveButton, _cancelButton;
 	FlatInput _hostInput;
 	PortInput _portInput;
 	FlatInput _userInput, _passwordInput;
 	FlatRadiobutton _autoRadio, _httpProxyRadio, _tcpProxyRadio;
-
-	int32 _width, _height;
-	QPixmap _cache;
-
-	anim::fvalue a_opacity;
-	bool _hiding;
 };
--- a/Telegram/SourceFiles/boxes/contactsbox.cpp
+++ b/Telegram/SourceFiles/boxes/contactsbox.cpp
--- a/Telegram/SourceFiles/boxes/contactsbox.h
+++ b/Telegram/SourceFiles/boxes/contactsbox.h
@@ -17,14 +17,20 @@ Copyright (c) 2014 John Preston, https://desktop.telegram.org
 */
 #pragma once

-#include "layerwidget.h"
+#include "abstractbox.h"

 class ContactsInner : public QWidget, public RPCSender {
 	Q_OBJECT

+private:
+
+	struct ContactData;
+
 public:

-	ContactsInner();
+	ContactsInner(bool creatingChat);
+	ContactsInner(ChatData *chat);
+	void init();

 	void paintEvent(QPaintEvent *e);
 	void enterEvent(QEvent *e);
@@ -33,19 +39,35 @@ public:
 	void mousePressEvent(QMouseEvent *e);
 	void resizeEvent(QResizeEvent *e);
 	
-	void paintDialog(QPainter &p, DialogRow *row, bool sel);
+	void paintDialog(QPainter &p, UserData *user, ContactData *data, bool sel);
 	void updateFilter(QString filter = QString());

 	void selectSkip(int32 dir);
 	void selectSkipPage(int32 h, int32 dir);

+	QVector<UserData*> selected();
+	QVector<MTPInputUser> selectedInputs();
+	PeerData *selectedUser();
+
 	void loadProfilePhotos(int32 yFrom);
+	void chooseParticipant();
+	void changeCheckState(DialogRow *row);
+	void changeCheckState(ContactData *data);
+
+	void peopleReceived(const QString &query, const QVector<MTPContactFound> &people);
+
+	void refresh();
+
+	ChatData *chat() const;
+	bool creatingChat() const;

 	~ContactsInner();

 signals:

 	void mustScrollTo(int ymin, int ymax);
+	void selectAllQuery();
+	void searchByUsername();

 public slots:

@@ -54,10 +76,11 @@ public slots:
 	void updateSel();
 	void peerUpdated(PeerData *peer);

-	void chooseParticipant();
-
 private:

+	ChatData *_chat;
+	bool _creatingChat;
+	
 	int32 _time;

 	DialogsIndexed *_contacts;
@@ -68,58 +91,116 @@ private:
 	int32 _filteredSel;
 	bool _mouseSel;

-	typedef struct {
+	int32 _selCount;
+
+	struct ContactData {
 		Text name;
 		QString online;
-	} ContactData;
+		bool inchat;
+		bool check;
+	};
 	typedef QMap<UserData*, ContactData*> ContactsData;
 	ContactsData _contactsData;

 	ContactData *contactData(DialogRow *row);

+	bool _searching;
+	QString _lastQuery;
+	typedef QVector<UserData*> ByUsernameRows;
+	typedef QVector<ContactData*> ByUsernameDatas;
+	ByUsernameRows _byUsername, _byUsernameFiltered;
+	ByUsernameDatas d_byUsername, d_byUsernameFiltered; // filtered is partly subset of d_byUsername, partly subset of _byUsernameDatas
+	ByUsernameDatas _byUsernameDatas;
+	int32 _byUsernameSel;
+
 	QPoint _lastMousePos;
 	LinkButton _addContactLnk;

 };

-class ContactsBox : public LayeredWidget, public RPCSender {
+class ContactsBox : public ItemListBox, public RPCSender {
 	Q_OBJECT

 public:

-	ContactsBox();
-	void parentResized();
-	void animStep(float64 dt);
+	ContactsBox(bool creatingChat = false);
+	ContactsBox(ChatData *chat);
 	void keyPressEvent(QKeyEvent *e);
 	void paintEvent(QPaintEvent *e);
 	void resizeEvent(QResizeEvent *e);
-	void startHide();
-	~ContactsBox();

 public slots:

 	void onFilterUpdate();
-	void onClose();
 	void onScroll();
-	void onAdd();

-private:
+	void onAdd();
+	void onInvite();
+	void onNext();
+
+	bool onSearchByUsername(bool searchCache = false);
+	void onNeedSearchByUsername();
+
+protected:

 	void hideAll();
 	void showAll();
+	void showDone();

-	void created(const MTPmessages_StatedMessage &result);
-	bool failed(const RPCError &e);
+private:
+
+	void init();

-	ScrollArea _scroll;
 	ContactsInner _inner;
 	FlatButton _addContact;
-	int32 _width, _height;
 	FlatInput _filter;
-	BottomButton _close;
-	bool _hiding;

-	QPixmap _cache;
+	FlatButton _next, _cancel;

-	anim::fvalue a_opacity;
+	void peopleReceived(const MTPcontacts_Found &result, mtpRequestId req);
+	bool peopleFailed(const RPCError &error, mtpRequestId req);
+
+	QTimer _searchTimer;
+	QString _peopleQuery;
+	bool _peopleFull;
+	mtpRequestId _peopleRequest;
+
+	typedef QMap<QString, MTPcontacts_Found> PeopleCache;
+	PeopleCache _peopleCache;
+
+	typedef QMap<mtpRequestId, QString> PeopleQueries;
+	PeopleQueries _peopleQueries;
+};
+
+class CreateGroupBox : public AbstractBox, public RPCSender {
+	Q_OBJECT
+
+public:
+
+	CreateGroupBox(const MTPVector<MTPInputUser> &users);
+	void keyPressEvent(QKeyEvent *e);
+	void paintEvent(QPaintEvent *e);
+	void resizeEvent(QResizeEvent *e);
+
+public slots:
+
+	void onCreate();
+
+protected:
+
+	void hideAll();
+	void showAll();
+	void showDone();
+
+private:
+
+	void created(const MTPUpdates &updates);
+	bool failed(const RPCError &e);
+
+	MTPVector<MTPInputUser> _users;
+
+	int32 _createRequestId;
+
+	FlatInput _name;
+	FlatButton _create, _cancel;
 };
--- a/Telegram/SourceFiles/boxes/downloadpathbox.cpp
+++ b/Telegram/SourceFiles/boxes/downloadpathbox.cpp
@@ -18,6 +18,8 @@ Copyright (c) 2014 John Preston, https://desktop.telegram.org
 #include "stdafx.h"
 #include "lang.h"

+#include "localstorage.h"
+
 #include "downloadpathbox.h"
 #include "gui/filedialog.h"

@@ -28,13 +30,10 @@ DownloadPathBox::DownloadPathBox() :
 	_dirRadio(this, qsl("dir_type"), 2, lang(lng_download_path_dir_radio), !_path.isEmpty() && _path != qsl("tmp")),
 	_dirInput(this, st::inpDownloadDir, QString(), (_path.isEmpty() || _path == qsl("tmp")) ? QString() : QDir::toNativeSeparators(_path)),
 	_saveButton(this, lang(lng_connection_save), st::btnSelectDone),
-	_cancelButton(this, lang(lng_cancel), st::btnSelectCancel),
-	a_opacity(0, 1), _hiding(false) {
-
-	_width = st::addContactWidth;
+	_cancelButton(this, lang(lng_cancel), st::btnSelectCancel) {

 	connect(&_saveButton, SIGNAL(clicked()), this, SLOT(onSave()));
-	connect(&_cancelButton, SIGNAL(clicked()), this, SLOT(onCancel()));
+	connect(&_cancelButton, SIGNAL(clicked()), this, SLOT(onClose()));

 	connect(&_defaultRadio, SIGNAL(changed()), this, SLOT(onChange()));
 	connect(&_tempRadio, SIGNAL(changed()), this, SLOT(onChange()));
@@ -43,9 +42,7 @@ DownloadPathBox::DownloadPathBox() :
 	connect(&_dirInput, SIGNAL(focused()), this, SLOT(onEditPath()));
 	_dirInput.setCursorPosition(0);

-	showAll();
-	_cache = myGrab(this, rect());
-	hideAll();
+	prepare();
 }

 void DownloadPathBox::hideAll() {
@@ -73,71 +70,38 @@ void DownloadPathBox::showAll() {
 	_saveButton.show();
 	_cancelButton.show();

-	_defaultRadio.move(st::boxPadding.left(), st::addContactTitleHeight + st::downloadSkip);
+	int32 h = st::boxTitleHeight + st::downloadSkip + _defaultRadio.height() + st::downloadSkip + _tempRadio.height() + st::downloadSkip + _dirRadio.height();
+	if (_dirRadio.checked()) h += st::boxPadding.top() + _dirInput.height();
+	h += st::downloadSkip + _saveButton.height();
+	
+	setMaxHeight(h);
+}
+
+void DownloadPathBox::paintEvent(QPaintEvent *e) {
+	Painter p(this);
+	if (paint(p)) return;
+
+	paintTitle(p, lang(lng_download_path_header), true);
+
+	// paint shadows
+	p.fillRect(0, height() - st::btnSelectCancel.height - st::scrollDef.bottomsh, width(), st::scrollDef.bottomsh, st::scrollDef.shColor->b);
+
+	// paint button sep
+	p.fillRect(st::btnSelectCancel.width, height() - st::btnSelectCancel.height, st::lineWidth, st::btnSelectCancel.height, st::btnSelectSep->b);
+}
+
+void DownloadPathBox::resizeEvent(QResizeEvent *e) {
+	_defaultRadio.move(st::boxPadding.left(), st::boxTitleHeight + st::downloadSkip);
 	_tempRadio.move(st::boxPadding.left(), _defaultRadio.y() + _defaultRadio.height() + st::downloadSkip);
 	_dirRadio.move(st::boxPadding.left(), _tempRadio.y() + _tempRadio.height() + st::downloadSkip);
 	int32 inputy = _dirRadio.y() + _dirRadio.height() + st::boxPadding.top();

 	_dirInput.move(st::boxPadding.left() + st::rbDefFlat.textLeft, inputy);
-		
+
 	int32 buttony = (_dirRadio.checked() ? (_dirInput.y() + _dirInput.height()) : (_dirRadio.y() + _dirRadio.height())) + st::downloadSkip;

-	_saveButton.move(_width - _saveButton.width(), buttony);
+	_saveButton.move(width() - _saveButton.width(), buttony);
 	_cancelButton.move(0, buttony);
-
-	_height = _saveButton.y() + _saveButton.height();
-	resize(_width, _height);
-}
-
-void DownloadPathBox::keyPressEvent(QKeyEvent *e) {
-	if (e->key() == Qt::Key_Enter || e->key() == Qt::Key_Return) {
-	} else if (e->key() == Qt::Key_Escape) {
-		onCancel();
-	}
-}
-
-void DownloadPathBox::parentResized() {
-	QSize s = parentWidget()->size();
-	setGeometry((s.width() - _width) / 2, (s.height() - _height) / 2, _width, _height);
-	update();
-}
-
-void DownloadPathBox::paintEvent(QPaintEvent *e) {
-	QPainter p(this);
-	if (_cache.isNull()) {
-		if (!_hiding || a_opacity.current() > 0.01) {
-			// fill bg
-			p.fillRect(0, 0, _width, _height, st::boxBG->b);
-
-			// paint shadows
-			p.fillRect(0, st::addContactTitleHeight, _width, st::scrollDef.topsh, st::scrollDef.shColor->b);
-			p.fillRect(0, _height - st::btnSelectCancel.height - st::scrollDef.bottomsh, _width, st::scrollDef.bottomsh, st::scrollDef.shColor->b);
-
-			// paint button sep
-			p.fillRect(st::btnSelectCancel.width, _height - st::btnSelectCancel.height, st::lineWidth, st::btnSelectCancel.height, st::btnSelectSep->b);
-
-			// draw box title / text
-			p.setFont(st::addContactTitleFont->f);
-			p.setPen(st::black->p);
-			p.drawText(st::addContactTitlePos.x(), st::addContactTitlePos.y() + st::addContactTitleFont->ascent, lang(lng_download_path_header));
-		}
-	} else {
-		p.setOpacity(a_opacity.current());
-		p.drawPixmap(0, 0, _cache);
-	}
-}
-
-void DownloadPathBox::animStep(float64 dt) {
-	if (dt >= 1) {
-		a_opacity.finish();
-		_cache = QPixmap();
-		if (!_hiding) {
-			showAll();
-		}
-	} else {
-		a_opacity.update(dt, anim::linear);
-	}
-	update();
 }

 void DownloadPathBox::onChange() {
@@ -181,22 +145,6 @@ void DownloadPathBox::onEditPath() {

 void DownloadPathBox::onSave() {
 	cSetDownloadPath(_defaultRadio.checked() ? QString() : (_tempRadio.checked() ? qsl("tmp") : _path));
-	App::writeUserConfig();
+	Local::writeUserSettings();
 	emit closed();
 }
-
-void DownloadPathBox::onCancel() {
-	emit closed();
-}
-
-void DownloadPathBox::startHide() {
-	_hiding = true;
-	if (_cache.isNull()) {
-		_cache = myGrab(this, rect());
-		hideAll();
-	}
-	a_opacity.start(0);
-}
-
-DownloadPathBox::~DownloadPathBox() {
-}
--- a/Telegram/SourceFiles/boxes/downloadpathbox.h
+++ b/Telegram/SourceFiles/boxes/downloadpathbox.h
@@ -17,43 +17,33 @@ Copyright (c) 2014 John Preston, https://desktop.telegram.org
 */
 #pragma once

-#include "layerwidget.h"
-#include "gui/phoneinput.h"
+#include "abstractbox.h"

-class DownloadPathBox : public LayeredWidget {
+class DownloadPathBox : public AbstractBox {
 	Q_OBJECT

 public:

 	DownloadPathBox();
-	void parentResized();
-	void animStep(float64 dt);
-	void keyPressEvent(QKeyEvent *e);
 	void paintEvent(QPaintEvent *e);
-	void startHide();
-	~DownloadPathBox();
+	void resizeEvent(QResizeEvent *e);

 public slots:

 	void onChange();
 	void onEditPath();
 	void onSave();
-	void onCancel();

-private:
+protected:

 	void hideAll();
 	void showAll();

+private:
+
 	QString _path;

 	FlatRadiobutton _defaultRadio, _tempRadio, _dirRadio;
 	FlatInput _dirInput;
 	FlatButton _saveButton, _cancelButton;
-
-	int32 _width, _height;
-	QPixmap _cache;
-
-	anim::fvalue a_opacity;
-	bool _hiding;
 };
--- a/Telegram/SourceFiles/boxes/emojibox.cpp
+++ b/Telegram/SourceFiles/boxes/emojibox.cpp
@@ -68,38 +68,23 @@ namespace {
 	const uint32 replacesCount = sizeof(replaces) / sizeof(EmojiReplace), replacesInRow = 7;
 }

-EmojiBox::EmojiBox() : _done(this, lang(lng_about_done), st::aboutCloseButton),
-    _hiding(false), a_opacity(0, 1) {
-
+EmojiBox::EmojiBox() : _done(this, lang(lng_about_done), st::aboutCloseButton) {
 	fillBlocks();

 	_blockHeight = st::emojiReplaceInnerHeight;
 	
-	_width = _blocks[0].size() * st::emojiReplaceWidth + (st::emojiReplaceWidth - st::emojiSize);
-
-	_height = st::boxPadding.top() + st::boxFont->height;
-	_height += _blocks.size() * st::emojiReplaceHeight + (st::emojiReplaceHeight - _blockHeight);
-	_height += _done.height();
-
-	_done.setWidth(_width);
-	_header.setText(st::boxFont, lang(lng_settings_emoji_list));
-
-	_done.move(0, _height - _done.height());
+	resizeMaxHeight(_blocks[0].size() * st::emojiReplaceWidth + (st::emojiReplaceWidth - st::emojiSize), st::boxPadding.top() + st::boxFont->height + _blocks.size() * st::emojiReplaceHeight + (st::emojiReplaceHeight - _blockHeight) + _done.height());

 	connect(&_done, SIGNAL(clicked()), this, SLOT(onClose()));

-	resize(_width, _height);
-
-	showAll();
-	_cache = myGrab(this, rect());
-	hideAll();
+	prepare();
 }

 void EmojiBox::fillBlocks() {
 	BlockRow currentRow;
 	currentRow.reserve(replacesInRow);
 	for (uint32 i = 0; i < replacesCount; ++i) {
-		Block block(getEmoji(replaces[i].code), QString::fromUtf8(replaces[i].replace));
+		Block block(emojiGet(replaces[i].code), QString::fromUtf8(replaces[i].replace));
 		currentRow.push_back(block);
        if (uint32(currentRow.size()) == replacesInRow) {
 			_blocks.push_back(currentRow);
@@ -122,77 +107,34 @@ void EmojiBox::showAll() {
 void EmojiBox::keyPressEvent(QKeyEvent *e) {
 	if (e->key() == Qt::Key_Enter || e->key() == Qt::Key_Return) {
 		onClose();
-	} else if (e->key() == Qt::Key_Escape) {
-		onClose();
+	} else {
+		AbstractBox::keyPressEvent(e);
 	}
 }

-void EmojiBox::parentResized() {
-	QSize s = parentWidget()->size();
-	setGeometry((s.width() - _width) / 2, (s.height() - _height) / 2, _width, _height);
-	update();
-}
-
 void EmojiBox::paintEvent(QPaintEvent *e) {
 	QPainter p(this);
-	if (_cache.isNull()) {
-		if (!_hiding || a_opacity.current() > 0.01) {
-			// fill bg
-			p.fillRect(0, 0, _width, _height, st::boxBG->b);
+	if (paint(p)) return;

-			p.setFont(st::boxFont->f);
-			p.setPen(st::boxGrayTitle->p);
-			_header.draw(p, 0, st::boxPadding.top(), _width, Qt::AlignCenter);
+	paintGrayTitle(p, lang(lng_settings_emoji_list));

-			p.setFont(st::emojiTextFont->f);
-			p.setPen(st::black->p);
-			int32 top = st::boxPadding.top() + st::boxFont->height + (st::emojiReplaceHeight - _blockHeight) / 2;
-			for (Blocks::const_iterator i = _blocks.cbegin(), e = _blocks.cend(); i != e; ++i) {
-				int32 rowSize = i->size(), left = (_width - rowSize * st::emojiReplaceWidth) / 2;
-				for (BlockRow::const_iterator j = i->cbegin(), en = i->cend(); j != en; ++j) {
-					if (j->emoji) {
-						QPoint pos(left + (st::emojiReplaceWidth - st::emojiSize) / 2, top + (st::emojiReplaceHeight - _blockHeight) / 2);
-						p.drawPixmap(pos, App::emojis(), QRect(j->emoji->x, j->emoji->y, st::emojiImgSize, st::emojiImgSize));
-					}
-					QRect trect(left, top + (st::emojiReplaceHeight + _blockHeight) / 2 - st::emojiTextFont->height, st::emojiReplaceWidth, st::emojiTextFont->height);
-					p.drawText(trect, j->text, QTextOption(Qt::AlignHCenter | Qt::AlignTop));
-					left += st::emojiReplaceWidth;
-				}
-				top += st::emojiReplaceHeight;
+	p.setFont(st::emojiTextFont->f);
+	p.setPen(st::black->p);
+	int32 top = st::boxPadding.top() + st::boxFont->height + (st::emojiReplaceHeight - _blockHeight) / 2;
+	for (Blocks::const_iterator i = _blocks.cbegin(), e = _blocks.cend(); i != e; ++i) {
+		int32 rowSize = i->size(), left = (width() - rowSize * st::emojiReplaceWidth) / 2;
+		for (BlockRow::const_iterator j = i->cbegin(), en = i->cend(); j != en; ++j) {
+			if (j->emoji) {
+				emojiDraw(p, j->emoji, left + (st::emojiReplaceWidth - st::emojiSize) / 2, top + (st::emojiReplaceHeight - _blockHeight) / 2);
 			}
+			QRect trect(left, top + (st::emojiReplaceHeight + _blockHeight) / 2 - st::emojiTextFont->height, st::emojiReplaceWidth, st::emojiTextFont->height);
+			p.drawText(trect, j->text, QTextOption(Qt::AlignHCenter | Qt::AlignTop));
+			left += st::emojiReplaceWidth;
 		}
-	} else {
-		p.setOpacity(a_opacity.current());
-		p.drawPixmap(0, 0, _cache);
+		top += st::emojiReplaceHeight;
 	}
 }

-void EmojiBox::animStep(float64 ms) {
-	if (ms >= 1) {
-		a_opacity.finish();
-		_cache = QPixmap();
-		if (!_hiding) {
-			showAll();
-			setFocus();
-		}
-	} else {
-		a_opacity.update(ms, anim::linear);
-	}
-	update();
-}
-
-void EmojiBox::onClose() {
-	emit closed();
-}
-
-void EmojiBox::startHide() {
-	_hiding = true;
-	if (_cache.isNull()) {
-		_cache = myGrab(this, rect());
-		hideAll();
-	}
-	a_opacity.start(0);
-}
-
-EmojiBox::~EmojiBox() {
+void EmojiBox::resizeEvent(QResizeEvent *e) {
+	_done.setGeometry(0, height() - _done.height(), width(), _done.height());
 }
--- a/Telegram/SourceFiles/boxes/emojibox.h
+++ b/Telegram/SourceFiles/boxes/emojibox.h
@@ -17,37 +17,29 @@ Copyright (c) 2014 John Preston, https://desktop.telegram.org
 */
 #pragma once

-#include "layerwidget.h"
+#include "abstractbox.h"

-class EmojiBox : public LayeredWidget {
+class EmojiBox : public AbstractBox {
 	Q_OBJECT

 public:

 	EmojiBox();
-	void parentResized();
-	void animStep(float64 ms);
 	void keyPressEvent(QKeyEvent *e);
 	void paintEvent(QPaintEvent *e);
-	void startHide();
-	~EmojiBox();
+	void resizeEvent(QResizeEvent *e);

-public slots:
-
-	void onClose();
-
-private:
+protected:

 	void hideAll();
 	void showAll();

+private:
+
 	void fillBlocks();

-	int32 _width, _height;
 	BottomButton _done;

-	Text _header;
-
 	int32 _blockHeight;
 	struct Block {
 		Block(const EmojiData *emoji = 0, const QString &text = QString()) : emoji(emoji), text(text) {
@@ -58,9 +50,4 @@ private:
 	typedef QVector<Block> BlockRow;
 	typedef QVector<BlockRow> Blocks;
 	Blocks _blocks;
-
-	bool _hiding;
-	QPixmap _cache;
-
-	anim::fvalue a_opacity;
 };
--- a/Telegram/SourceFiles/boxes/languagebox.cpp
+++ b/Telegram/SourceFiles/boxes/languagebox.cpp
@@ -18,6 +18,8 @@ Copyright (c) 2014 John Preston, https://desktop.telegram.org
 #include "stdafx.h"
 #include "lang.h"

+#include "localstorage.h"
+
 #include "languagebox.h"
 #include "confirmbox.h"
 #include "mainwidget.h"
@@ -26,15 +28,11 @@ Copyright (c) 2014 John Preston, https://desktop.telegram.org
 #include "langloaderplain.h"

 LanguageBox::LanguageBox() :
-_done(this, lang(lng_about_done), st::langsCloseButton),
-_hiding(false), a_opacity(0, 1) {
+_done(this, lang(lng_about_done), st::langsCloseButton) {

 	bool haveTestLang = (cLang() == languageTest);

-	_width = st::langsWidth;
-	_height = st::addContactTitleHeight + st::langsPadding.top() + st::langsPadding.bottom() + (languageCount + (haveTestLang ? 1 : 0)) * (st::langPadding.top() + st::rbDefFlat.height + st::langPadding.bottom()) + _done.height();
-
-	int32 y = st::addContactTitleHeight + st::langsPadding.top();
+	int32 y = st::boxTitleHeight + st::langsPadding.top();
 	_langs.reserve(languageCount + (haveTestLang ? 1 : 0));
 	if (haveTestLang) {
 		_langs.push_back(new FlatRadiobutton(this, qsl("lang"), languageTest, qsl("Custom Lang"), (cLang() == languageTest), st::langButton));
@@ -56,15 +54,11 @@ _hiding(false), a_opacity(0, 1) {
 		connect(_langs.back(), SIGNAL(changed()), this, SLOT(onChange()));
 	}

-	_done.move(0, _height - _done.height());
+	resizeMaxHeight(st::langsWidth, st::boxTitleHeight + st::langsPadding.top() + st::langsPadding.bottom() + (languageCount + (haveTestLang ? 1 : 0)) * (st::langPadding.top() + st::rbDefFlat.height + st::langPadding.bottom()) + _done.height());

 	connect(&_done, SIGNAL(clicked()), this, SLOT(onClose()));

-	resize(_width, _height);
-
-	showAll();
-	_cache = myGrab(this, rect());
-	hideAll();
+	prepare();
 }

 void LanguageBox::hideAll() {
@@ -81,12 +75,6 @@ void LanguageBox::showAll() {
 	}
 }

-void LanguageBox::keyPressEvent(QKeyEvent *e) {
-	if (e->key() == Qt::Key_Escape) {
-		onClose();
-	}
-}
-
 void LanguageBox::mousePressEvent(QMouseEvent *e) {
 	if ((e->modifiers() & Qt::CTRL) && (e->modifiers() & Qt::ALT) && (e->modifiers() & Qt::SHIFT)) {
 		for (int32 i = 1; i < languageCount; ++i) {
@@ -105,45 +93,15 @@ void LanguageBox::mousePressEvent(QMouseEvent *e) {
 	}
 }

-void LanguageBox::parentResized() {
-	QSize s = parentWidget()->size();
-	setGeometry((s.width() - _width) / 2, (s.height() - _height) / 2, _width, _height);
-	update();
-}
-
 void LanguageBox::paintEvent(QPaintEvent *e) {
-	QPainter p(this);
-	if (_cache.isNull()) {
-		if (!_hiding || a_opacity.current() > 0.01) {
-			// fill bg
-			p.fillRect(0, 0, _width, _height, st::boxBG->b);
+	Painter p(this);
+	if (paint(p)) return;

-			// paint shadows
-			p.fillRect(0, st::addContactTitleHeight, _width, st::scrollDef.topsh, st::scrollDef.shColor->b);
-
-			// draw box title / text
-			p.setFont(st::addContactTitleFont->f);
-			p.setPen(st::black->p);
-			p.drawText(st::addContactTitlePos.x(), st::addContactTitlePos.y() + st::addContactTitleFont->ascent, lang(lng_languages));
-		}
-	} else {
-		p.setOpacity(a_opacity.current());
-		p.drawPixmap(0, 0, _cache);
-	}
+	paintTitle(p, lang(lng_languages), true);
 }

-void LanguageBox::animStep(float64 ms) {
-	if (ms >= 1) {
-		a_opacity.finish();
-		_cache = QPixmap();
-		if (!_hiding) {
-			showAll();
-			setFocus();
-		}
-	} else {
-		a_opacity.update(ms, anim::linear);
-	}
-	update();
+void LanguageBox::resizeEvent(QResizeEvent *e) {
+	_done.move(0, height() - _done.height());
 }

 void LanguageBox::onChange() {
@@ -183,7 +141,7 @@ void LanguageBox::onSave() {
 	for (int32 i = 0, l = _langs.size(); i < l; ++i) {
 		if (_langs[i]->checked()) {
 			cSetLang(_langs[i]->val());
-			App::writeConfig();
+			Local::writeSettings();
 			cSetRestarting(true);
 			cSetRestartingToSettings(true);
 			App::quit();
@@ -191,19 +149,6 @@ void LanguageBox::onSave() {
 	}
 }

-void LanguageBox::onClose() {
-	emit closed();
-}
-
-void LanguageBox::startHide() {
-	_hiding = true;
-	if (_cache.isNull()) {
-		_cache = myGrab(this, rect());
-		hideAll();
-	}
-	a_opacity.start(0);
-}
-
 LanguageBox::~LanguageBox() {
 	for (int32 i = 0, l = _langs.size(); i < l; ++i) {
 		delete _langs[i];
--- a/Telegram/SourceFiles/boxes/languagebox.h
+++ b/Telegram/SourceFiles/boxes/languagebox.h
@@ -17,20 +17,17 @@ Copyright (c) 2014 John Preston, https://desktop.telegram.org
 */
 #pragma once

-#include "layerwidget.h"
+#include "abstractbox.h"

-class LanguageBox : public LayeredWidget {
+class LanguageBox : public AbstractBox {
 	Q_OBJECT

 public:

 	LanguageBox();
-	void parentResized();
-	void animStep(float64 ms);
-	void keyPressEvent(QKeyEvent *e);
 	void mousePressEvent(QMouseEvent *e);
 	void paintEvent(QPaintEvent *e);
-	void startHide();
+	void resizeEvent(QResizeEvent *e);
 	~LanguageBox();

 public slots:
@@ -38,19 +35,14 @@ public slots:
 	void onChange();
 	void onRestore();
 	void onSave();
-	void onClose();

-private:
+protected:

 	void hideAll();
 	void showAll();

+private:
+
 	QVector<FlatRadiobutton*> _langs;
-	int32 _width, _height;
 	BottomButton _done;
-
-	bool _hiding;
-	QPixmap _cache;
-
-	anim::fvalue a_opacity;
 };
--- a/Telegram/SourceFiles/boxes/newgroupbox.cpp
+++ b/Telegram/SourceFiles/boxes/newgroupbox.cpp
@@ -1,800 +0,0 @@
-/*
-This file is part of Telegram Desktop,
-the official desktop version of Telegram messaging app, see https://telegram.org
-
-Telegram Desktop is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-It is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE
-Copyright (c) 2014 John Preston, https://desktop.telegram.org
-*/
-#include "stdafx.h"
-#include "lang.h"
-
-#include "newgroupbox.h"
-#include "mainwidget.h"
-#include "window.h"
-
-NewGroupInner::NewGroupInner() :
-_contacts(&App::main()->contactsList()),
-_sel(0),
-_filteredSel(-1),
-_mouseSel(false),
-_selCount(0),
-_addContactLnk(this, lang(lng_add_contact_button)) {
-
-	connect(&_addContactLnk, SIGNAL(clicked()), App::wnd(), SLOT(onShowAddContact()));
-
-	for (DialogRow *r = _contacts->list.begin; r != _contacts->list.end; r = r->next) {
-		r->attached = 0;
-	}
-
-	_filter = qsl("a");
-	updateFilter();
-
-	for (DialogRow *r = _contacts->list.begin; r != _contacts->list.end; r = r->next) {
-		r->attached = 0;
-	}
-
-	connect(App::main(), SIGNAL(dialogRowReplaced(DialogRow *, DialogRow *)), this, SLOT(onDialogRowReplaced(DialogRow *, DialogRow *)));
-	connect(App::main(), SIGNAL(peerUpdated(PeerData*)), this, SLOT(peerUpdated(PeerData *)));
-	connect(App::main(), SIGNAL(peerNameChanged(PeerData *, const PeerData::Names &, const PeerData::NameFirstChars &)), this, SLOT(peerUpdated(PeerData *)));
-	connect(App::main(), SIGNAL(peerPhotoChanged(PeerData *)), this, SLOT(peerUpdated(PeerData *)));
-}
-
-void NewGroupInner::peerUpdated(PeerData *peer) {
-	if (!peer->chat) {
-		ContactsData::iterator i = _contactsData.find(peer->asUser());
-		if (i != _contactsData.cend()) {
-			for (DialogRow *row = _contacts->list.begin; row->next; row = row->next) {
-				if (row->attached == i.value()) row->attached = 0;
-			}
-			if (!_filter.isEmpty()) {
-				for (int32 j = 0, s = _filtered.size(); j < s; ++j) {
-					if (_filtered[j]->attached == i.value()) _filtered[j]->attached = 0;
-				}
-			}
-			delete i.value();
-			_contactsData.erase(i);
-		}
-	}
-		
-	parentWidget()->update();
-}
-
-void NewGroupInner::loadProfilePhotos(int32 yFrom) {
-	int32 yTo = yFrom + (parentWidget() ? parentWidget()->height() : App::wnd()->height()) * 5;
-	MTP::clearLoaderPriorities();
-
-	if (yTo < 0) return;
-	if (yFrom < 0) yFrom = 0;
-
-	int32 rh = st::profileListPhotoSize + st::profileListPadding.height() * 2;
-	if (_filter.isEmpty()) {
-		if (_contacts->list.count) {
-			_contacts->list.adjustCurrent(yFrom, rh);
-			for (
-				DialogRow *preloadFrom = _contacts->list.current;
-				preloadFrom != _contacts->list.end && preloadFrom->pos * rh < yTo;
-				preloadFrom = preloadFrom->next
-			) {
-				preloadFrom->history->peer->photo->load();
-			}
-		}
-	} else if (!_filtered.isEmpty()) {
-		int32 from = yFrom / rh;
-		if (from < 0) from = 0;
-		if (from < _filtered.size()) {
-			int32 to = (yTo / rh) + 1;
-			if (to > _filtered.size()) to = _filtered.size();
-
-			for (; from < to; ++from) {
-				_filtered[from]->history->peer->photo->load();
-			}
-		}
-	}
-}
-
-NewGroupInner::ContactData *NewGroupInner::contactData(DialogRow *row) {
-	ContactData *data = (ContactData*)row->attached;
-	if (!data) {
-		UserData *user = row->history->peer->asUser();
-		ContactsData::const_iterator i = _contactsData.constFind(user);
-		if (i == _contactsData.cend()) {
-			_contactsData.insert(user, data = new ContactData());
-			data->check = false;
-			data->name.setText(st::profileListNameFont, user->name, _textNameOptions);
-			data->online = App::onlineText(user, _time);
-		} else {
-			data = i.value();
-		}
-		row->attached = data;
-	}
-	return data;
-}
-
-void NewGroupInner::paintDialog(QPainter &p, DialogRow *row, bool sel) {
-	int32 left = st::profileListPadding.width();
-
-	UserData *user = row->history->peer->asUser();
-	ContactData *data = contactData(row);
-
-	if (_selCount >= cMaxGroupCount() && !data->check) {
-		sel = false;
-	}
-
-	if (sel || data->check) {
-		p.fillRect(0, 0, width(), 2 * st::profileListPadding.height() + st::profileListPhotoSize, (data->check ? st::profileActiveBG : st::profileHoverBG)->b);
-	}
-
-	p.drawPixmap(left, st::profileListPadding.height(), user->photo->pix(st::profileListPhotoSize));
-
-	if (data->check) {
-		p.setPen(st::white->p);
-	} else {
-		p.setPen(st::profileListNameColor->p);
-	}
-	data->name.drawElided(p, left + st::profileListPhotoSize + st::participantDelta, st::profileListNameTop, width() - st::profileListPadding.width() - st::profileListPhotoSize - st::profileListPadding.width() - st::participantDelta - st::scrollDef.width - st::profileCheckRect.pxWidth());
-
-	if (sel || data->check) {
-		p.drawPixmap(QPoint(width() - st::profileCheckRect.pxWidth() - st::profileCheckDeltaX, st::profileListPadding.height() + (st::profileListPhotoSize - st::profileCheckRect.pxHeight()) / 2 - st::profileCheckDeltaY), App::sprite(), (data->check ? st::profileCheckActiveRect : st::profileCheckRect));
-	}
-
-	p.setFont(st::profileSubFont->f);
-	if (data->check) {
-		p.setPen(st::white->p);
-	} else {
-		p.setPen((user->onlineTill >= _time ? st::profileOnlineColor : st::profileOfflineColor)->p);
-	}
-	p.drawText(left + st::profileListPhotoSize + st::participantDelta, st::profileListPadding.height() + st::profileListPhotoSize - 6, data->online);
-}
-
-void NewGroupInner::paintEvent(QPaintEvent *e) {
-	QRect r(e->rect());
-	QPainter p(this);
-
-	_time = unixtime();
-	p.fillRect(r, st::white->b);
-
-	int32 yFrom = r.top();
-	int32 rh = st::profileListPhotoSize + st::profileListPadding.height() * 2;
-	if (_filter.isEmpty()) {
-		if (_contacts->list.count) {
-			_contacts->list.adjustCurrent(yFrom, rh);
-
-			DialogRow *drawFrom = _contacts->list.current;
-			p.translate(0, drawFrom->pos * rh);
-			while (drawFrom != _contacts->list.end && drawFrom->pos * rh < r.bottom()) {
-				paintDialog(p, drawFrom, (drawFrom == _sel));
-				p.translate(0, rh);
-				drawFrom = drawFrom->next;
-			}
-		} else {
-			p.setFont(st::noContactsFont->f);
-			p.setPen(st::noContactsColor->p);
-			p.drawText(QRect(0, 0, width(), st::noContactsHeight - (cContactsReceived() ? st::noContactsFont->height : 0)), lang(cContactsReceived() ? lng_no_contacts : lng_contacts_loading), style::al_center);
-		}
-	} else {
-		if (_filtered.isEmpty()) {
-			p.setFont(st::noContactsFont->f);
-			p.setPen(st::noContactsColor->p);
-			p.drawText(QRect(0, 0, width(), st::noContactsHeight), lang(lng_contacts_not_found), style::al_center);
-		} else {
-			int32 from = yFrom / rh;
-			if (from < 0) from = 0;
-			if (from < _filtered.size()) {
-				int32 to = (r.bottom() / rh) + 1;
-				if (to > _filtered.size()) to = _filtered.size();
-
-				p.translate(0, from * rh);
-				for (; from < to; ++from) {
-					paintDialog(p, _filtered[from], (_filteredSel == from));
-					p.translate(0, rh);
-				}
-			}
-		}
-	}
-}
-
-void NewGroupInner::enterEvent(QEvent *e) {
-	setMouseTracking(true);
-}
-
-void NewGroupInner::leaveEvent(QEvent *e) {
-	setMouseTracking(false);
-	updateSel();
-}
-
-void NewGroupInner::mouseMoveEvent(QMouseEvent *e) {
-	_mouseSel = true;
-	_lastMousePos = e->globalPos();
-	updateSel();
-}
-
-void NewGroupInner::mousePressEvent(QMouseEvent *e) {
-	_mouseSel = true;
-	_lastMousePos = e->globalPos();
-	updateSel();
-	if (e->button() == Qt::LeftButton) {
-		chooseParticipant();
-	}
-}
-
-void NewGroupInner::changeCheckState(DialogRow *row) {
-	if (contactData(row)->check) {
-		contactData(row)->check = false;
-		--_selCount;
-	} else if (_selCount < cMaxGroupCount()) {
-		contactData(row)->check = true;
-		++_selCount;
-	}
-}
-
-void NewGroupInner::chooseParticipant() {
-	int32 rh = st::profileListPhotoSize + st::profileListPadding.height() * 2, from;
-	if (_filter.isEmpty()) {
-		if (!_sel) return;
-		changeCheckState(_sel);
-	} else {
-		if (_filteredSel < 0 || _filteredSel >= _filtered.size()) return;
-
-		DialogRow *row = _filtered[_filteredSel];
-		changeCheckState(row);
-
-		PeerData *peer = row->history->peer;
-		emit selectAllQuery();
-	}
-
-	parentWidget()->update();
-}
-
-void NewGroupInner::updateSel() {
-	if (!_mouseSel) return;
-
-	int32 rh = st::profileListPhotoSize + st::profileListPadding.height() * 2;
-	QPoint p(mapFromGlobal(_lastMousePos));
-	if (_filter.isEmpty()) {
-		DialogRow *newSel = rect().contains(p) ? _contacts->list.rowAtY(p.y(), rh) : 0;
-		if (newSel != _sel) {
-			_sel = newSel;
-			parentWidget()->update();
-		}		
-	} else {
-		int32 newFilteredSel = (p.y() >= 0 && rect().contains(p)) ? (p.y() / rh) : -1;
-		if (newFilteredSel != _filteredSel) {
-			_filteredSel = newFilteredSel;
-			parentWidget()->update();
-		}
-	}
-}
-
-void NewGroupInner::updateFilter(QString filter) {
-	filter = textSearchKey(filter);
-
-	QStringList f;
-	if (!filter.isEmpty()) {
-		QStringList filterList = filter.split(cWordSplit(), QString::SkipEmptyParts);
-		int l = filterList.size();
-
-		f.reserve(l);
-		for (int i = 0; i < l; ++i) {
-			QString filterName = filterList[i].trimmed();
-			if (filterName.isEmpty()) continue;
-			f.push_back(filterName);
-		}
-		filter = f.join(' ');
-	}
-	if (_filter != filter) {
-		int32 rh = (st::profileListPhotoSize + st::profileListPadding.height() * 2);
-		_filter = filter;
-		if (_filter.isEmpty()) {
-			resize(width(), _contacts->list.count * rh);
-			if (_contacts->list.count) {
-				if (!_addContactLnk.isHidden()) _addContactLnk.hide();
-				resize(width(), _contacts->list.count * rh);
-				_sel = _contacts->list.begin;
-			} else {
-				resize(width(), st::noContactsHeight);
-				if (cContactsReceived()) {
-					if (_addContactLnk.isHidden()) _addContactLnk.show();
-				} else {
-					if (!_addContactLnk.isHidden()) _addContactLnk.hide();
-				}
-			}
-		} else {
-			if (!_addContactLnk.isHidden()) _addContactLnk.hide();
-			QStringList::const_iterator fb = f.cbegin(), fe = f.cend(), fi;
-
-			_filtered.clear();
-			if (!f.isEmpty()) {
-				DialogsList *dialogsToFilter = 0;
-				if (_contacts->list.count) {
-					for (fi = fb; fi != fe; ++fi) {
-						DialogsIndexed::DialogsIndex::iterator i = _contacts->index.find(fi->at(0));
-						if (i == _contacts->index.cend()) {
-							dialogsToFilter = 0;
-							break;
-						}
-						if (!dialogsToFilter || dialogsToFilter->count > i.value()->count) {
-							dialogsToFilter = i.value();
-						}
-					}
-				}
-				if (dialogsToFilter && dialogsToFilter->count) {
-					_filtered.reserve(dialogsToFilter->count);
-					for (DialogRow *i = dialogsToFilter->begin, *e = dialogsToFilter->end; i != e; i = i->next) {
-						const PeerData::Names &names(i->history->peer->names);
-						PeerData::Names::const_iterator nb = names.cbegin(), ne = names.cend(), ni;
-						for (fi = fb; fi != fe; ++fi) {
-							QString filterName(*fi);
-							for (ni = nb; ni != ne; ++ni) {
-								if (ni->startsWith(*fi)) {
-									break;
-								}
-							}
-							if (ni == ne) {
-								break;
-							}
-						}
-						if (fi == fe) {
-							i->attached = 0;
-							_filtered.push_back(i);
-						}
-					}
-				}
-			}
-			_filteredSel = _filtered.isEmpty() ? -1 : 0;
-
-			if (!_filtered.isEmpty()) {
-				resize(width(), _filtered.size() * rh);
-			} else {
-				resize(width(), st::noContactsHeight);
-			}
-		}
-		if (parentWidget()) parentWidget()->update();
-		loadProfilePhotos(0);
-	}
-}
-
-void NewGroupInner::onDialogRowReplaced(DialogRow *oldRow, DialogRow *newRow) {
-	if (!_filter.isEmpty()) {
-		for (FilteredDialogs::iterator i = _filtered.begin(), e = _filtered.end(); i != e;) {
-			if (*i == oldRow) { // this row is shown in filtered and maybe is in contacts!
-				if (newRow) {
-					*i = newRow;
-					++i;
-				} else {
-					i = _filtered.erase(i);
-				}
-			} else {
-				++i;
-			}
-		}
-		if (_filteredSel >= _filtered.size()) {
-			_filteredSel = -1;
-		}
-	} else {
-		if (_sel == oldRow) {
-			_sel = newRow;
-		}
-	}
-	_mouseSel = false;
-	int32 rh = (st::profileListPhotoSize + st::profileListPadding.height() * 2);
-	int32 newh = (_filter.isEmpty() ? _contacts->list.count : _filtered.size()) * rh;
-	resize(width(), newh);
-}
-
-NewGroupInner::~NewGroupInner() {
-	for (ContactsData::iterator i = _contactsData.begin(), e = _contactsData.end(); i != e; ++i) {
-		delete *i;
-	}
-}
-
-void NewGroupInner::resizeEvent(QResizeEvent *e) {
-	_addContactLnk.move((width() - _addContactLnk.width()) / 2, (st::noContactsHeight + st::noContactsFont->height) / 2);
-}
-
-void NewGroupInner::selectSkip(int32 dir) {
-	_mouseSel = false;
-	int32 rh = st::profileListPhotoSize + st::profileListPadding.height() * 2, origDir = dir;
-	if (_filter.isEmpty()) {
-		if (_sel) {
-			if (dir > 0) {
-				while (dir && _sel->next->next) {
-					_sel = _sel->next;
-					--dir;
-				}
-			} else {
-				while (dir && _sel->prev) {
-					_sel = _sel->prev;
-					++dir;
-				}
-			}
-		} else if (dir > 0 && _contacts->list.count) {
-			_sel = _contacts->list.begin;
-		}
-		if (_sel) {
-			emit mustScrollTo(_sel->pos * rh, (_sel->pos + 1) * rh);
-		}
-	} else {
-		if (dir > 0) {
-			if (_filteredSel < 0 && dir > 1) {
-				_filteredSel = 0;
-			}
-			_filteredSel += dir;
-			if (_filteredSel >= _filtered.size()) {
-				_filteredSel = _filtered.size() - 1;
-			}
-		} else if (_filteredSel > 0) {
-			_filteredSel += dir;
-			if (_filteredSel < 0) {
-				_filteredSel = 0;
-			}
-		}
-		if (_filteredSel >= 0) {
-			emit mustScrollTo(_filteredSel * rh, (_filteredSel + 1) * rh);
-		}
-	}
-	parentWidget()->update();
-}
-
-void NewGroupInner::selectSkipPage(int32 h, int32 dir) {
-	int32 rh = st::profileListPhotoSize + st::profileListPadding.height() * 2;
-	int32 points = h / rh;
-	if (!points) return;
-	selectSkip(points * dir);
-}
-
-QVector<MTPInputUser> NewGroupInner::selectedInputs() {
-	QVector<MTPInputUser> result;
-	result.reserve(_contactsData.size());
-	for (ContactsData::const_iterator i = _contactsData.cbegin(), e = _contactsData.cend(); i != e; ++i) {
-		if (i.value()->check) {
-			result.push_back(i.key()->inputUser);
-		}
-	}
-	return result;
-}
-
-PeerData *NewGroupInner::selectedUser() {
-	for (ContactsData::const_iterator i = _contactsData.cbegin(), e = _contactsData.cend(); i != e; ++i) {
-		if (i.value()->check) {
-			return i.key();
-		}
-	}
-	return 0;
-}
-
-NewGroupBox::NewGroupBox() : _scroll(this, st::newGroupScroll), _inner(),
-	_filter(this, st::contactsFilter, lang(lng_participant_filter)),
-	_next(this, lang(lng_create_group_next), st::btnSelectDone),
-	_cancel(this, lang(lng_cancel), st::btnSelectCancel),
-    _hiding(false),	a_opacity(0, 1) {
-
-	_width = st::participantWidth;
-	_height = App::wnd()->height() - st::boxPadding.top() - st::boxPadding.bottom();
-	if (_height > st::participantMaxHeight) _height = st::participantMaxHeight;
-
-	resize(_width, _height);
-
-	_scroll.setWidget(&_inner);
-	_scroll.setFocusPolicy(Qt::NoFocus);
-
-	connect(&_next, SIGNAL(clicked()), this, SLOT(onNext()));
-	connect(&_cancel, SIGNAL(clicked()), this, SIGNAL(closed()));
-	connect(&_scroll, SIGNAL(scrolled()), &_inner, SLOT(updateSel()));
-	connect(&_scroll, SIGNAL(scrolled()), this, SLOT(onScroll()));
-	connect(&_filter, SIGNAL(changed()), this, SLOT(onFilterUpdate()));
-	connect(&_filter, SIGNAL(cancelled()), this, SLOT(onClose()));
-	connect(&_inner, SIGNAL(mustScrollTo(int,int)), &_scroll, SLOT(scrollToY(int,int)));
-	connect(&_inner, SIGNAL(selectAllQuery()), &_filter, SLOT(selectAll()));
-
-	showAll();
-	_cache = myGrab(this, rect());
-	hideAll();
-}
-
-void NewGroupBox::hideAll() {
-	_filter.hide();
-	_scroll.hide();
-	_next.hide();
-	_cancel.hide();
-}
-
-void NewGroupBox::showAll() {
-	_filter.show();
-	_scroll.show();
-	_next.show();
-	_cancel.show();
-}
-
-void NewGroupBox::keyPressEvent(QKeyEvent *e) {
-	if (e->key() == Qt::Key_Escape) {
-		onClose();
-	} else if (e->key() == Qt::Key_Return || e->key() == Qt::Key_Enter) {
-		_inner.chooseParticipant();
-	} else if (_filter.hasFocus()) {
-		if (e->key() == Qt::Key_Down) {
-			_inner.selectSkip(1);
-		} else if (e->key() == Qt::Key_Up) {
-			_inner.selectSkip(-1);
-		} else if (e->key() == Qt::Key_PageDown) {
-			_inner.selectSkipPage(_scroll.height(), 1);
-		} else if (e->key() == Qt::Key_PageUp) {
-			_inner.selectSkipPage(_scroll.height(), -1);
-		} else {
-			e->ignore();
-		}
-	} else {
-		e->ignore();
-	}
-}
-
-void NewGroupBox::parentResized() {
-	QSize s = parentWidget()->size();
-	_height = App::wnd()->height() - st::boxPadding.top() - st::boxPadding.bottom();
-	if (_height > st::participantMaxHeight) _height = st::participantMaxHeight;
-	setGeometry((s.width() - _width) / 2, (s.height() - _height) / 2, _width, _height);
-	update();
-}
-
-void NewGroupBox::paintEvent(QPaintEvent *e) {
-	QPainter p(this);
-	if (_cache.isNull()) {
-		if (!_hiding || a_opacity.current() > 0.01) {
-			// fill bg
-			p.fillRect(QRect(QPoint(0, 0), size()), st::boxBG->b);
-
-			// paint shadows
-			p.fillRect(0, st::participantFilter.height, _width, st::scrollDef.topsh, st::scrollDef.shColor->b);
-			p.fillRect(0, size().height() - st::btnSelectCancel.height - st::scrollDef.bottomsh, _width, st::scrollDef.bottomsh, st::scrollDef.shColor->b);
-
-			// paint button sep
-			p.fillRect(st::btnSelectCancel.width, size().height() - st::btnSelectCancel.height, st::lineWidth, st::btnSelectCancel.height, st::btnSelectSep->b);
-
-			// draw box title / text
-			p.setPen(st::black->p);
-			p.setFont(st::addContactTitleFont->f);
-			p.drawText(st::addContactTitlePos.x(), st::addContactTitlePos.y() + st::addContactTitleFont->ascent, lang(lng_create_new_group));
-		}
-	} else {
-		p.setOpacity(a_opacity.current());
-		p.drawPixmap(0, 0, _cache);
-	}
-}
-
-void NewGroupBox::resizeEvent(QResizeEvent *e) {
-	LayeredWidget::resizeEvent(e);
-	_filter.move(st::newGroupNamePadding.left(), st::contactsAdd.height + st::newGroupNamePadding.top());
-	_inner.resize(_width, _inner.height());
-	_scroll.resize(_width, _height - st::contactsAdd.height - st::newGroupNamePadding.top() - _filter.height() - st::newGroupNamePadding.bottom() - _cancel.height());
-	_scroll.move(0, _filter.y() + _filter.height() + st::newGroupNamePadding.bottom());
-	_next.move(width() - _next.width(), _height - _next.height());
-	_cancel.move(0, _height - _cancel.height());
-}
-
-void NewGroupBox::animStep(float64 dt) {
-	if (dt >= 1) {
-		a_opacity.finish();
-		_cache = QPixmap();
-		if (!_hiding) {
-			showAll();
-			_filter.setFocus();
-		}
-	} else {
-		a_opacity.update(dt, anim::linear);
-	}
-	update();
-}
-
-void NewGroupBox::startHide() {
-	_hiding = true;
-	if (_cache.isNull()) {
-		_cache = myGrab(this, rect());
-		hideAll();
-	}
-	a_opacity.start(0);
-}
-
-void NewGroupBox::onFilterUpdate() {
-	_scroll.scrollToY(0);
-	_inner.updateFilter(_filter.text());
-}
-
-void NewGroupBox::onClose() {
-	emit closed();
-}
-
-void NewGroupBox::onNext() {
-	MTPVector<MTPInputUser> users(MTP_vector<MTPInputUser>(_inner.selectedInputs()));
-	const QVector<MTPInputUser> &v(users.c_vector().v);
-	if (v.isEmpty()) {
-		_filter.setFocus();
-		_filter.notaBene();
-	} else if (v.size() == 1) {
-		App::main()->showPeer(_inner.selectedUser()->id);
-	} else {
-		App::wnd()->replaceLayer(new CreateGroupBox(users));
-	}
-}
-
-void NewGroupBox::onScroll() {
-	_inner.loadProfilePhotos(_scroll.scrollTop());
-}
-
-NewGroupBox::~NewGroupBox() {
-}
-
-CreateGroupBox::CreateGroupBox(const MTPVector<MTPInputUser> &users) : _users(users),
-	_createRequestId(0),
-	_name(this, st::newGroupName, lang(lng_dlg_new_group_name)),
-	_create(this, lang(lng_dlg_create_group), st::btnSelectDone),
-	_cancel(this, lang(lng_cancel), st::btnSelectCancel),
-    _hiding(false),	a_opacity(0, 1) {
-	_width = st::addContactWidth;
-
-	_height = st::addContactTitleHeight + st::addContactPadding.top() + _name.height() + st::addContactPadding.bottom() + _create.height();
-
-	_name.setGeometry(st::addContactPadding.left(), st::addContactTitleHeight + st::addContactPadding.top(), _width - st::addContactPadding.left() - st::addContactPadding.right(), _name.height());
-
-	int32 buttonTop = _name.y() + _name.height() + st::addContactPadding.bottom();
-	_cancel.move(0, buttonTop);
-	_create.move(_width - _create.width(), buttonTop);
-
-	connect(&_create, SIGNAL(clicked()), this, SLOT(onCreate()));
-	connect(&_cancel, SIGNAL(clicked()), this, SLOT(onCancel()));
-
-	resize(_width, _height);
-
-	showAll();
-	_cache = myGrab(this, rect());
-	hideAll();
-}
-
-void CreateGroupBox::hideAll() {
-	_name.hide();
-	_cancel.hide();
-	_create.hide();
-}
-
-void CreateGroupBox::showAll() {
-	_name.show();
-	_cancel.show();
-	_create.show();
-}
-
-void CreateGroupBox::keyPressEvent(QKeyEvent *e) {
-	if (e->key() == Qt::Key_Enter || e->key() == Qt::Key_Return) {
-		if (_name.hasFocus()) {
-			if (_name.text().trimmed().isEmpty()) {
-				_name.setFocus();
-				_name.notaBene();
-			} else {
-				onCreate();
-			}
-		}
-	} else if (e->key() == Qt::Key_Escape) {
-		onCancel();
-	}
-}
-
-void CreateGroupBox::parentResized() {
-	QSize s = parentWidget()->size();
-	setGeometry((s.width() - _width) / 2, (s.height() - _height) / 2, _width, _height);
-	update();
-}
-
-void CreateGroupBox::paintEvent(QPaintEvent *e) {
-	QPainter p(this);
-	if (_cache.isNull()) {
-		if (!_hiding || a_opacity.current() > 0.01) {
-			// fill bg
-			p.fillRect(QRect(QPoint(0, 0), size()), st::boxBG->b);
-
-			// paint shadows
-			p.fillRect(0, st::addContactTitleHeight, _width, st::scrollDef.topsh, st::scrollDef.shColor->b);
-			p.fillRect(0, _height - st::btnSelectCancel.height - st::scrollDef.bottomsh, _width, st::scrollDef.bottomsh, st::scrollDef.shColor->b);
-
-			// paint button sep
-			p.fillRect(st::btnSelectCancel.width, _height - st::btnSelectCancel.height, st::lineWidth, st::btnSelectCancel.height, st::btnSelectSep->b);
-
-			// draw box title / text
-			p.setPen(st::black->p);
-			p.setFont(st::addContactTitleFont->f);
-			p.drawText(st::addContactTitlePos.x(), st::addContactTitlePos.y() + st::addContactTitleFont->ascent, lang(lng_create_group_title));
-		}
-	} else {
-		p.setOpacity(a_opacity.current());
-		p.drawPixmap(0, 0, _cache);
-	}
-}
-
-void CreateGroupBox::animStep(float64 dt) {
-	if (dt >= 1) {
-		a_opacity.finish();
-		_cache = QPixmap();
-		if (!_hiding) {
-			showAll();
-			_name.setFocus();
-		}
-	} else {
-		a_opacity.update(dt, anim::linear);
-	}
-	update();
-}
-
-void CreateGroupBox::onCreate() {
-	if (_createRequestId) return;
-
-	QString name = _name.text();
-	if (name.isEmpty()) {
-		_name.setFocus();
-		_name.notaBene();
-		return;
-	}
-
-	_create.setDisabled(true);
-	_name.setDisabled(true);
-	_createRequestId = MTP::send(MTPmessages_CreateChat(_users, MTP_string(_name.text())), rpcDone(&CreateGroupBox::created), rpcFail(&CreateGroupBox::failed));
-}
-
-void CreateGroupBox::created(const MTPmessages_StatedMessage &result) {
-	App::main()->sentFullDataReceived(0, result);
-	const QVector<MTPChat> *d = 0;
-	switch (result.type()) {
-	case mtpc_messages_statedMessage: {
-		d = &result.c_messages_statedMessage().vchats.c_vector().v;
-	} break;
-
-	case mtpc_messages_statedMessageLink: {
-		d = &result.c_messages_statedMessageLink().vchats.c_vector().v;
-	} break;
-	}
-	App::wnd()->hideLayer();
-	PeerId peerId = 0;
-	if (d && !d->isEmpty()) {
-		switch (d->first().type()) {
-		case mtpc_chat: peerId = App::peerFromChat(d->first().c_chat().vid); break;
-		case mtpc_chatForbidden: peerId = App::peerFromChat(d->first().c_chatForbidden().vid); break;
-		case mtpc_chatEmpty: peerId = App::peerFromChat(d->first().c_chatEmpty().vid); break;
-		}
-	}
-	if (peerId) {
-		App::main()->showPeer(peerId);
-	}
-}
-
-bool CreateGroupBox::failed(const RPCError &e) {
-	_createRequestId = 0;
-	if (e.type() == "NO_CHAT_TITLE") {
-		_name.setFocus();
-		return true;
-	} else if (e.type() == "USERS_TOO_FEW") {
-		emit closed();
-		return true;
-	}
-	return false;
-}
-
-void CreateGroupBox::onCancel() {
-	emit closed();
-}
-
-void CreateGroupBox::startHide() {
-	_hiding = true;
-	if (_cache.isNull()) {
-		_cache = myGrab(this, rect());
-		hideAll();
-	}
-	a_opacity.start(0);
-}
-
-CreateGroupBox::~CreateGroupBox() {
-}
--- a/Telegram/SourceFiles/boxes/newgroupbox.h
+++ b/Telegram/SourceFiles/boxes/newgroupbox.h
@@ -1,170 +0,0 @@
-/*
-This file is part of Telegram Desktop,
-the official desktop version of Telegram messaging app, see https://telegram.org
-
-Telegram Desktop is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-It is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE
-Copyright (c) 2014 John Preston, https://desktop.telegram.org
-*/
-#pragma once
-
-#include "layerwidget.h"
-
-class NewGroupInner : public QWidget {
-	Q_OBJECT
-
-public:
-
-	NewGroupInner();
-
-	void paintEvent(QPaintEvent *e);
-	void enterEvent(QEvent *e);
-	void leaveEvent(QEvent *e);
-	void mouseMoveEvent(QMouseEvent *e);
-	void mousePressEvent(QMouseEvent *e);
-	void resizeEvent(QResizeEvent *e);
-
-	void paintDialog(QPainter &p, DialogRow *row, bool sel);
-	void updateFilter(QString filter = QString());
-
-	void selectSkip(int32 dir);
-	void selectSkipPage(int32 h, int32 dir);
-
-	QVector<MTPInputUser> selectedInputs();
-	PeerData *selectedUser();
-
-	void loadProfilePhotos(int32 yFrom);
-
-	void changeCheckState(DialogRow *row);
-
-	~NewGroupInner();
-
-signals:
-
-	void mustScrollTo(int ymin, int ymax);
-	void selectAllQuery();
-
-public slots:
-
-	void onDialogRowReplaced(DialogRow *oldRow, DialogRow *newRow);
-
-	void updateSel();
-	void peerUpdated(PeerData *peer);
-
-	void chooseParticipant();
-
-private:
-
-	int32 _time;
-
-	DialogsIndexed *_contacts;
-	DialogRow *_sel;
-	QString _filter;
-	typedef QVector<DialogRow*> FilteredDialogs;
-	FilteredDialogs _filtered;
-	int32 _filteredSel;
-	bool _mouseSel;
-
-	typedef struct {
-		Text name;
-		QString online;
-		bool check;
-	} ContactData;
-	typedef QMap<UserData*, ContactData*> ContactsData;
-	ContactsData _contactsData;
-	int32 _selCount;
-
-	ContactData *contactData(DialogRow *row);
-
-	QPoint _lastMousePos;
-	LinkButton _addContactLnk;
-
-};
-
-class NewGroupBox : public LayeredWidget, public RPCSender {
-	Q_OBJECT
-
-public:
-
-	NewGroupBox();
-	void parentResized();
-	void animStep(float64 dt);
-	void keyPressEvent(QKeyEvent *e);
-	void paintEvent(QPaintEvent *e);
-	void resizeEvent(QResizeEvent *e);
-	void startHide();
-	~NewGroupBox();
-
-public slots:
-
-	void onFilterUpdate();
-	void onClose();
-	void onNext();
-	void onScroll();
-
-private:
-
-	void hideAll();
-	void showAll();
-
-	ScrollArea _scroll;
-	NewGroupInner _inner;
-	int32 _width, _height;
-	FlatInput _filter;
-	FlatButton _next, _cancel;
-	bool _hiding;
-
-	QPixmap _cache;
-
-	anim::fvalue a_opacity;
-};
-
-class CreateGroupBox : public LayeredWidget, public RPCSender {
-	Q_OBJECT
-
-public:
-
-	CreateGroupBox(const MTPVector<MTPInputUser> &users);
-	void parentResized();
-	void animStep(float64 dt);
-	void keyPressEvent(QKeyEvent *e);
-	void paintEvent(QPaintEvent *e);
-	void startHide();
-	~CreateGroupBox();
-
-public slots:
-
-	void onCreate();
-	void onCancel();
-
-private:
-
-	void hideAll();
-	void showAll();
-
-	void created(const MTPmessages_StatedMessage &result);
-	bool failed(const RPCError &e);
-
-	MTPVector<MTPInputUser> _users;
-
-	int32 _createRequestId;
-
-	int32 _width, _height;
-	FlatInput _name;
-	FlatButton _create, _cancel;
-
-	bool _hiding;
-
-	QPixmap _cache;
-
-	anim::fvalue a_opacity;
-};
--- a/Telegram/SourceFiles/boxes/passcodebox.cpp
+++ b/Telegram/SourceFiles/boxes/passcodebox.cpp
@@ -0,0 +1,595 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop version of Telegram messaging app, see https://telegram.org
+
+Telegram Desktop is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+It is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE
+Copyright (c) 2014 John Preston, https://desktop.telegram.org
+*/
+#include "stdafx.h"
+#include "lang.h"
+
+#include "passcodebox.h"
+#include "confirmbox.h"
+#include "window.h"
+
+#include "localstorage.h"
+
+PasscodeBox::PasscodeBox(bool turningOff) : _replacedBy(0), _turningOff(turningOff), _cloudPwd(false),
+_setRequest(0), _hasRecovery(false), _aboutHeight(0),
+_about(st::boxWidth - st::addContactPadding.left() - st::addContactPadding.right()),
+_saveButton(this, lang(_turningOff ? lng_passcode_remove_button : lng_settings_save), st::btnSelectDone),
+_cancelButton(this, lang(lng_cancel), st::btnSelectCancel),
+_oldPasscode(this, st::inpAddContact, lang(lng_passcode_enter_old)),
+_newPasscode(this, st::inpAddContact, lang(cHasPasscode() ? lng_passcode_enter_new : lng_passcode_enter_first)),
+_reenterPasscode(this, st::inpAddContact, lang(lng_passcode_confirm_new)),
+_passwordHint(this, st::inpAddContact, lang(lng_cloud_password_hint)),
+_recoverEmail(this, st::inpAddContact, lang(lng_cloud_password_email)),
+_recover(this, lang(lng_signin_recover)) {
+	init();
+	prepare();
+}
+
+PasscodeBox::PasscodeBox(const QByteArray &newSalt, const QByteArray &curSalt, bool hasRecovery, const QString &hint, bool turningOff) : _replacedBy(0), _turningOff(turningOff), _cloudPwd(true),
+_setRequest(0), _newSalt(newSalt), _curSalt(curSalt), _hasRecovery(hasRecovery), _hint(hint), _aboutHeight(0),
+_about(st::boxWidth - st::addContactPadding.left() - st::addContactPadding.right()),
+_saveButton(this, lang(_turningOff ? lng_passcode_remove_button : lng_settings_save), st::btnSelectDone),
+_cancelButton(this, lang(lng_cancel), st::btnSelectCancel),
+_oldPasscode(this, st::inpAddContact, lang(lng_cloud_password_enter_old)),
+_newPasscode(this, st::inpAddContact, lang(curSalt.isEmpty() ? lng_cloud_password_enter_first : lng_cloud_password_enter_new)),
+_reenterPasscode(this, st::inpAddContact, lang(lng_cloud_password_confirm_new)),
+_passwordHint(this, st::inpAddContact, lang(lng_cloud_password_hint)),
+_recoverEmail(this, st::inpAddContact, lang(lng_cloud_password_email)),
+_recover(this, lang(lng_signin_recover)) {
+	init();
+	prepare();
+}
+
+void PasscodeBox::init() {
+	_about.setRichText(st::usernameFont, lang(_cloudPwd ? lng_cloud_password_about : lng_passcode_about));
+	if (!_hint.isEmpty()) _hintText.setText(st::usernameFont, lng_signin_hint(lt_password_hint, _hint));
+	_aboutHeight = _about.countHeight(st::boxWidth - st::addContactPadding.left() - st::addContactPadding.right());
+	_oldPasscode.setEchoMode(QLineEdit::Password);
+	_newPasscode.setEchoMode(QLineEdit::Password);
+	_reenterPasscode.setEchoMode(QLineEdit::Password);
+	if (_turningOff) {
+		_oldPasscode.show();
+		_boxTitle = lang(_cloudPwd ? lng_cloud_password_remove : lng_passcode_remove);
+		setMaxHeight(st::boxTitleHeight + st::addContactPadding.top() + 1 * _oldPasscode.height() + st::usernameSkip + _aboutHeight + (_hasRecovery ? ((st::usernameSkip + _recover.height()) / 2) : 0) + st::addContactPadding.bottom() + _saveButton.height());
+	} else {
+		bool has = _cloudPwd ? (!_curSalt.isEmpty()) : cHasPasscode();
+		if (has) {
+			_oldPasscode.show();
+			_boxTitle = lang(_cloudPwd ? lng_cloud_password_change : lng_passcode_change);
+			setMaxHeight(st::boxTitleHeight + st::addContactPadding.top() + 3 * _oldPasscode.height() + st::usernameSkip * 2 + 1 * st::addContactDelta + (_cloudPwd ? _passwordHint.height() + st::addContactDelta : 0) + _aboutHeight + (_hasRecovery ? ((st::usernameSkip + _recover.height()) / 2) : 0) + st::addContactPadding.bottom() + _saveButton.height());
+		} else {
+			_oldPasscode.hide();
+			_boxTitle = lang(_cloudPwd ? lng_cloud_password_create : lng_passcode_create);
+			setMaxHeight(st::boxTitleHeight + st::addContactPadding.top() + 2 * _oldPasscode.height() + st::usernameSkip + 1 * st::addContactDelta + (_cloudPwd ? _passwordHint.height() + st::addContactDelta : 0) + _aboutHeight + (_cloudPwd ? st::addContactDelta + _recoverEmail.height() + st::usernameSkip : st::addContactPadding.bottom()) + _saveButton.height());
+		}
+	}
+
+	connect(&_saveButton, SIGNAL(clicked()), this, SLOT(onSave()));
+	connect(&_cancelButton, SIGNAL(clicked()), this, SLOT(onClose()));
+
+	connect(&_oldPasscode, SIGNAL(changed()), this, SLOT(onOldChanged()));
+	connect(&_newPasscode, SIGNAL(changed()), this, SLOT(onNewChanged()));
+	connect(&_reenterPasscode, SIGNAL(changed()), this, SLOT(onNewChanged()));
+	connect(&_recoverEmail, SIGNAL(changed()), this, SLOT(onEmailChanged()));
+
+	connect(&_recover, SIGNAL(clicked()), this, SLOT(onRecoverByEmail()));
+}
+
+void PasscodeBox::hideAll() {
+	_oldPasscode.hide();
+	_newPasscode.hide();
+	_reenterPasscode.hide();
+	_passwordHint.hide();
+	_recoverEmail.hide();
+	_recover.hide();
+	_saveButton.hide();
+	_cancelButton.hide();
+}
+
+void PasscodeBox::showAll() {
+	bool has = _cloudPwd ? (!_curSalt.isEmpty()) : cHasPasscode();
+	if (_turningOff) {
+		_oldPasscode.show();
+		if (_cloudPwd && _hasRecovery) {
+			_recover.show();
+		} else {
+			_recover.hide();
+		}
+		_passwordHint.hide();
+		_newPasscode.hide();
+		_reenterPasscode.hide();
+	} else {
+		if (has) {
+			_oldPasscode.show();
+			if (_cloudPwd && _hasRecovery) {
+				_recover.show();
+			} else {
+				_recover.hide();
+			}
+		} else {
+			_oldPasscode.hide();
+			_recover.hide();
+		}
+		_newPasscode.show();
+		_reenterPasscode.show();
+		if (_cloudPwd) {
+			_passwordHint.show();
+		} else {
+			_passwordHint.hide();
+		}
+		if (_cloudPwd && _curSalt.isEmpty()) {
+			_recoverEmail.show();
+		} else {
+			_recoverEmail.hide();
+		}
+	}
+	_saveButton.show();
+	_cancelButton.show();
+}
+
+void PasscodeBox::keyPressEvent(QKeyEvent *e) {
+	bool has = _cloudPwd ? (!_curSalt.isEmpty()) : cHasPasscode();
+	if (e->key() == Qt::Key_Enter || e->key() == Qt::Key_Return) {
+		if (_oldPasscode.hasFocus()) {
+			if (_turningOff) {
+				onSave();
+			} else {
+				_newPasscode.setFocus();
+			}
+		} else if (_newPasscode.hasFocus()) {
+			_reenterPasscode.setFocus();
+		} else if (_reenterPasscode.hasFocus()) {
+			if (has && _oldPasscode.text().isEmpty()) {
+				_oldPasscode.setFocus();
+				_oldPasscode.notaBene();
+			} else if (_newPasscode.text().isEmpty()) {
+				_newPasscode.setFocus();
+				_newPasscode.notaBene();
+			} else if (_reenterPasscode.text().isEmpty()) {
+				_reenterPasscode.notaBene();
+			} else if (!_passwordHint.isHidden()) {
+				_passwordHint.setFocus();
+			} else {
+				onSave();
+			}
+		} else if (_passwordHint.hasFocus()) {
+			if (_recoverEmail.isHidden()) {
+				onSave();
+			} else {
+				_recoverEmail.setFocus();
+			}
+		} else if (_recoverEmail.hasFocus()) {
+			onSave();
+		}
+	} else {
+		AbstractBox::keyPressEvent(e);
+	}
+}
+
+void PasscodeBox::paintEvent(QPaintEvent *e) {
+	Painter p(this);
+	if (paint(p)) return;
+
+	paintTitle(p, _boxTitle, true);
+
+	// paint shadow
+	p.fillRect(0, height() - st::btnSelectCancel.height - st::scrollDef.bottomsh, width(), st::scrollDef.bottomsh, st::scrollDef.shColor->b);
+
+	int32 w = width() - st::addContactPadding.left() - st::addContactPadding.right();
+	int32 abouty = (_passwordHint.isHidden() ? (_reenterPasscode.isHidden() ? _oldPasscode : _reenterPasscode).y() + st::usernameSkip : _passwordHint.y() + st::addContactDelta) + _oldPasscode.height();
+	p.setPen(st::usernameColor->p);
+	_about.draw(p, st::addContactPadding.left(), abouty, w);
+
+	if (!_hint.isEmpty() && _oldError.isEmpty()) {
+		p.setPen(st::black->p);
+		_hintText.drawElided(p, st::addContactPadding.left(), _oldPasscode.y() + _oldPasscode.height() + ((st::usernameSkip - st::usernameFont->height) / 2), w, 1, style::al_top);
+	}
+
+	if (!_oldError.isEmpty()) {
+		p.setPen(st::setErrColor->p);
+		p.drawText(QRect(0, _oldPasscode.y() + _oldPasscode.height(), width(), st::usernameSkip), _oldError, style::al_center);
+	}
+
+	if (!_newError.isEmpty()) {
+		p.setPen(st::setErrColor->p);
+		p.drawText(QRect(0, _reenterPasscode.y() + _reenterPasscode.height(), width(), st::usernameSkip), _newError, style::al_center);
+	}
+
+	if (!_emailError.isEmpty()) {
+		p.setPen(st::setErrColor->p);
+		p.drawText(QRect(0, _recoverEmail.y() + _recoverEmail.height(), width(), st::usernameSkip), _emailError, style::al_center);
+	}
+
+	// paint button sep
+	p.fillRect(st::btnSelectCancel.width, size().height() - st::btnSelectCancel.height, st::lineWidth, st::btnSelectCancel.height, st::btnSelectSep->b);
+}
+
+void PasscodeBox::resizeEvent(QResizeEvent *e) {
+	bool has = _cloudPwd ? (!_curSalt.isEmpty()) : cHasPasscode();
+	_oldPasscode.setGeometry(st::addContactPadding.left(), st::boxTitleHeight + st::addContactPadding.top(), width() - st::addContactPadding.left() - st::addContactPadding.right(), _oldPasscode.height());
+	_newPasscode.setGeometry(st::addContactPadding.left(), _oldPasscode.y() + ((_turningOff || has) ? (_oldPasscode.height() + st::usernameSkip) : 0), _oldPasscode.width(), _oldPasscode.height());
+	_reenterPasscode.setGeometry(st::addContactPadding.left(), _newPasscode.y() + _newPasscode.height() + st::addContactDelta, _newPasscode.width(), _newPasscode.height());
+	_passwordHint.setGeometry(st::addContactPadding.left(), _reenterPasscode.y() + _reenterPasscode.height() + st::usernameSkip, _reenterPasscode.width(), _reenterPasscode.height());
+
+	_recoverEmail.setGeometry(st::addContactPadding.left(), _passwordHint.y() + _passwordHint.height() + st::addContactDelta + _aboutHeight + st::addContactDelta, _passwordHint.width(), _passwordHint.height());
+
+	if (!_recover.isHidden()) {
+		if (_turningOff) {
+			_recover.move((width() - _recover.width()) / 2, _oldPasscode.y() + _oldPasscode.height() + st::usernameSkip + _aboutHeight + ((st::usernameSkip - _recover.height()) / 2));
+		} else {
+			_recover.move((width() - _recover.width()) / 2, _passwordHint.y() + _passwordHint.height() + st::addContactDelta + _aboutHeight + ((st::usernameSkip - _recover.height()) / 2));
+		}
+	}
+
+	int32 buttonTop = height() - _cancelButton.height();
+	_cancelButton.move(0, buttonTop);
+	_saveButton.move(width() - _saveButton.width(), buttonTop);
+}
+
+void PasscodeBox::showDone() {
+	if (_oldPasscode.isHidden()) {
+		_newPasscode.setFocus();
+	} else {
+		_oldPasscode.setFocus();
+	}
+}
+
+void PasscodeBox::setPasswordDone(const MTPBool &result) {
+	_setRequest = 0;
+	emit reloadPassword();
+	ConfirmBox *box = new ConfirmBox(lang(_reenterPasscode.isHidden() ? lng_cloud_password_removed : (_oldPasscode.isHidden() ? lng_cloud_password_was_set : lng_cloud_password_updated)), true, lang(lng_about_done));
+	App::wnd()->showLayer(box, true);
+}
+
+bool PasscodeBox::setPasswordFail(const RPCError &error) {
+	if (isHidden() && _replacedBy && !_replacedBy->isHidden()) _replacedBy->onClose();
+	_setRequest = 0;
+	QString err = error.type();
+	if (err == "PASSWORD_HASH_INVALID") {
+		if (_oldPasscode.isHidden()) {
+			emit reloadPassword();
+			onClose();
+		} else {
+			onBadOldPasscode();
+		}
+	} else if (err == "NEW_PASSWORD_BAD") {
+		_newPasscode.setFocus();
+		_newPasscode.notaBene();
+		_newError = lang(lng_cloud_password_bad);
+		update();
+	} else if (err == "NEW_SALT_INVALID") {
+		emit reloadPassword();
+		onClose();
+	} else if (err == "EMAIL_INVALID") {
+		_emailError = lang(lng_cloud_password_bad_email);
+		_recoverEmail.setFocus();
+		_recoverEmail.notaBene();
+		update();
+	} else if (err == "EMAIL_UNCONFIRMED") {
+		ConfirmBox *box = new ConfirmBox(lang(lng_cloud_password_almost), true, lang(lng_about_done));
+		App::wnd()->showLayer(box, true);
+		emit reloadPassword();
+	} else if (error.type().startsWith(qsl("FLOOD_WAIT_"))) {
+		if (_oldPasscode.isHidden()) return false;
+
+		_oldPasscode.selectAll();
+		_oldPasscode.setFocus();
+		_oldPasscode.notaBene();
+		_oldError = lang(lng_flood_error);
+	}
+	return true;
+}
+
+void PasscodeBox::onSave(bool force) {
+	if (_setRequest) return;
+
+	QString old = _oldPasscode.text(), pwd = _newPasscode.text(), conf = _reenterPasscode.text();
+	bool has = _cloudPwd ? (!_curSalt.isEmpty()) : cHasPasscode();
+	if (!_cloudPwd && (_turningOff || has)) {
+		if (!passcodeCanTry()) {
+			_oldError = lang(lng_flood_error);
+			_oldPasscode.setFocus();
+			_oldPasscode.notaBene();
+			update();
+			return;
+		}
+
+		if (Local::checkPasscode(old.toUtf8())) {
+			cSetPasscodeBadTries(0);
+			if (_turningOff) pwd = conf = QString();
+		} else {
+			cSetPasscodeBadTries(cPasscodeBadTries() + 1);
+			cSetPasscodeLastTry(getms(true));
+			onBadOldPasscode();
+			return;
+		}
+	}
+	if (!_turningOff && pwd.isEmpty()) {
+		_newPasscode.setFocus();
+		_newPasscode.notaBene();
+		if (isHidden() && _replacedBy && !_replacedBy->isHidden()) _replacedBy->onClose();
+		return;
+	}
+	if (pwd != conf) {
+		_reenterPasscode.setFocus();
+		_reenterPasscode.notaBene();
+		if (!conf.isEmpty()) {
+			_newError = lang(_cloudPwd ? lng_cloud_password_differ : lng_passcode_differ);
+			update();
+		}
+		if (isHidden() && _replacedBy && !_replacedBy->isHidden()) _replacedBy->onClose();
+	} else if (!_turningOff && has && old == pwd) {
+		_newPasscode.setFocus();
+		_newPasscode.notaBene();
+		_newError = lang(_cloudPwd ? lng_cloud_password_is_same : lng_passcode_is_same);
+		update();
+		if (isHidden() && _replacedBy && !_replacedBy->isHidden()) _replacedBy->onClose();
+	} else if (_cloudPwd) {
+		QString hint = _passwordHint.text(), email = _recoverEmail.text().trimmed();
+		if (_cloudPwd && pwd == hint && !_passwordHint.isHidden() && !_newPasscode.isHidden()) {
+			_newPasscode.setFocus();
+			_newPasscode.notaBene();
+			_newError = lang(lng_cloud_password_bad);
+			update();
+			if (isHidden() && _replacedBy && !_replacedBy->isHidden()) _replacedBy->onClose();
+			return;
+		}
+		if (!_recoverEmail.isHidden() && email.isEmpty() && !force) {
+			_replacedBy = new ConfirmBox(lang(lng_cloud_password_about_recover));
+			connect(_replacedBy, SIGNAL(confirmed()), this, SLOT(onForceNoMail()));
+			connect(_replacedBy, SIGNAL(destroyed(QObject*)), this, SLOT(onBoxDestroyed(QObject*)));
+			App::wnd()->replaceLayer(_replacedBy);
+		} else {
+			QByteArray newPasswordData = pwd.isEmpty() ? QByteArray() : (_newSalt + pwd.toUtf8() + _newSalt);
+			QByteArray newPasswordHash = pwd.isEmpty() ? QByteArray() : QByteArray(32, Qt::Uninitialized);
+			if (pwd.isEmpty()) {
+				hint = QString();
+				email = QString();
+			} else {
+				hashSha256(newPasswordData.constData(), newPasswordData.size(), newPasswordHash.data());
+			}
+			QByteArray oldPasswordData = _oldPasscode.isHidden() ? QByteArray() : (_curSalt + old.toUtf8() + _curSalt);
+			QByteArray oldPasswordHash = _oldPasscode.isHidden() ? QByteArray() : QByteArray(32, Qt::Uninitialized);
+			if (!_oldPasscode.isHidden()) {
+				hashSha256(oldPasswordData.constData(), oldPasswordData.size(), oldPasswordHash.data());
+			}
+			int32 flags = MTPDaccount_passwordInputSettings::flag_new_salt | MTPDaccount_passwordInputSettings::flag_new_password_hash | MTPDaccount_passwordInputSettings::flag_hint;
+			if (_oldPasscode.isHidden() || _newPasscode.isHidden()) {
+				flags |= MTPDaccount_passwordInputSettings::flag_email;
+			}
+			MTPaccount_PasswordInputSettings settings(MTP_account_passwordInputSettings(MTP_int(flags), MTP_string(_newSalt), MTP_string(newPasswordHash), MTP_string(hint), MTP_string(email)));
+			_setRequest = MTP::send(MTPaccount_UpdatePasswordSettings(MTP_string(oldPasswordHash), settings), rpcDone(&PasscodeBox::setPasswordDone), rpcFail(&PasscodeBox::setPasswordFail));
+		}
+	} else {
+		cSetPasscodeBadTries(0);
+		Local::setPasscode(pwd.toUtf8());
+		App::wnd()->checkAutoLock();
+		App::wnd()->getTitle()->showUpdateBtn();
+		emit closed();
+	}
+}
+
+void PasscodeBox::onBadOldPasscode() {
+	_oldPasscode.selectAll();
+	_oldPasscode.setFocus();
+	_oldPasscode.notaBene();
+	_oldError = lang(_cloudPwd ? lng_cloud_password_wrong : lng_passcode_wrong);
+	update();
+}
+
+void PasscodeBox::onOldChanged() {
+	if (!_oldError.isEmpty()) {
+		_oldError = QString();
+		update();
+	}
+}
+
+void PasscodeBox::onNewChanged() {
+	if (!_newError.isEmpty()) {
+		_newError = QString();
+		update();
+	}
+}
+
+void PasscodeBox::onEmailChanged() {
+	if (!_emailError.isEmpty()) {
+		_emailError = QString();
+		update();
+	}
+}
+
+void PasscodeBox::onForceNoMail() {
+	onSave(true);
+}
+
+void PasscodeBox::onBoxDestroyed(QObject *obj) {
+	if (obj == _replacedBy) {
+		_replacedBy = 0;
+	}
+}
+
+void PasscodeBox::onRecoverByEmail() {
+	if (_pattern.isEmpty()) {
+		_pattern = "-";
+		MTP::send(MTPauth_RequestPasswordRecovery(), rpcDone(&PasscodeBox::recoverStarted), rpcFail(&PasscodeBox::recoverStartFail));
+	} else {
+		recover();
+	}
+}
+
+void PasscodeBox::onRecoverExpired() {
+	_pattern = QString();
+}
+
+void PasscodeBox::recover() {
+	if (_pattern == "-") return;
+
+	_replacedBy = new RecoverBox(_pattern);
+	connect(_replacedBy, SIGNAL(reloadPassword()), this, SIGNAL(reloadPassword()));
+	connect(_replacedBy, SIGNAL(recoveryExpired()), this, SLOT(onRecoverExpired()));
+	connect(_replacedBy, SIGNAL(destroyed(QObject*)), this, SLOT(onBoxDestroyed(QObject*)));
+	App::wnd()->replaceLayer(_replacedBy);
+}
+
+void PasscodeBox::recoverStarted(const MTPauth_PasswordRecovery &result) {
+	_pattern = qs(result.c_auth_passwordRecovery().vemail_pattern);
+	recover();
+}
+
+bool PasscodeBox::recoverStartFail(const RPCError &error) {
+	if (error.type().startsWith(qsl("FLOOD_WAIT_"))) return false;
+
+	_pattern = QString();
+	onClose();
+	return true;
+}
+
+RecoverBox::RecoverBox(const QString &pattern) :
+_submitRequest(0), _pattern(st::usernameFont->m.elidedText(lng_signin_recover_hint(lt_recover_email, pattern), Qt::ElideRight, st::boxWidth - st::addContactPadding.left() - st::addContactPadding.right())),
+_saveButton(this, lang(lng_passcode_submit), st::btnSelectDone),
+_cancelButton(this, lang(lng_cancel), st::btnSelectCancel),
+_recoverCode(this, st::inpAddContact, lang(lng_signin_code)) {
+	setMaxHeight(st::boxTitleHeight + st::addContactPadding.top() + st::usernameSkip + _recoverCode.height() + st::usernameSkip + st::addContactPadding.bottom() + _saveButton.height());
+
+	connect(&_saveButton, SIGNAL(clicked()), this, SLOT(onSubmit()));
+	connect(&_cancelButton, SIGNAL(clicked()), this, SLOT(onClose()));
+
+	connect(&_recoverCode, SIGNAL(changed()), this, SLOT(onCodeChanged()));
+
+	prepare();
+}
+
+void RecoverBox::hideAll() {
+	_recoverCode.hide();
+	_saveButton.hide();
+	_cancelButton.hide();
+}
+
+void RecoverBox::showAll() {
+	_recoverCode.show();
+	_saveButton.show();
+	_cancelButton.show();
+}
+
+void RecoverBox::keyPressEvent(QKeyEvent *e) {
+	if (e->key() == Qt::Key_Enter || e->key() == Qt::Key_Return) {
+		if (_recoverCode.text().isEmpty()) {
+			_recoverCode.setFocus();
+			_recoverCode.notaBene();
+		} else {
+			onSubmit();
+		}
+	} else {
+		AbstractBox::keyPressEvent(e);
+	}
+}
+
+void RecoverBox::paintEvent(QPaintEvent *e) {
+	Painter p(this);
+	if (paint(p)) return;
+
+	paintTitle(p, lang(lng_signin_recover), true);
+
+	// paint shadow
+	p.fillRect(0, height() - st::btnSelectCancel.height - st::scrollDef.bottomsh, width(), st::scrollDef.bottomsh, st::scrollDef.shColor->b);
+
+	p.setFont(st::usernameFont->f);
+	int32 w = width() - st::addContactPadding.left() - st::addContactPadding.right();
+	p.drawText(QRect(st::addContactPadding.left(), _recoverCode.y() - st::usernameSkip - st::addContactPadding.top(), w, st::addContactPadding.top() + st::usernameSkip), _pattern, style::al_center);
+
+	if (!_error.isEmpty()) {
+		p.setPen(st::setErrColor->p);
+		p.drawText(QRect(0, _recoverCode.y() + _recoverCode.height(), width(), st::usernameSkip), _error, style::al_center);
+	}
+
+	// paint button sep
+	p.fillRect(st::btnSelectCancel.width, size().height() - st::btnSelectCancel.height, st::lineWidth, st::btnSelectCancel.height, st::btnSelectSep->b);
+}
+
+void RecoverBox::resizeEvent(QResizeEvent *e) {
+	_recoverCode.setGeometry(st::addContactPadding.left(), st::boxTitleHeight + st::addContactPadding.top() + st::usernameSkip, width() - st::addContactPadding.left() - st::addContactPadding.right(), _recoverCode.height());
+
+	int32 buttonTop = height() - _cancelButton.height();
+	_cancelButton.move(0, buttonTop);
+	_saveButton.move(width() - _saveButton.width(), buttonTop);
+}
+
+void RecoverBox::showDone() {
+	_recoverCode.setFocus();
+}
+
+void RecoverBox::onSubmit() {
+	if (_submitRequest) return;
+
+	QString code = _recoverCode.text().trimmed();
+	if (code.isEmpty()) {
+		_recoverCode.notaBene();
+		return;
+	}
+
+	_submitRequest = MTP::send(MTPauth_RecoverPassword(MTP_string(code)), rpcDone(&RecoverBox::codeSubmitDone, true), rpcFail(&RecoverBox::codeSubmitFail));
+}
+
+void RecoverBox::onCodeChanged() {
+	_error = QString();
+	update();
+}
+
+void RecoverBox::codeSubmitDone(bool recover, const MTPauth_Authorization &result) {
+	_submitRequest = 0;
+
+	emit reloadPassword();
+	ConfirmBox *box = new ConfirmBox(lang(lng_cloud_password_removed), true, lang(lng_about_done));
+	App::wnd()->showLayer(box, true);
+}
+
+bool RecoverBox::codeSubmitFail(const RPCError &error) {
+	_submitRequest = 0;
+
+	const QString &err = error.type();
+	if (err == "PASSWORD_EMPTY") {
+		emit reloadPassword();
+		ConfirmBox *box = new ConfirmBox(lang(lng_cloud_password_removed), true, lang(lng_about_done));
+		App::wnd()->showLayer(box, true);
+		return true;
+	} else if (err == "PASSWORD_RECOVERY_NA") {
+		onClose();
+		return true;
+	} else if (err == "PASSWORD_RECOVERY_EXPIRED") {
+		emit recoveryExpired();
+		onClose();
+		return true;
+	} else if (err == "CODE_INVALID") {
+		_error = lang(lng_signin_wrong_code);
+		update();
+		_recoverCode.notaBene();
+		return true;
+	} else if (error.type().startsWith(qsl("FLOOD_WAIT_"))) {
+		_error = lang(lng_flood_error);
+		update();
+		_recoverCode.notaBene();
+		return true;
+	}
+	if (cDebug()) { // internal server error
+		_error =  err + ": " + error.description();
+	} else {
+		_error = lang(lng_server_error);
+	}
+	update();
+	_recoverCode.setFocus();
+	return false;
+}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
John Preston	9761c5bb56	fixed 0.8.12.dev version	2015-05-08 19:01:11 +03:00
John Preston	7d6bf487a7	Merge branch 'dev' of https://github.com/telegramdesktop/tdesktop into dev	2015-05-08 17:44:40 +03:00
John Preston	6fda783fc1	version 0.8.12.dev with new emojis support	2015-05-08 17:44:07 +03:00
John Preston	aeaa039542	cmd+backspace support added	2015-05-08 17:36:05 +03:00
John Preston	62e85b1cf0	Merge branch 'dev' of https://github.com/telegramdesktop/tdesktop into dev	2015-05-08 16:08:36 +03:00
John Preston	080a08fa76	some optimizations in shortchatmessage	2015-05-08 16:06:53 +03:00
John Preston	be1eb1c693	Merge branch 'emojis' into dev	2015-05-08 16:02:33 +03:00
John Preston	daf5d4acdb	removed temp code	2015-05-08 16:02:24 +03:00
John Preston	f4781b9117	recent emojis more frequent update	2015-05-08 15:58:34 +03:00
John Preston	0f778431f5	new emoji support done	2015-05-08 15:45:14 +03:00
John Preston	2121ce1210	version 0.8.11 stable is prepared	2015-05-01 12:14:43 +03:00
John Preston	c54aadcac3	version 0.8.10.dev with fixes in webpage layout, history load and history msgs reg	2015-05-01 02:05:19 +03:00
John Preston	3fc74166de	langs updated	2015-05-01 02:03:22 +03:00
John Preston	749b13adec	dev version 0.8.9 fixed telegram.me joinchat	2015-04-30 18:11:21 +03:00
John Preston	c33ddf49ff	langs updated	2015-04-30 18:09:06 +03:00
John Preston	bc1e2dcb54	langs updated	2015-04-30 16:58:21 +03:00
John Preston	9a193ed88f	new emojis rendered	2015-04-30 16:56:33 +03:00
John Preston	fb32c5bcd1	version 0.8.8.dev - audio listened status, photo caption display, map places name-address display, gray muted badges, invite links support, some fixes	2015-04-30 16:53:36 +03:00
John Preston	67b46d9aac	Merge branch 'dev' of https://github.com/telegramdesktop/tdesktop into emojis	2015-04-25 16:55:12 +03:00
John Preston	aeb2ec68ef	added some debug info in autoupdate, version 0.8.7 stable prepared	2015-04-24 19:02:45 +03:00
John Preston	e1c304c2e5	langs updated, qt multimedia dependency removed from xcode project	2015-04-24 18:59:02 +03:00
John Preston	c7de9d4668	Merge branch 'dev' of https://github.com/telegramdesktop/tdesktop into dev	2015-04-23 22:58:41 +03:00
John Preston	45aa6dff75	langs updated	2015-04-23 22:58:35 +03:00
John Preston	8b0562b946	lang updated	2015-04-23 22:58:02 +03:00
John Preston	373f1a0ff0	added old chat bg to git and to telegram_linux.qrc	2015-04-23 19:03:31 +03:00
John Preston	058f6bd8de	Merge branch 'dev' of https://github.com/telegramdesktop/tdesktop into dev	2015-04-23 19:02:11 +03:00
John Preston	a707f7b9e7	0.8.6 prepared - forwarded info display in media (except photos and stickers), grouped forwarded notification, old bg returned, critical mtproto fix	2015-04-23 19:01:43 +03:00
John Preston	61d1574023	added forwarded and from names in files / audios / videos / contacts display, grouped notification for many forwarded messages, fix of getDifference() for new_session_created	2015-04-23 18:50:11 +03:00
John Preston	fe59898e5c	changed chat bg in linux resource file	2015-04-22 15:05:29 +03:00
John Preston	0df1952a04	changelog added	2015-04-22 14:33:52 +03:00
John Preston	1d8ec7c7d6	dev-version 0.8.5 prepared - new photoviewer, new default chat background	2015-04-22 14:21:45 +03:00
John Preston	b770ea4f8d	optimized new mediaview, os x new mediaview done	2015-04-19 22:01:45 +03:00
John Preston	b31f2d952c	regen emojis started	2015-04-19 14:16:48 +03:00
John Preston	370c47d95b	new photoviewer adapted for documents	2015-04-19 13:29:19 +03:00
John Preston	9b3767e77c	Merge branch 'master' of https://github.com/telegramdesktop/tdesktop into dev	2015-04-16 18:00:43 +03:00
John Preston	196b643e7d	Merge branch 'dev' of https://github.com/telegramdesktop/tdesktop into dev	2015-04-16 18:00:16 +03:00
John Preston	c9626c140c	sending ping_delay_disconnect instead of getDifference by no-updates timeouts	2015-04-16 17:59:42 +03:00
John Preston	a356a4dc06	dont cache default background image, cmd+m minimizes window in os x	2015-04-16 14:14:25 +03:00
John Preston	34d5c3777b	Merge branch 'master' of https://github.com/telegramdesktop/tdesktop	2015-04-15 11:07:27 +02:00
John Preston	ac74a08d53	fixed crash in photo update from	2015-04-15 09:23:39 +02:00
John Preston	47b0f901c8	Merge branch 'master' of https://github.com/telegramdesktop/tdesktop	2015-04-13 10:59:32 +01:00
John Preston	18103aae75	xcode project updated	2015-04-13 10:59:28 +01:00
John Preston	cc9ae13297	fixed vimeo links preview	2015-04-13 10:58:30 +01:00
John Preston	334b3ac706	Merge branch 'master' of https://github.com/telegramdesktop/tdesktop into dev	2015-04-13 10:41:01 +01:00
John Preston	b8f19786a1	0.8.4 changelog	2015-04-13 10:05:47 +01:00
John Preston	a9063eb87b	Merge branch 'dev' of https://github.com/telegramdesktop/tdesktop into dev	2015-04-13 09:58:34 +01:00
John Preston	175e0f71ce	fixed reply to text color	2015-04-13 09:58:13 +01:00
John Preston	51f9e8f681	links preview resize fixed, version 0.8.4	2015-04-13 09:54:06 +01:00
John Preston	782c254ea0	started photoviewer redesign	2015-04-11 11:04:10 +01:00
John Preston	8bc0410830	version 0.8.3 prepared	2015-04-08 17:22:06 +03:00
John Preston	70f3568e16	version 0.8.2.dev ready	2015-04-08 02:03:32 +03:00
John Preston	fb2c140fad	langs updated	2015-04-08 01:48:35 +03:00
John Preston	9ede565a00	webPage links preview previews done	2015-04-07 01:15:29 +03:00
John Preston	11dd70cb1a	version 0.8.1.dev prepared	2015-04-05 21:11:28 +03:00
John Preston	406fc2a4d4	sessions, two-step verification and links preview done for linux version	2015-04-05 11:49:03 +03:00
John Preston	e6ef982706	sessions, two-step verification and links preview done for os x version	2015-04-05 11:40:56 +03:00
John Preston	f3bb155b0a	links preview done	2015-04-04 23:01:34 +03:00
John Preston	868d5f60f3	cloud password support added, sessions list added, some boxes unifications	2015-04-02 13:33:19 +03:00
John Preston	7814654d38	stable version 0.8 prepared	2015-03-26 13:45:47 +03:00
John Preston	1b67494e0b	Merge branch 'master' of https://github.com/telegramdesktop/tdesktop	2015-03-26 12:35:34 +03:00
John Preston	e052a11326	0.7.26.dev - some bugs fixed	2015-03-26 12:35:21 +03:00
John Preston	75bfc6b893	langs updated, right click in profile fixed	2015-03-26 12:32:57 +03:00
John Preston	8c7a35c973	add users to groups by usernames, copy username from context menu in profile, 0.7.25.dev version	2015-03-25 18:42:15 +03:00
John Preston	489b151d49	os x and linux dialog path remember through executions	2015-03-24 18:49:07 +03:00
John Preston	b5d3580150	removing of recent hashtags added	2015-03-24 18:18:20 +03:00
John Preston	08e283bc91	Merge branch 'master' of https://github.com/telegramdesktop/tdesktop	2015-03-24 14:11:59 +03:00
John Preston	07463dda6b	improved 0.7.24.dev, changelog added	2015-03-24 14:11:38 +03:00
John Preston	4f7cc79b4c	warning fixed	2015-03-24 13:21:30 +03:00
John Preston	938707203c	0.7.24.dev version with hashtags autocomplete, forwarding with comment and move back to reply by bottom arrow	2015-03-24 13:00:27 +03:00
John Preston	69879332fd	non clickable mention in changelog	2015-03-20 09:56:42 +03:00
John Preston	01ad967640	version 0.7.23 stable is ready	2015-03-20 09:41:11 +03:00
John Preston	d8c853bb83	langs updated	2015-03-20 09:38:22 +03:00
John Preston	db6ed90337	0.7.22.dev version with fixed messages delivery	2015-03-20 00:56:13 +03:00
John Preston	8991b5ead3	langs updated	2015-03-20 00:49:44 +03:00
John Preston	a301866560	0.7.22 changelog	2015-03-19 23:08:14 +03:00
John Preston	75cad6179d	changelog to 0.7.21.dev added	2015-03-19 14:40:47 +03:00
John Preston	2f094c2350	Merge branch 'dev' of https://github.com/telegramdesktop/tdesktop	2015-03-19 14:25:12 +03:00
John Preston	8d614463ae	0.7.21.dev version prepared for os x	2015-03-19 14:24:23 +03:00
John Preston	1f7e39e184	version 0.7.21.dev prepared - replies, mentions	2015-03-19 12:18:19 +03:00
John Preston	acc1a3d693	langs updated for 0.7.20	2015-03-13 16:13:09 +03:00
John Preston	39acdd8725	layer 25 support started	2015-03-13 16:01:25 +03:00
John Preston	200bbc47d7	version 0.7.20 prepared - passcodes in stable version	2015-03-12 15:23:08 +03:00
John Preston	79524885e3	Merge branch 'master' of https://github.com/telegramdesktop/tdesktop	2015-03-12 13:28:18 +03:00
John Preston	4f705c3712	prepared ping_delay_disconnect, moved http_wait to any request through http transport	2015-03-12 13:28:10 +03:00
John Preston	fd055e5f0b	langs updated for passcodes	2015-03-12 12:48:21 +03:00
John Preston	e1f5c79b97	linux passcode done	2015-03-02 18:49:36 +03:00
John Preston	ff29cbf3e7	passcode added to os x	2015-03-02 18:36:13 +03:00
John Preston	7630b47c3a	Merge branch 'master' of https://github.com/telegramdesktop/tdesktop	2015-03-02 15:35:13 +03:00
John Preston	acb379132a	removed DejaVuSans font from qt_preprocess	2015-03-02 15:35:05 +03:00
John Preston	ad04bf77d1	0.7.19 version with passcode lock option	2015-03-02 15:34:16 +03:00
John Preston	64bc88ce82	0.7.18.dev changelog added	2015-02-20 20:05:48 +03:00
John Preston	4e07a54a45	Merge branch 'master' of https://github.com/telegramdesktop/tdesktop	2015-02-20 18:42:14 +03:00
John Preston	b762a8c442	0.7.18.dev version	2015-02-20 18:41:54 +03:00
John Preston	46722cb6b1	Merge branch 'master' of https://github.com/telegramdesktop/tdesktop	2015-02-19 15:51:06 +03:00
John Preston	3102ca1133	returned appindicator tray icon in pantheon and gnome	2015-02-19 15:50:59 +03:00
John Preston	206176eeb7	version 0.7.17 prepared	2015-02-19 15:22:59 +03:00
John Preston	988da75d82	added qtextlayout patch file	2015-02-19 14:36:23 +03:00
John Preston	ac245b174d	improved word skip in qtextedit	2015-02-19 14:30:16 +03:00
John Preston	e6b867da57	Merge branch 'master' of https://github.com/telegramdesktop/tdesktop	2015-02-18 19:52:25 +03:00
John Preston	1d0a799b77	removed Prepare project (moved to PrepareWin.bat), fixed multimedia keys in Qt 5.4.0	2015-02-18 19:52:04 +03:00
John Preston	4c3bb57d14	fixed compilation	2015-02-18 18:07:21 +03:00
John Preston	1e255f0cd8	removed support templates from tdesktop	2015-02-18 15:54:50 +03:00
John Preston	6077043939	0.7.16 stable version prepared	2015-02-17 17:51:48 +03:00
John Preston	5608062d58	langs updated	2015-02-17 17:29:01 +03:00
John Preston	703361194e	version 0.7.15.dev prepared	2015-02-16 18:30:32 +03:00
John Preston	17b2539ad2	Merge branch 'master' of https://github.com/telegramdesktop/tdesktop	2015-02-16 17:52:43 +03:00
John Preston	840d5eb671	fixed Save As default filenames	2015-02-16 17:52:37 +03:00
John Preston	871231c5cf	use QSystemTrayIcon on not-Unity, Semibold Open Sans fixed by Qt patch	2015-02-16 17:51:50 +03:00
John Preston	394170bd4c	fixed Semibold font in Qt 5.4.0 fontconfig, fixed youtu.be with #	2015-02-14 15:41:32 +03:00
John Preston	0a5e1a69e3	added fontconfig fix for linux in qt5.4.0	2015-02-13 21:10:56 +03:00
John Preston	74e5dd3c91	Merge branch 'master' of https://github.com/telegramdesktop/tdesktop	2015-02-13 21:09:21 +03:00
John Preston	f7a5de3cc9	fixed linux fonts reading in qt 5.4.0, fixed scrollbars colors	2015-02-13 21:09:01 +03:00
John Preston	ebdbcc2a7f	static link for Qt 5.4.0 done	2015-02-12 11:07:04 +00:00
John Preston	27c69895ce	changelog added to 0.7.14.dev	2015-02-12 00:22:02 +00:00
John Preston	60370e370f	dev-version 0.7.14 on Qt 5.4.0	2015-02-11 23:50:03 +00:00
John Preston	b3e204241a	Linux .pro files moved to Qt 5.4.0	2015-02-11 23:43:22 +00:00
John Preston	1c82e5259e	Merge branch 'master' of https://github.com/telegramdesktop/tdesktop	2015-02-11 23:39:20 +00:00
John Preston	273f6955f0	xcode projects moved to qt 5.4.0	2015-02-11 23:38:44 +00:00
John Preston	5fe1cc174e	moved to qt 5.4.0, qt patch now in .diff or by files	2015-02-11 23:37:30 +00:00
John Preston	a2203904fc	qt 5.4 patch in .diff format added, time display in system settings done	2015-02-10 18:55:04 +00:00
John Preston	43627a46ac	fixed ZWNJ and ZWJ chars input in Qt	2015-02-10 14:45:50 +00:00
John Preston	585f31b6f2	dc 3 ip changed	2015-02-10 12:46:38 +00:00
John Preston	f66d8ee0f8	version 0.7.13 prepared	2015-02-09 23:29:02 +00:00
John Preston	d98f77ed58	langs updated	2015-02-09 23:23:25 +00:00
John Preston	00f0a70454	some fixes in navigation	2015-02-09 23:19:48 +00:00
John Preston	a5d2558f5a	settings redesigned a little, documents changed to files in lang	2015-02-09 13:26:59 +00:00
John Preston	69830d570f	fixed autoupdate for mac os x version for dev-channel	2015-02-06 14:43:25 +00:00
John Preston	d8395beadd	fixed linux autoupdate for dev channel	2015-02-06 06:42:43 -08:00
John Preston	5c8721c429	0.7.12 dev version prepared	2015-02-06 10:57:13 +00:00
John Preston	bba74db341	langs updated	2015-02-06 09:42:13 +00:00
John Preston	9902dd5588	improved dev-channel deploy scripts	2015-02-05 15:03:03 +00:00
John Preston	a221a4dc94	dev-channel deploy improved	2015-02-05 14:53:11 +00:00
John Preston	6dada1294e	dev-channel versions added	2015-02-05 14:49:50 +00:00
John Preston	2f7c1cca78	fixed bg cache for tiled background, linux version background supported	2015-02-04 10:59:20 +03:00
John Preston	bb4bba620c	Merge branch 'master' of https://github.com/telegramdesktop/tdesktop	2015-02-03 19:45:20 +03:00
John Preston	39419a212e	removed backgroundcolor setting	2015-02-03 19:45:12 +03:00
John Preston	136e32110e	improved backgrounds for retina displays and xcode build	2015-02-03 19:44:54 +03:00
John Preston	b8b4a81576	Merge branch 'master' of https://github.com/telegramdesktop/tdesktop	2015-02-03 18:06:19 +03:00
John Preston	a378172775	scale to dbisOne in retina	2015-02-03 18:06:15 +03:00
John Preston	70e85529c7	added chat backgrounds	2015-02-03 18:02:46 +03:00
John Preston	a8e9c1b9e2	fixed libwebp crash (qt patch improved), langs updated	2015-01-29 11:58:11 +03:00
John Preston	e1f995ab90	Merge branch 'master' of https://github.com/telegramdesktop/tdesktop	2015-01-28 18:07:47 +03:00
John Preston	4d357fafb2	version 0.7.10 prepared	2015-01-28 18:07:22 +03:00
John Preston	0f6429ecb5	fixed notifications in os x	2015-01-28 17:55:12 +03:00
John Preston	1c2289f2ce	alt-up and alt-down scroll through dialogs, fixed compile on windows	2015-01-28 16:29:01 +03:00
John Preston	89ce0ce1e2	Merge branch 'master' of https://github.com/telegramdesktop/tdesktop	2015-01-28 16:18:51 +03:00
John Preston	fd4ecd08e9	disabled gtk and appindicator unload	2015-01-28 16:18:46 +03:00
John Preston	2c03490f2d	Merge branch 'master' of https://github.com/telegramdesktop/tdesktop	2015-01-28 16:14:49 +03:00
John Preston	61da0ff829	enabled custom notifies in os x 10.7, added content image in os x native notifiers	2015-01-28 16:14:43 +03:00
John Preston	c428008166	Merge branch 'master' of https://github.com/telegramdesktop/tdesktop	2015-01-28 16:11:20 +03:00
John Preston	94d1ea7032	improved borderless window	2015-01-28 16:11:14 +03:00
John Preston	de784d2bbc	mp3 audio downloaded, play corrupt voice messages, -startintray cmdline param, always to recent emojis, local images cache respects filesize and last modified, removed stickers from documents overview, notify remove in Windows fullscreen and lockscreen	2015-01-27 19:58:58 +03:00
John Preston	75a47e98c3	fixed offline-in-30-seconds on no activity	2015-01-26 17:14:52 +03:00
John Preston	dde1a5a6eb	new online / offline status update, notify delayed if other clients are active	2015-01-26 16:04:41 +03:00
John Preston	9cfaab6baf	Merge branch 'master' of https://github.com/telegramdesktop/tdesktop	2015-01-23 18:24:42 +03:00
John Preston	6d8125be19	version 0.7.9	2015-01-23 18:24:36 +03:00
John Preston	65e9aa10e1	langs updated	2015-01-23 18:22:22 +03:00
John Preston	da48c2141c	pseudo-online for hidden last-seen done	2015-01-23 14:02:45 +03:00
John Preston	bbcca80503	Merge branch 'master' of https://github.com/telegramdesktop/tdesktop	2015-01-23 13:22:28 +03:00
John Preston	8dca319545	fixed FlatLabel for large texts	2015-01-23 13:20:40 +03:00
John Preston	a7b4d81a11	Merge branch 'master' of https://github.com/telegramdesktop/tdesktop	2015-01-23 12:48:36 +03:00
John Preston	b688a2e518	improved libappindicator load, making user online for some time after incoming msg	2015-01-23 12:48:21 +03:00
John Preston	572c4d8727	korean language added, translations updated	2015-01-23 12:24:37 +03:00
John Preston	781c531964	win open with menu done, lang string for 0.7.9 added	2015-01-23 00:59:07 +03:00
John Preston	6302eeeb2b	merged master	2015-01-21 13:21:39 +03:00
John Preston	471d83fb97	new open with menu for os x	2015-01-21 13:20:23 +03:00
John Preston	12f6b340e5	clearing init logs	2015-01-18 15:52:14 +03:00
John Preston	ea5b824977	trying to use gtk-3 and appindicator3, if failed use gtk-x11-2.0 and appindicator1, improved init logs	2015-01-18 12:23:03 +03:00
John Preston	2f9b64fdd7	fixed libappindicator load:q	2015-01-18 11:37:02 +03:00
John Preston	9e43f1b5de	trying to load specific versions of libs on linux, otherwise - just libs	2015-01-16 20:00:35 +03:00
John Preston	23cc9d866b	Merge branch 'master' of https://github.com/telegramdesktop/tdesktop	2015-01-16 19:46:13 +03:00
John Preston	1ca86a2390	removing telegram.desktop when adding telegramdesktop.desktop, fixed libappindicator and libunity usage	2015-01-16 19:46:01 +03:00
John Preston	13887d91d9	fixed activate-by-mouse Windows behaviour, 0.7.8	2015-01-16 19:34:23 +03:00
John Preston	eb2bc17578	fixed sprite_200x	2015-01-16 19:22:19 +03:00
John Preston	b3e01fb94f	Merge branch 'master' of https://github.com/telegramdesktop/tdesktop	2015-01-16 18:50:41 +03:00
John Preston	e25b0da9c6	sprites improved	2015-01-16 18:49:29 +03:00
John Preston	dfd6936d64	fixing cyclic resize	2015-01-16 13:26:20 +03:00
John Preston	c4ace88643	fixed appindicator for ubuntu - glib now is linked not statically	2015-01-16 13:02:44 +03:00
John Preston	8b727979d0	moving tray icon images to /tmp/	2015-01-15 21:56:09 +03:00
John Preston	b0f8314255	version 0.7.7 prepared	2015-01-15 21:03:57 +03:00
John Preston	5c4e364491	langs updated	2015-01-15 20:16:20 +03:00
John Preston	9594e18d04	langs updated	2015-01-15 17:30:37 +03:00
John Preston	1a8444740a	tray icon by libappindicator with gtk_status_icon fallback added, unity launcher count added	2015-01-15 17:22:15 +03:00
John Preston	ac5834c863	Merge branch 'master' of https://github.com/telegramdesktop/tdesktop	2015-01-10 16:08:37 +03:00
John Preston	94b0a83f0b	openal fix for windows to hybernate	2015-01-10 16:08:30 +03:00
John Preston	8d10eaa96d	fixed openal for os x 10.7 and 10.8	2015-01-10 16:07:26 +03:00
John Preston	ed44b818fc	langs improved	2015-01-06 19:08:58 +03:00