version 0.7.15.dev prepared

.gitignore

@@ -21,6 +21,7 @@ ipch/
 /Telegram/tdumps/
 
 .DS_Store
+._*
 .qmake.stash
 /Mac/
 /Telegram/*.xcodeproj/xcuserdata/

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 -opengl desktop -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 -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 -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)

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

README.md

@@ -1,6 +1,6 @@
-## [Telegram D](https://tdesktop.com) – Unofficial Telegram Desktop App
+## [Telegram Desktop](https://tdesktop.com) – Official Telegram Messenger app
 
-This is complete source code and build instructions for alpha version of unofficial desktop client for [Telegram](https://telegram.org) messenger, based on [Telegram API](https://core.telegram.org/) and [MTProto](https://core.telegram.org/mtproto) secure protocol.
+This is complete source code and build instructions for alpha version of official desktop client for [Telegram](https://telegram.org) messenger, based on [Telegram API](https://core.telegram.org/) and [MTProto](https://core.telegram.org/mtproto) secure protocol.
 
 Source code is published under GPL v3, license is available [here](https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE).
 
@@ -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,7 +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))
 
 ###[Build instructions for Visual Studio 2013](https://github.com/telegramdesktop/tdesktop/blob/master/MSVC.md)
 

Telegram/DeployLinux.sh

@@ -1,16 +1,20 @@
-AppVersionStr=0.6.7
-AppVersion=6007
+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 tupdates:tdesktop/static/tlinux/
-scp ./../Linux/Release/deploy/$AppVersionStr/tsetup.$AppVersionStr.tar.xz tupdates:tdesktop/static/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/

Telegram/DeployLinux32.sh

@@ -1,16 +1,21 @@
-AppVersionStr=0.6.7
-AppVersion=6007
+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 tupdates:tdesktop/static/tlinux32/
-scp ./../Linux/Release/deploy/$AppVersionStr/tsetup32.$AppVersionStr.tar.xz tupdates:tdesktop/static/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/
 

Telegram/DeployMacWin.sh

@@ -1,13 +1,18 @@
-AppVersionStr=0.6.7
-AppVersion=6007
+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,19 +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 tupdates:tdesktop/static/tmac/
-scp ./../Mac/Release/deploy/$AppVersionStr/tsetup.$AppVersionStr.dmg tupdates:tdesktop/static/tmac/
-scp ./../../tother/tsetup/tupdate$AppVersion tupdates:tdesktop/static/tsetup/
-scp ./../../tother/tsetup/tportable.$AppVersionStr.zip tupdates:tdesktop/static/tsetup/
-scp ./../../tother/tsetup/tsetup.$AppVersionStr.exe tupdates:tdesktop/static/tsetup/
-
+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$DevPostfix.zip tmaster:tdesktop/www/tsetup/
+scp ./../../tother/tsetup/tsetup.$AppVersionStr$DevPostfix.exe tmaster:tdesktop/www/tsetup/

Telegram/DeployWin.sh

@@ -1,21 +1,26 @@
-AppVersionStr=0.6.7
-AppVersion=6007
+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/

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'

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'

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\
 

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>

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";
@@ -597,25 +597,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 +644,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",
 				);
@@ -686,25 +686,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 +734,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",
 				);

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:

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\
 

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>

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;

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:

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\
 

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>

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";
@@ -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 = 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 +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 = 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 +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/ReleaseStyle/;
 				PRODUCT_NAME = MetaStyle;
@@ -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/DebugStyle/;
 				PRODUCT_NAME = MetaStyle;

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:

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

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",

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
 

Telegram/PrepareLinux.sh

@@ -1,5 +1,17 @@
-AppVersionStr=0.6.7
-AppVersion=6007
+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!";
 

Telegram/PrepareLinux32.sh

@@ -1,5 +1,17 @@
-AppVersionStr=0.6.7
-AppVersion=6007
+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!";
 

Telegram/PrepareMac.sh

@@ -1,5 +1,21 @@
-AppVersionStr=0.6.7
-AppVersion=6007
+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$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!"
@@ -16,8 +32,15 @@ if [ ! -d "./../Mac/Release/Telegram.app" ]; then
   exit 1
 fi
 
-if [ ! -d "./../Mac/Release/Telegram.app/Contents/_CodeSignature" ]; then
-  echo "Telegram signature not found!"
+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
 
@@ -36,25 +59,33 @@ if [ ! -f "./../Mac/Release/Telegram.app/Contents/Frameworks/Updater" ]; then
   exit 1
 fi
 
-if [ ! -f "./../Mac/Release/Telegram.app.dmg" ]; then
-  echo "Telegram.app.dmg not found!"
+if [ ! -d "./../Mac/Release/Telegram.app/Contents/_CodeSignature" ]; then
+  echo "Telegram signature not found!"
   exit 1
 fi
 
-echo "Preparing version $AppVersionStr, executing Packer.."
-cd ./../Mac/Release && ./Packer.app/Contents/MacOS/Packer -path Telegram.app -version $AppVersion && cd ./../../Telegram
-echo "Packer done!"
+cd ./../Mac/Release
+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$DevPostfix.dmg
+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
-mv ./../Mac/Release/tmacupd$AppVersion ./../Mac/Release/deploy/$AppVersionStr/
-mv ./../Mac/Release/Telegram.app.dmg ./../Mac/Release/deploy/$AppVersionStr/tsetup.$AppVersionStr.dmg
-echo "Version $AppVersionStr prepared!";
+rm -rf ./../Mac/Release/Telegram.app/Contents/_CodeSignature
+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!";
 

Telegram/PrepareWin.bat

@@ -1,6 +1,63 @@
+@echo OFF
+
+set "AppVersionStrSmall=0.7.15"
+set "AppVersionStr=0.7.15"
+set "AppVersionStrFull=0.7.15.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%%DevPostfix%..
+echo.
+
+set "PATH=%PATH%;C:\Program Files\7-Zip;C:\Program Files (x86)\Inno Setup 5"
 cd ..\Win32\Deploy
-call ..\..\..\TelegramPrivate\Sign.bat tsetup.0.6.7.exe
-call Prepare.exe -path Telegram.exe -path Updater.exe
-mkdir deploy\0.6.7\Telegram
-move deploy\0.6.7\Telegram.exe deploy\0.6.7\Telegram\
+
+call ..\..\..\TelegramPrivate\Sign.bat Telegram.exe
+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% /dMyAppVersionForExe=%AppVersionStr%%DevPostfix% ..\..\Telegram\Setup.iss
+if %errorlevel% neq 0 goto error1
+
+call ..\..\..\TelegramPrivate\Sign.bat tsetup.%AppVersionStr%%DevPostfix%.exe
+if %errorlevel% neq 0 goto error1
+
+call Prepare.exe -path Telegram.exe -path Updater.exe %DevParam%
+if %errorlevel% neq 0 goto error1
+
+cd deploy\%AppVersionStr%%DevPostfix%
+mkdir Telegram
+move Telegram.exe Telegram\
+7z a -mx9 tportable.%AppVersionStr%%DevPostfix%.zip Telegram\
+if %errorlevel% neq 0 goto error2
+
+echo .
+echo Version %AppVersionStr%%DevPostfix% is ready for deploy!
+echo .
+
+cd ..\..\..\..\Telegram
+goto eof
+
+:error2
+cd ..\..
+:error1
 cd ..\..\Telegram
+echo ERROR occured!
+exit /b %errorlevel%
+
+:eof

Telegram/Resources/lang.strings

@@ -0,0 +1,515 @@
+/*
+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
+*/
+"lng_language_name" = "English";
+"lng_switch_to_this" = "Switch to English";
+
+"lng_menu_contacts" = "Contacts";
+"lng_menu_settings" = "Settings";
+"lng_menu_about" = "About";
+"lng_menu_update" = "Update";
+"lng_menu_restart" = "Restart";
+"lng_menu_back" = "Back";
+
+"lng_open_from_tray" = "Open Telegram";
+"lng_minimize_to_tray" = "Minimize to tray";
+"lng_quit_from_tray" = "Quit Telegram";
+"lng_tray_icon_text" = "Telegram is still running here,\nyou can change this from settings page.\n\nIf this icon disappears from tray menu,\nyou can drag it back here from hidden icons.";
+
+"lng_month1" = "January";
+"lng_month2" = "February";
+"lng_month3" = "March";
+"lng_month4" = "April";
+"lng_month5" = "May";
+"lng_month6" = "June";
+"lng_month7" = "July";
+"lng_month8" = "August";
+"lng_month9" = "September";
+"lng_month10" = "October";
+"lng_month11" = "November";
+"lng_month12" = "December";
+
+"lng_weekday1" = "Mon";
+"lng_weekday2" = "Tue";
+"lng_weekday3" = "Wed";
+"lng_weekday4" = "Thu";
+"lng_weekday5" = "Fri";
+"lng_weekday6" = "Sat";
+"lng_weekday7" = "Sun";
+
+"lng_weekday1_full" = "Monday";
+"lng_weekday2_full" = "Tuesday";
+"lng_weekday3_full" = "Wednesday";
+"lng_weekday4_full" = "Thursday";
+"lng_weekday5_full" = "Friday";
+"lng_weekday6_full" = "Saturday";
+"lng_weekday7_full" = "Sunday";
+
+"lng_month_day" = "{month} {day}";
+
+"lng_cancel" = "Cancel";
+"lng_continue" = "Continue";
+"lng_close" = "Close";
+"lng_connecting" = "Connecting..";
+"lng_reconnecting" = "Reconnect {count:now|in # s|in # s}..";
+"lng_reconnecting_try_now" = "Try now";
+
+"lng_status_service_notifications" = "service notifications";
+"lng_status_offline" = "last seen a long time ago";
+"lng_status_recently" = "last seen recently";
+"lng_status_last_week" = "last seen within a week";
+"lng_status_last_month" = "last seen within a month";
+"lng_status_invisible" = "invisible";
+"lng_status_lastseen_now" = "last seen just now";
+"lng_status_lastseen_minutes" = "last seen {count:_not_used_|# minute|# minutes} ago";
+"lng_status_lastseen_hours" = "last seen {count:_not_used_|# hour|# hours} ago";
+"lng_status_lastseen_today" = "last seen today at {time}";
+"lng_status_lastseen_yesterday" = "last seen yesterday at {time}";
+"lng_status_lastseen_date" = "last seen {date}";
+"lng_status_lastseen_date_time" = "last seen {date} at {time}";
+"lng_status_online" = "online";
+"lng_status_connecting" = "connecting..";
+
+"lng_chat_status_unaccessible" = "group is unaccessible";
+"lng_chat_status_members" = "{count:no members|# member|# members}";
+"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_deleted" = "Unknown";
+
+"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_phone_ph" = "Your phone number";
+"lng_phone_title" = "Your Phone";
+"lng_phone_desc" = "Please confirm your country code and\nenter your phone number.";
+"lng_phone_notreg" = "Note: if you don't have a Telegram account yet,\nplease [b]sign up[/b] with your [a href=\"https://telegram.org/\"]iOS / Android[/a] or {signup_start}here »{signup_end}";
+"lng_country_code" = "Country Code";
+"lng_bad_country_code" = "Invalid Country Code";
+"lng_country_ph" = "Search";
+"lng_country_done" = "Done";
+"lng_country_none" = "Country not found";
+"lng_country_select" = "Select Country";
+
+"lng_code_ph" = "Your code";
+"lng_code_desc" = "We have sent you a message with activation\ncode to your phone. Please enter it below.";
+"lng_code_call" = "Telegram will dial your number in {minutes}:{seconds}";
+"lng_code_calling" = "Requesting a call from Telegram..";
+"lng_code_called" = "Telegram dialed your number";
+
+"lng_bad_phone" = "Invalid phone number. Please try again.";
+"lng_bad_phone_noreg" = "Phone number not registered.";
+"lng_bad_code" = "You have entered an invalid code. Please try again.";
+"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 file?";
+
+"lng_signup_title" = "Information and photo";
+"lng_signup_desc" = "Please enter your name and\nupload a photo.";
+
+"lng_signup_firstname" = "First Name";
+"lng_signup_lastname" = "Last Name";
+
+"lng_dlg_filter" = "Search";
+"lng_dlg_new_group_name" = "Group name";
+"lng_dlg_create_group" = "Create";
+"lng_no_contacts" = "You have no contacts";
+"lng_contacts_loading" = "Loading..";
+"lng_contacts_not_found" = "No contacts found";
+
+"lng_settings_save" = "Save";
+"lng_settings_upload" = "Set Profile Photo";
+"lng_settings_crop_profile" = "Select square area for your profile photo";
+"lng_settings_uploading_photo" = "Uploading photo..";
+
+"lng_username_title" = "Change username";
+"lng_username_about" = "You can choose a username on Telegram.\nIf you do, other people will be able to find\nyou by this username and contact you\nwithout knowing your phone number.\n\nYou can use a-z, 0-9 and underscores.\nMinimum length is 5 characters.";
+"lng_username_invalid" = "This name is invalid.";
+"lng_username_occupied" = "This name is already occupied.";
+"lng_username_too_short" = "This name is too short.";
+"lng_username_bad_symbols" = "This name has bad symbols.";
+"lng_username_available" = "This name is available.";
+"lng_username_not_found" = "User @{user} not found.";
+
+"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_section_notify" = "Notifications";
+"lng_settings_desktop_notify" = "Desktop notifications";
+"lng_settings_show_name" = "Show sender's name";
+"lng_settings_show_preview" = "Show message preview";
+"lng_settings_sound_notify" = "Play sound";
+
+"lng_notification_preview" = "You have a new message";
+
+"lng_settings_section_general" = "General";
+"lng_settings_change_lang" = "Change language";
+"lng_languages" = "Languages";
+"lng_sure_save_language" = "Telegram will restart\nin order to change language";
+"lng_settings_auto_update" = "Update automatically";
+"lng_settings_current_version" = "Version {version}";
+"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_update_ready" = "New version is ready";
+"lng_settings_update_now" = "Restart Now";
+"lng_settings_update_fail" = "Update check failed :(";
+"lng_settings_workmode_tray" = "Show tray icon";
+"lng_settings_workmode_window" = "Show taskbar icon";
+"lng_settings_auto_start" = "Launch Telegram when system starts";
+"lng_settings_start_min" = "Launch minimized";
+"lng_settings_add_sendto" = "Place Telegram in «Send to» menu";
+"lng_settings_scale_label" = "Interface scale";
+"lng_settings_scale_auto" = "Auto ({cur})";
+
+"lng_settings_section_chat" = "Chat options";
+"lng_settings_replace_emojis" = "Replace emojis";
+"lng_settings_view_emojis" = "View list";
+"lng_settings_emoji_list" = "List of supported emojis";
+"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_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:";
+"lng_download_path_temp" = "temp folder";
+"lng_download_path_default" = "default folder";
+"lng_download_path_clear" = "Clear all";
+"lng_download_path_header" = "Choose download path";
+"lng_download_path_default_radio" = "Telegram folder in system «Downloads»";
+"lng_download_path_temp_radio" = "Temp folder, cleared on logout or uninstall";
+"lng_download_path_dir_radio" = "Custom folder, cleared only manually";
+"lng_download_path_choose" = "Choose download path";
+"lng_sure_clear_downloads" = "Do you want to remove all downloaded files from temp folder? It is done automatically on logout or program uninstall.";
+"lng_download_path_failed" = "File download could not be started. It could happen because of a bad download location.\n\nYou can change download path in Settings.";
+"lng_download_path_settings" = "Go to Settings";
+"lng_download_finish_failed" = "File download could not be finished.\n\nWould you like to try again?";
+"lng_download_path_clearing" = "Clearing..";
+"lng_download_path_cleared" = "Cleared!";
+"lng_download_path_clear_failed" = "Clear failed :(";
+
+"lng_settings_section_cache" = "Local storage";
+"lng_settings_no_data_cached" = "No cached data found!";
+"lng_settings_images_cached" = "{count:_not_used_|# image|# images}, {size}";
+"lng_settings_audios_cached" = "{count:_not_used_|# voice message|# voice messages}, {size}";
+"lng_local_storage_clear" = "Clear all";
+"lng_local_storage_clearing" = "Clearing..";
+"lng_local_storage_cleared" = "Cleared!";
+"lng_local_storage_clear_failed" = "Clear failed :(";
+
+"lng_settings_section_advanced" = "Advanced";
+"lng_connection_type" = "Connection type:";
+"lng_connection_auto_connecting" = "Default (connecting..)";
+"lng_connection_auto" = "Default ({type} used)";
+"lng_connection_http_proxy" = "HTTP with proxy";
+"lng_connection_tcp_proxy" = "TCP with proxy";
+"lng_connection_header" = "Connection type";
+"lng_connection_auto_rb" = "Auto (TCP if available or HTTP)";
+"lng_connection_http_proxy_rb" = "HTTP with custom http-proxy";
+"lng_connection_tcp_proxy_rb" = "TCP with custom socks5-proxy";
+"lng_connection_host_ph" = "Hostname";
+"lng_connection_port_ph" = "Port";
+"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_reset_button" = "Terminate";
+"lng_settings_reset_done" = "Other sessions terminated";
+"lng_settings_logout" = "Log Out";
+"lng_sure_logout" = "Are you sure you want to log out?";
+
+"lng_settings_need_restart" = "You need to restart for applying\nsome of the new settings. Restart now?";
+"lng_settings_restart_now" = "Restart";
+"lng_settings_restart_later" = "Later";
+
+"lng_profile_chat_unaccessible" = "Group is unaccessible";
+"lng_topbar_info" = "Info";
+"lng_profile_settings_section" = "Settings";
+"lng_profile_participants_section" = "Participants";
+"lng_profile_info" = "Contact info";
+"lng_profile_group_info" = "Group info";
+"lng_profile_add_contact" = "Add Contact";
+"lng_profile_edit_contact" = "Edit";
+"lng_profile_enable_notifications" = "Notifications";
+"lng_profile_clear_history" = "Clear history";
+"lng_profile_send_message" = "Send Message";
+"lng_profile_share_contact" = "Share Contact";
+"lng_profile_delete_contact" = "Delete";
+"lng_profile_set_group_photo" = "Set Photo";
+"lng_profile_add_participant" = "Add Member";
+"lng_profile_delete_and_exit" = "Leave";
+"lng_profile_kick" = "Kick";
+"lng_profile_sure_kick" = "Kick {user} from the group?";
+"lng_profile_loading" = "Loading..";
+"lng_profile_shared_media" = "Shared media";
+"lng_profile_no_media" = "No media in this conversation.";
+"lng_profile_photos" = "{count:_not_used_|# photo|# photos} »";
+"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_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";
+"lng_profile_copy_phone" = "Copy phone number";
+
+"lng_participant_filter" = "Search";
+"lng_participant_invite" = "Invite";
+"lng_create_new_group" = "New Group";
+"lng_create_group_next" = "Next";
+"lng_create_group_title" = "New Group";
+
+"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_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_forwarded_from" = "Forwarded from";
+
+"lng_attach_failed" = "Failed";
+"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_files" = "Files";
+"lng_media_type_audios" = "Voice messages";
+
+"lng_media_open_with" = "Open With";
+"lng_media_download" = "Download";
+"lng_media_cancel" = "Cancel";
+"lng_media_video" = "Video file";
+"lng_media_audio" = "Voice message";
+
+"lng_in_dlg_photo" = "Photo";
+"lng_in_dlg_video" = "Video";
+"lng_in_dlg_contact" = "Contact";
+"lng_in_dlg_audio" = "Audio";
+"lng_in_dlg_file" = "File";
+"lng_in_dlg_sticker" = "Sticker";
+"lng_in_dlg_sticker_emoji" = "{emoji} (sticker)";
+
+"lng_send_button" = "Send";
+"lng_message_ph" = "Write a message..";
+"lng_empty_history" = "";
+"lng_willbe_history" = "Please select chat to start messaging";
+"lng_message_with_from" = "[c]{from}:[/c] {message}";
+"lng_from_you" = "You";
+
+"lng_typing" = "typing";
+"lng_user_typing" = "{user} is typing";
+"lng_users_typing" = "{user} and {second_user} are typing";
+"lng_many_typing" = "{count:_not_used_|# is|# are} typing";
+"lng_unread_bar" = "{count:_not_used_|# unread message|# unread messages}";
+
+"lng_maps_point" = "Location";
+"lng_save_photo" = "Save image";
+"lng_save_video" = "Save video";
+"lng_save_audio" = "Save audio";
+"lng_save_file" = "Save file";
+"lng_save_downloaded" = "{ready} / {total} {mb}";
+"lng_duration_and_size" = "{duration}, {size}";
+"lng_choose_images" = "Choose images";
+
+"lng_context_open_link" = "Open Link";
+"lng_context_copy_link" = "Copy Link";
+"lng_context_open_email" = "Write to this address";
+"lng_context_copy_email" = "Copy email address";
+"lng_context_open_hashtag" = "Search by hashtag";
+"lng_context_copy_hashtag" = "Copy hashtag";
+"lng_context_open_image" = "Open Image";
+"lng_context_save_image" = "Save Image As..";
+"lng_context_forward_image" = "Forward Image";
+"lng_context_delete_image" = "Delete Image";
+"lng_context_copy_image" = "Copy Image";
+"lng_context_close_image" = "Close Image";
+"lng_context_cancel_download" = "Cancel Download";
+"lng_context_show_in_folder" = "Show in Folder";
+"lng_context_show_in_finder" = "Show in Finder";
+"lng_context_open_video" = "Open Video";
+"lng_context_save_video" = "Save Video As..";
+"lng_context_open_audio" = "Open Audio";
+"lng_context_save_audio" = "Save Audio 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_to_msg" = "Go To Message";
+"lng_context_forward_msg" = "Forward Message";
+"lng_context_delete_msg" = "Delete Message";
+"lng_context_select_msg" = "Select Message";
+"lng_context_cancel_upload" = "Cancel Upload";
+"lng_context_copy_selected" = "Copy Selected Text";
+"lng_context_forward_selected" = "Forward Selected";
+"lng_context_delete_selected" = "Delete Selected";
+"lng_context_clear_selection" = "Clear Selection";
+"lng_really_send_image" = "Do you want to send this image?";
+"lng_really_send_file" = "Do you want to send this file?";
+"lng_really_share_contact" = "Do you want to share this contact?";
+"lng_send_image_compressed" = "Send compressed image";
+
+"lng_forward_choose" = "Choose recipient..";
+"lng_forward_confirm" = "Forward to {recipient}?";
+"lng_forward_share_contact" = "Share contact to {recipient}?";
+"lng_forward_send_file_confirm" = "Send «{name}» to {recipient}?";
+"lng_forward_send_files_confirm" = "Send selected files to {recipient}?";
+"lng_forward" = "Forward";
+"lng_forward_send" = "Send";
+
+"lng_contact_phone" = "Phone number";
+"lng_enter_contact_data" = "New Contact";
+"lng_edit_group_title" = "Edit group name";
+"lng_edit_contact_title" = "Edit contact name";
+"lng_edit_self_title" = "Edit your name";
+"lng_confirm_contact_data" = "New Contact";
+"lng_add_contact" = "Create";
+"lng_add_contact_button" = "Add Contact";
+"lng_contacts_header" = "Contacts";
+"lng_contact_not_joined" = "Unfortunately {name} did not join Telegram yet, but you can send your friend an invitation.\n\nWe will notify you about any of your contacts who is joining Telegram.";
+"lng_try_other_contact" = "Try other";
+"lng_contacts_done" = "Cancel";
+
+"lng_drag_images_here" = "Drop images here";
+"lng_drag_photos_here" = "Drop photos here";
+"lng_drag_files_here" = "Drop files here";
+
+"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_files" = "to send them as files";
+
+"lng_selected_clear" = "Cancel";
+"lng_selected_delete" = "Delete";
+"lng_selected_forward" = "Forward";
+"lng_selected_count" = "{count:_not_used_|# message|# messages}";
+"lng_selected_cancel_sure_this" = "Do you want to cancel this upload?";
+"lng_selected_delete_sure_this" = "Do you want to delete this message?";
+"lng_selected_delete_sure" = "Do you want to delete {count:_not_used_|# message|# messages}?";
+"lng_selected_delete_confirm" = "Delete";
+
+"lng_about_version" = "Version {version}";
+"lng_about_text" = "Official free messaging app based on [a href=\"https://core.telegram.org/mtproto\"]MTProto[/a] and\n[a href=\"https://core.telegram.org/api\"]Telegram API[/a] for speed and security\n\nThis software is licensed under [a href=\"https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE\"]GNU GPL[/a] version 3,\nsource code is available on [a href=\"https://github.com/telegramdesktop/tdesktop\"]GitHub[/a].";
+"lng_about_done" = "Done";
+
+"lng_search_found_results" = "{count:No messages found|Found # message|Found # messages}";
+"lng_search_global_results" = "Global search results";
+
+"lng_mediaview_save" = "Download";
+"lng_mediaview_forward" = "Forward";
+"lng_mediaview_delete" = "Delete";
+"lng_mediaview_single_photo" = "Single Photo";
+"lng_mediaview_group_photo" = "Group Photo";
+"lng_mediaview_profile_photo" = "Profile Photo";
+"lng_mediaview_n_of_count" = "Photo {n} of {count}";
+"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_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_version7016" = "— Some translations improvements\n— Linux: tray icon should work better in non-Unity environments";
+"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_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:";
+"lng_mac_recommended_apps" = "Recommended Applications";
+"lng_mac_all_apps" = "All Applications";
+"lng_mac_always_open_with" = "Always Open With";
+"lng_mac_this_app_can_open" = "This application can open \"{file}\".";
+"lng_mac_not_known_app" = "It's not known if this application can open \"{file}\".";
+
+"lng_mac_menu_services" = "Services";
+"lng_mac_menu_hide_telegram" = "Hide {telegram}";
+"lng_mac_menu_hide_others" = "Hide Others";
+"lng_mac_menu_show_all" = "Show All";
+"lng_mac_menu_preferences" = "Preferences...";
+"lng_mac_menu_quit_telegram" = "Quit {telegram}";
+"lng_mac_menu_about_telegram" = "About {telegram}";
+"lng_mac_menu_file" = "File";
+"lng_mac_menu_logout" = "Log Out";
+"lng_mac_menu_edit" = "Edit";
+"lng_mac_menu_undo" = "Undo";
+"lng_mac_menu_redo" = "Redo";
+"lng_mac_menu_cut" = "Cut";
+"lng_mac_menu_copy" = "Copy";
+"lng_mac_menu_paste" = "Paste";
+"lng_mac_menu_delete" = "Delete";
+"lng_mac_menu_select_all" = "Select All";
+"lng_mac_menu_window" = "Window";
+"lng_mac_menu_contacts" = "Contacts";
+"lng_mac_menu_add_contact" = "Add Contact";
+"lng_mac_menu_new_group" = "New Group";
+"lng_mac_menu_show" = "Show Telegram";
+
+// Keys finished

Telegram/Resources/lang.txt

@@ -1,477 +0,0 @@
-/*
-This file is part of Telegram Desktop,
-an unofficial desktop 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://tdesktop.com
-*/
-direction: "LTR";
-
-lng_maintitle: "Telegram D";
-
-lng_menu_contacts: "Contacts";
-lng_menu_settings: "Settings";
-lng_menu_about: "About";
-
-lng_open_from_tray: "Open Telegram";
-lng_minimize_to_tray: "Minimize to tray";
-lng_quit_from_tray: "Quit Telegram";
-lng_tray_icon_text: "Telegram is still running here,
-you can change this from settings page.
-
-If this icon disappears from tray menu,
-you can drag it back here from hidden icons.";
-
-lng_month1: "January";
-lng_month2: "February";
-lng_month3: "March";
-lng_month4: "April";
-lng_month5: "May";
-lng_month6: "June";
-lng_month7: "July";
-lng_month8: "August";
-lng_month9: "September";
-lng_month10: "October";
-lng_month11: "November";
-lng_month12: "December";
-
-lng_weekday1: "Mon";
-lng_weekday2: "Tue";
-lng_weekday3: "Wed";
-lng_weekday4: "Thu";
-lng_weekday5: "Fri";
-lng_weekday6: "Sat";
-lng_weekday7: "Sun";
-
-lng_month_day: "{month} {day}";
-
-lng_cancel: "Cancel";
-lng_continue: "Continue";
-lng_connecting: "Connecting..";
-lng_reconnecting: "Reconnect in %1 s..";
-lng_reconnecting_try_now: "Try now";
-
-lng_status_offline: "offline";
-lng_status_invisible: "invisible";
-lng_status_lastseen: "last seen {when}";
-lng_status_lastseen_now: "just now";
-lng_status_lastseen_minute: "%1 minute ago";
-lng_status_lastseen_minutes: "%1 minutes ago";
-lng_status_lastseen_hour: "%1 hour ago";
-lng_status_lastseen_hours: "%1 hours ago";
-lng_status_lastseen_today: "today at {time}";
-lng_status_lastseen_yesterday: "yesterday at {time}";
-lng_status_lastseen_date: "{date}";
-lng_status_lastseen_date_time: "{date} at {time}";
-lng_status_online: "online";
-lng_status_connecting: "connecting..";
-
-lng_chat_no_members: "Group is unaccessible";
-lng_chat_members: "%1 members";
-lng_chat_members_online: "%1 members, %2 online";
-
-lng_server_error: "Internal server error.";
-lng_flood_error: "Too much tries. Please try again later.";
-lng_deleted: "Unknown";
-
-lng_intro1: "Welcome to an unofficial [b]desktop[/b] client
-of [b]Telegram[/b] mobile messenger.";
-lng_intro2: "Visit [a href=\"https://telegram.org/\"]telegram.org[/a] to learn more.";
-lng_start_msgs: "Start Messaging";
-
-lng_intro_back: "Back";
-lng_intro_next: "Next";
-lng_intro_finish: "Finish";
-
-lng_phone_ph: "Your phone number";
-lng_phone_title: "Your Phone";
-lng_phone_desc: "Please confirm your country code and
-enter your phone number.";
-lng_phone_notreg: "Note: if you don't have a Telegram account yet,
-please [b]sign up[/b] with your [a href=\"https://telegram.org/\"]iOS / Android[/a] or {signup}here »{/signup}";
-lng_country_code: "Country Code";
-lng_bad_country_code: "Invalid Country Code";
-lng_country_ph: "Search";
-lng_country_done: "Done";
-lng_country_none: "Country not found";
-lng_country_select: "Select Country";
-
-lng_code_ph: "Your code";
-lng_code_desc: "We have sent you an SMS with activation
-code to your phone. Please enter it below.";
-lng_code_call: "Telegram will dial your number in %1:%2";
-lng_code_calling: "Requesting a call from Telegram..";
-lng_code_called: "Telegram dialed your number";
-
-lng_bad_phone: "Invalid phone number. Please try again.";
-lng_bad_phone_noreg: "Phone number not registered.";
-lng_bad_code: "You have entered an invalid code. Please try again.";
-lng_bad_name: "Please enter your first and last name.";
-lng_bad_chat_title: "Please enter new chat title.";
-lng_bad_photo: "Bad image selected.";
-
-lng_signup_title: "Information and photo";
-lng_signup_firstname: "First Name";
-lng_signup_lastname: "Last Name";
-
-lng_dlg_filter: "Search";
-lng_dlg_conversations: "Conversations";
-lng_dlg_messages: "Messages";
-lng_dlg_new_group_name: "Group name";
-lng_dlg_create_group: "Create";
-
-lng_settings_profile: "Profile";
-lng_settings_edit: "Edit";
-lng_settings_save: "Save";
-lng_settings_cancel: "Cancel";
-lng_settings_upload: "Set Profile Photo";
-lng_settings_badsize: "This image has bad size, please try other.";
-lng_settings_crop_profile: "Select square area for your profile photo";
-lng_settings_uploading_photo: "Uploading photo..";
-
-lng_username_title: "Change username";
-lng_username_about: "You can choose a username on Telegram.
-If you do, other people will be able to find
-you by this username and contact you
-without knowing your phone number.
-
-You can use a-z, 0-9 and underscores.
-Minimum length is 5 characters.";
-lng_username_invalid: "This name is invalid.";
-lng_username_occupied: "This name is already occupied.";
-lng_username_too_short: "This name is too short.";
-
-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_section_notify: "Notifications";
-lng_settings_desktop_notify: "Desktop notifications";
-lng_settings_show_name: "Show sender's name";
-lng_settings_show_preview: "Show message preview";
-lng_settings_sound_notify: "Play sound";
-
-lng_notification_title: "Telegram Desktop";
-lng_notification_preview: "You have a new message";
-
-lng_settings_section_general: "General";
-lng_settings_auto_update: "Update automatically";
-lng_settings_current_version: "Version {version}";
-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_update_ready: "New version is ready";
-lng_settings_update_now: "Restart Now";
-lng_settings_update_fail: "Update check failed :(";
-lng_settings_workmode_tray: "Show tray icon";
-lng_settings_workmode_window: "Show taskbar icon";
-lng_settings_auto_start: "Launch Telegram when system starts";
-lng_settings_start_min: "Launch minimized";
-lng_settings_add_sendto: "Place Telegram in «Send to» menu";
-lng_settings_scale_label: "Interface scale";
-lng_settings_scale_auto: "Auto ({cur})";
-
-lng_settings_section_chat: "Chat options";
-lng_settings_replace_emojis: "Replace emojis";
-lng_settings_view_emojis: "View list";
-lng_settings_emoji_list: "List of supported emojis";
-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_download_path_dont_ask: "Don't ask download path for each file";
-lng_download_path_label: "Download path: ";
-lng_download_path_temp: "temp folder";
-lng_download_path_default: "default folder";
-lng_download_path_clear: "Clear All";
-lng_download_path_header: "Choose download path";
-lng_download_path_default_radio: "Telegram folder in system «Downloads»";
-lng_download_path_temp_radio: "Temp folder, cleared on logout or uninstall";
-lng_download_path_dir_radio: "Custom folder, cleared only manually";
-lng_download_path_choose: "Choose download path";
-lng_sure_clear_downloads: "Do you want to remove all downloaded files from temp folder? It is done automatically on logout or program uninstall.";
-lng_download_path_failed: "File download could not be started. It could happen because of a bad download location.
-
-You can change download path in Settings.";
-lng_download_path_settings: "Go to Settings";
-lng_download_finish_failed: "File download could not be finished.
-
-Would you like to try again?";
-lng_download_path_clearing: "Clearing..";
-lng_download_path_cleared: "Cleared!";
-lng_download_path_clear_failed: "Clear failed :(";
-
-lng_settings_section_advanced: "Advanced";
-lng_connection_type: "Connection type:";
-lng_connection_auto_connecting: "Default (connecting..)";
-lng_connection_auto: "Default ({type} used)";
-lng_connection_http_proxy: "HTTP with proxy";
-lng_connection_tcp_proxy: "TCP with proxy";
-lng_connection_header: "Connection type";
-lng_connection_auto_rb: "Auto (TCP if available or HTTP)";
-lng_connection_http_proxy_rb: "HTTP with custom http-proxy";
-lng_connection_tcp_proxy_rb: "TCP with custom socks5-proxy";
-lng_connection_host_ph: "Hostname";
-lng_connection_port_ph: "Port";
-lng_connection_user_ph: "Username";
-lng_connection_password_ph: "Password";
-lng_connection_save: "Save";
-lng_settings_reset: "Reset other sessions";
-lng_settings_reset_done: "Sessions reset done";
-lng_settings_logout: "Log Out";
-
-lng_settings_need_restart: "You need to restart for applying
-some of the new settings. Restart now?";
-lng_settings_restart_now: "Restart";
-lng_settings_restart_later: "Later";
-
-lng_profile_settings_section: "Settings";
-lng_profile_participants_section: "Participants";
-lng_profile_info: "Contact info";
-lng_profile_group_info: "Group info";
-lng_profile_add_contact: "Add Contact";
-lng_profile_edit_contact: "Edit";
-lng_profile_edit_group: "Edit";
-lng_profile_phone: "Phone number: {phone}";
-lng_profile_enable_notifications: "Notifications";
-lng_profile_clear_history: "Clear history";
-lng_profile_send_message: "Send Message";
-lng_profile_share_contact: "Share Contact";
-lng_profile_delete_contact: "Delete";
-lng_profile_set_group_photo: "Set Photo";
-lng_profile_add_participant: "Add Member";
-lng_profile_delete_and_exit: "Leave";
-lng_profile_kick: "Kick";
-lng_profile_sure_kick: "Kick {user} from the group?";
-lng_profile_loading: "Loading..";
-lng_profile_shared_media: "Shared media";
-lng_profile_no_media: "No media in this conversation.";
-lng_profile_photo: "{count} photo »";
-lng_profile_photos: "{count} photos »";
-lng_profile_photos_header: "Photos overview";
-lng_profile_video: "{count} video file »";
-lng_profile_videos: "{count} video files »";
-lng_profile_videos_header: "Video files overview";
-lng_profile_document: "{count} document »";
-lng_profile_documents: "{count} documents »";
-lng_profile_documents_header: "Documents overview";
-lng_profile_audio: "{count} voice message »";
-lng_profile_audios: "{count} voice messages »";
-lng_profile_audios_header: "Voice messages overview";
-lng_profile_show_all_types: "Show all types";
-lng_profile_copy_phone: "Copy phone number";
-
-lng_participant_filter: "Search";
-lng_participant_invite: "Invite";
-lng_create_new_group: "New Group";
-lng_create_group_next: "Next";
-lng_create_group_title: "New Group";
-
-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}?
-
-This action cannot be undone.";
-
-lng_sure_delete_and_exit: "Are you sure, you want to delete all message history and leave «{group}»?
-
-This action cannot be undone.";
-
-lng_sure_enable_debug: "Do you want to enable DEBUG mode?
-
-All 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_photo: "{from} added a new profile photo";
-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_action_checked_in: "{from} checked in";
-
-lng_forwarded_from: "Forwarded from ";
-
-lng_attach_failed: "Failed";
-lng_attach_file: "Document";
-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_audios: "Voice messages";
-
-lng_media_open_with: "Open With";
-lng_media_download: "Download";
-lng_media_cancel: "Cancel";
-lng_media_video: "Video file";
-lng_media_audio: "Voice message";
-
-lng_in_dlg_photo: "Photo";
-lng_in_dlg_video: "Video";
-lng_in_dlg_geo: "Map";
-lng_in_dlg_contact: "Contact";
-lng_in_dlg_audio: "Audio";
-lng_in_dlg_document: "Document";
-
-lng_send_button: "Send";
-lng_message_ph: "Write a message..";
-lng_empty_history: "";
-lng_willbe_history: "Please select chat to start messaging";
-lng_message_with_from: "[c]{from}:[/c] {message}";
-lng_from_you: "You";
-
-lng_typing: "typing";
-lng_user_typing: "{user} is typing";
-lng_users_typing: "{user1} and {user2} are typing";
-lng_many_typing: "{n} are typing";
-lng_unread_bar: "%1 unread messages";
-
-lng_maps_point: "Location";
-lng_save_photo: "Save image";
-lng_save_video: "Save video";
-lng_save_audio: "Save audio";
-lng_save_document: "Save document";
-lng_save_downloaded: "{ready} / {total} {mb}";
-lng_duration_and_size: "{duration}, {size}";
-lng_choose_images: "Choose images";
-
-lng_context_open_link: "Open Link";
-lng_context_copy_link: "Copy Link";
-lng_context_open_email: "Write to this address";
-lng_context_copy_email: "Copy email address";
-lng_context_open_hashtag: "Search by hashtag";
-lng_context_copy_hashtag: "Copy hashtag";
-lng_context_open_image: "Open Image";
-lng_context_save_image: "Save Image As..";
-lng_context_forward_image: "Forward Image";
-lng_context_delete_image: "Delete Image";
-lng_context_copy_image: "Copy Image";
-lng_context_close_image: "Close Image";
-lng_context_cancel_download: "Cancel Download";
-lng_context_show_in_folder: "Show in Folder";
-lng_context_show_in_finder: "Show in Finder";
-lng_context_open_video: "Open Video";
-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_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_to_msg: "Go To Message";
-lng_context_forward_msg: "Forward Message";
-lng_context_delete_msg: "Delete Message";
-lng_context_select_msg: "Select Message";
-lng_context_cancel_upload: "Cancel Upload";
-lng_context_copy_selected: "Copy Selected Text";
-lng_context_forward_selected: "Forward Selected";
-lng_context_delete_selected: "Delete Selected";
-lng_context_clear_selection: "Clear Selection";
-lng_really_send_image: "Do you want to send this image?";
-lng_really_send_file: "Do you want to send this file?";
-lng_really_share_contact: "Do you want to share this contact?";
-lng_send_image_compressed: "Send compressed image";
-
-lng_forward_choose: "Choose recipient..";
-lng_forward_confirm: "Forward to {recipient}?";
-lng_forward_share_contact: "Share contact to {recipient}?";
-lng_forward_send_file_confirm: "Send «{name}» to {recipient}?";
-lng_forward_send_files_confirm: "Send selected files to {recipient}?";
-lng_forward: "Forward";
-lng_forward_send: "Send";
-
-lng_contact_phone: "Phone number";
-lng_enter_contact_data: "New Contact";
-lng_edit_group_title: "Edit group name";
-lng_edit_contact_title: "Edit contact name";
-lng_edit_self_title: "Edit your name";
-lng_confirm_contact_data: "New Contact";
-lng_add_contact: "Create";
-lng_add_contact_button: "Add Contact";
-lng_contacts_header: "Contacts";
-lng_contact_not_joined: "Unfortunately {name} did not join Telegram yet, but you can send your friend an invitation.
-
-We will notify you about any of your contacts who is joining Telegram.";
-lng_try_other_contact: "Try other";
-lng_contacts_done: "Cancel";
-
-lng_drag_images_here: "Drop images here";
-lng_drag_photos_here: "Drop photos here";
-lng_drag_files_here: "Drop files here";
-
-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_selected_clear: "Cancel";
-lng_selected_delete: "Delete";
-lng_selected_forward: "Forward";
-lng_selected_count_1: "%1 message";
-lng_selected_count_5: "%1 messages";
-lng_selected_cancel_sure_this: "Do you want to cancel this upload?";
-lng_selected_delete_sure_this: "Do you want to delete this message?";
-lng_selected_delete_sure_1: "Do you want to delete %1 message?";
-lng_selected_delete_sure_5: "Do you want to delete %1 messages?";
-lng_selected_delete_confirm: "Delete";
-
-lng_emoji_no_recent: "Recent emojis will be here";
-
-lng_about_version: "Version {version}";
-lng_about_text: "Unofficial free messaging app based on [a href=\"https://core.telegram.org/mtproto\"]MTProto[/a] and
-[a href=\"https://core.telegram.org/api\"]Telegram API[/a] for speed and security
-
-This software is licensed under [a href=\"https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE\"]GNU GPL[/a] version 3,
-source code is available on [a href=\"https://github.com/telegramdesktop/tdesktop\"]GitHub[/a].";
-lng_about_done: "Done";
-
-lng_search_no_results: "No messages found";
-lng_search_one_result: "Found {count} message";
-lng_search_n_results: "Found {count} messages";
-lng_search_global_results: "Global search results";
-
-lng_mediaview_save: "Download";
-lng_mediaview_forward: "Forward";
-lng_mediaview_delete: "Delete";
-lng_mediaview_single_photo: "Single Photo";
-lng_mediaview_group_photo: "Group Photo";
-lng_mediaview_profile_photo: "Profile Photo";
-lng_mediaview_n_of_count: "Photo {n} of {count}";
-lng_mediaview_doc_image: "Document";
-
-lng_mediaview_saved: "Image was saved to your [c]Downloads[/c] folder";
-
-// Mac specific
-
-lng_mac_choose_app: "Choose Application";
-lng_mac_choose_text: "Choose an application to open the document \"{file}\".";
-lng_mac_enable_filter: "Enable:";
-lng_mac_recommended_apps: "Recommended Applications";
-lng_mac_all_apps: "All Applications";
-lng_mac_always_open_with: "Always Open With";
-lng_mac_this_app_can_open: "This application can open \"{file}\".";
-lng_mac_not_known_app: "It's not known if this application can open \"{file}\".";
-
-// Keys finished
-

Telegram/Resources/style.txt

@@ -1,6 +1,6 @@
 /*
 This file is part of Telegram Desktop,
-an unofficial desktop messaging app, see https://telegram.org
+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
@@ -13,7 +13,7 @@ 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://tdesktop.com
+Copyright (c) 2014 John Preston, https://desktop.telegram.org
 */
 defaultFontFamily: 'Open Sans';
 semibold: 'Open Sans Semibold';
@@ -29,7 +29,7 @@ emojiPadding: 0px;
 counterBG: #f23c34;
 counterMuteBG: #888;
 counterColor: #fff;
-counterMacInvColor: #045fd5;
+counterMacInvColor: #ffffff01;
 
 lineWidth: 1px;
 
@@ -46,7 +46,8 @@ color6: #cd4073; // pink
 color7: #2996ad; // sea
 color8: #ce671b; // orange
 
-wndMinWidth: 640px;
+wndMinWidth: 380px;
+wideModeWidth: 640px;
 wndMinHeight: 480px;
 wndDefWidth: 800px;
 wndDefHeight: 600px;
@@ -63,7 +64,7 @@ titleHeight: 39px;
 titleShadowColor: rgba(0, 0, 0, 24);//#ebebeb
 titleShadow: 1px;
 titleIconPos: point(7px, 7px);
-titleIconRect: sprite(160px, 100px, 26px, 26px);
+titleIconImg: sprite(160px, 100px, 26px, 26px);
 titleFont: font(17px);
 titlePos: point(44px, 29px);
 titleMenuOffset: 36px;
@@ -78,34 +79,6 @@ titleTypingColor: #0080c0;
 statusFont: font(fsize);
 versionColor: #777;
 
-sysBtnDelta: 6px;
-sysUpd: sysButton {
-	size: size(31px, 39px);
-	img: sprite(184px, 1px, 19px, 19px);
-	color: #c4d8e9;
-	overColor: white;
-	duration: 150;
-}
-sysMin: sysButton(sysUpd) {
-	img: sprite(207px, 1px, 19px, 19px);
-}
-sysMax: sysButton(sysUpd) {
-	img: sprite(230px, 1px, 19px, 19px);
-}
-sysRes: sysButton(sysUpd) {
-	img: sprite(253px, 1px, 19px, 19px);
-}
-sysCls: sysButton(sysUpd) {
-	img: sprite(276px, 1px, 19px, 19px);
-}
-
-btnWhiteHover: #f5f5f5;
-btnBoxWhiteHover: #fafafa;
-btnYesColor: #0080c0;
-btnYesHover: #0073ad;
-btnNoColor: #8b8b8b;
-btnNoHover: #777;
-
 btnDefIconed: iconedButton {
 	color: white;
 	bgColor: white;
@@ -122,6 +95,53 @@ btnDefIconed: iconedButton {
 	cursor: cursor(pointer);
 }
 
+sysBtnDelta: 6px;
+sysUpd: sysButton {
+	size: size(31px, 39px);
+	img: sprite(184px, 1px, 19px, 19px);
+	color: #c4d8e9;
+	overColor: white;
+	duration: 150;
+}
+updateBlinkDuration: 500;
+sysMin: sysButton(sysUpd) {
+	img: sprite(207px, 1px, 19px, 19px);
+}
+sysMax: sysButton(sysUpd) {
+	img: sprite(230px, 1px, 19px, 19px);
+}
+sysRes: sysButton(sysUpd) {
+	img: sprite(253px, 1px, 19px, 19px);
+}
+sysCls: sysButton(sysUpd) {
+	img: sprite(276px, 1px, 19px, 19px);
+}
+titleBackButton: iconedButton(btnDefIconed) {
+	icon: sprite(133px, 197px, 13px, 20px);
+	iconPos: point(5px, 9px);
+	downIcon: sprite(133px, 197px, 13px, 20px);
+	downIconPos: point(5px, 10px);
+
+	bgColor: #c4d8e9;
+	overBgColor: #fff;
+
+	width: -30px;
+	height: 39px;
+
+	opacity: 1;
+	cursor: cursor(default);
+
+	textPos: point(23px, 10px);
+	downTextPos: point(23px, 11px);
+}
+
+btnWhiteHover: #f5f5f5;
+btnBoxWhiteHover: #fafafa;
+btnYesColor: #0080c0;
+btnYesHover: #0073ad;
+btnNoColor: #8b8b8b;
+btnNoHover: #777;
+
 titleTextButton: flatButton {
 	color: #d4e3ef;
 	overColor: #fff;
@@ -137,8 +157,8 @@ titleTextButton: flatButton {
 	overTextTop: 10px;
 	downTextTop: 11px;
 
-	font: font(13px);
-	overFont: font(13px);
+	font: font(fsize);
+	overFont: font(fsize);
 	duration: 150;
 	cursor: cursor(default);
 }
@@ -174,6 +194,7 @@ btnDefBack: flatButton(btnDefFlat) {
 	downBgColor: #b9b9b9;
 }
 
+linkCropLimit: 360px;
 linkFont: font(fsize);
 linkOverFont: font(fsize underline);
 btnDefLink: linkButton {
@@ -201,7 +222,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);
@@ -305,20 +326,18 @@ labelDefFlat: flatLabel {
 	align: align(left);
 }
 
-introSkip: 20px;
+introBtnTop: 288px;
+introSkip: 45px;
 introFinishSkip: 15px;
-introHeaderFont: font(28px);
+introPhotoSize: 98px;
+introHeaderFont: font(24px);
 introHeaderSkip: 14px;
-introFont: font(17px);
-introVersionFont: introFont;
-introVersionColor: #9b9b9b;
-introVersionSkip: 10px;
-intro2Skip: 60px;
-intro1Skip: 14px;
+introIconSkip: 54px;
+introFont: font(16px);
 introColor: black;
-
 introLabel: flatLabel(labelDefFlat) {
 	font: introFont;
+	align: align(center);
 }
 
 introPointsTop: -30px; // intro steps bottom points
@@ -331,8 +350,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);
@@ -349,31 +367,28 @@ introHideFunc: transition(easeInCirc);
 introShowFunc: transition(easeOutCirc);
 introAlphaHideFunc: transition(easeOutCirc);
 introAlphaShowFunc: transition(easeInCirc);
-introTextSize: size(400px, 97px);
-
-introTitleFont: font(24px);
-introDescFont: font(18px);
+introTextTop: 22px;
+introTextSize: size(400px, 93px);
+introCallSkip: 15px;
 
 btnIntroSep: 12px;
 btnIntroNext: flatButton(btnDefNext, btnDefBig) {
-	width: 144px;
-}
-btnIntroBack: flatButton(btnIntroNext, btnDefBack) {
-}
+	textTop: 16px;
+	overTextTop: 16px;
+	downTextTop: 17px;
+
+	font: font(17px);
+	overFont: font(17px);
 
-btnIntroStart: flatButton(btnIntroNext) {
 	width: 300px;
 }
-btnIntroFinish: flatButton(btnIntroNext) {
-	width: 240px;
-}
 
 boxShadow: sprite(240px, 21px, 9px, 9px);
 
 introCountry: countryInput {
 	width: 300px;
 	height: 41px;
-	top: 24px;
+	top: 33px;
 	bgColor: #f2f2f2;
 	ptrSize: size(15px, 8px);
 	textMrg: margins(16px, 5px, 16px, 15px);
@@ -396,13 +411,14 @@ inpIntroCode: flatInput(inpDefGray) {
 	textMrg: margins(12px, 5px, 12px, 6px);
 	width: 106px;
 	height: 41px;
+	align: align(center);
 
 	phPos: point(0px, 0px);
 	phAlign: align(center);
 	phShift: 0px;
 }
 inpIntroName: flatInput(inpIntroPhone) {
-	width: 240px;
+	width: 192px;
 }
 
 introSelectDelta: 30px;
@@ -464,8 +480,6 @@ countriesBackShowFunc: transition(linear);
 countriesAlphaHideFunc: transition(easeOutCirc);
 countriesAlphaShowFunc: transition(easeInCirc);
 
-introBtnTop: 244px;
-
 introErrWidth: 450px;
 introErrDuration: 200;
 introErrFunc: transition(linear);
@@ -477,24 +491,26 @@ introErrFont: font(16px);
 
 introErrLabel: flatLabel(labelDefFlat) {
 	font: introErrFont;
+	align: align(center);
 }
 
 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;
@@ -505,15 +521,17 @@ setScroll: flatScroll(scrollDef) {
 	topsh: 0px;
 }
 setClose: iconedButton(btnDefIconed) {
-	icon: sprite(245px, 221px, 43px, 43px);
+	icon: sprite(245px, 221px, 40px, 40px);
 	iconPos: point(0px, 0px);
-	downIcon: sprite(245px, 221px, 43px, 43px);
+	downIcon: sprite(245px, 221px, 40px, 40px);
 	downIconPos: point(0px, 0px);
 
+	opacity: 0.71;
+
 	width: 43px;
 	height: 43px;
 }
-setClosePos: point(18px, 18px);
+setClosePos: point(32px, 32px);
 setPhotoImg: sprite(0px, 220px, 120px, 120px);
 setOverPhotoImg: sprite(122px, 220px, 120px, 120px);
 setPhotoDuration: 150;
@@ -534,6 +552,9 @@ setErrBG: #ffa5a5;
 setErrColor: #800000;
 setErrHeight: 30px;
 setErrFont: font(fsize);
+setGoodColor: #008000;
+
+setBackgroundSize: 120px;
 
 btnSetUpload: flatButton(btnDefNext, btnDefBig) {
 	width: 206px;
@@ -597,22 +618,9 @@ dlgPaddingVer: 8px;
 dlgHeight: 62px;
 dlgPhotoPadding: 12px;
 
-dlgState: switcher {
-	border: 2px;
-	borderColor: btnNextBG;
-
-	bgColor: #fff;
-	bgHovered: btnWhiteHover;
-	bgActive: btnNextBG;
-
-	height: 34px;
-
-	font: font(fsize);
-	textColor: btnYesColor;
-	activeColor: #fff;
-
-	duration: 200;
-}
+noContactsHeight: 100px;
+noContactsFont: font(fsize);
+noContactsColor: #777;
 
 dlgSep: 8px;
 
@@ -628,7 +636,7 @@ dlgFilter: flatInput(inpDefGray) {
 	bgColor: #f2f2f2;
 	phColor: #949494;
 	phFocusColor: #a4a4a4;
-	textMrg: margins(34px, 2px, 5px, 4px);
+	textMrg: margins(34px, 2px, 34px, 4px);
 	imgRect: sprite(208px, 28px, 24px, 24px);
 	imgPos: point(6px, 5px);
 	width: 240px;
@@ -689,14 +697,16 @@ dlgActiveDateColor: #d3e2ee;
 topBarHeight: 54px;
 topBarBG: white;
 topBarDuration: 200;
-topBarForwardPadding: margins(17px, 8px, 40px, 8px);
+topBarForwardPadding: margins(17px, 8px, 39px, 8px);
 topBarForwardAlpha: 0.6;
 topBarForwardImg: sprite(45px, 112px, 9px, 16px);
+topBarBackwardImg: sprite(35px, 112px, 9px, 16px);
 topBarBackPadding: margins(15px, 7px, 9px, 7px);
 topBarBackAlpha: 0.8;
 topBarBackImg: sprite(65px, 112px, 9px, 16px);
 topBarBackColor: #005faf;
 topBarBackFont: font(16px);
+topBarMinPadding: 5px;
 topBarButton: flatButton(btnDefFlat) {
 	color: btnYesColor;
 	overColor: btnYesHover;
@@ -727,9 +737,6 @@ topBarActionButton: flatButton(btnDefNext, btnDefBig) {
 	height: 34px;
 }
 topBarActionSkip: 13px;
-topBarSelectedPos: point(18px, 18px); 
-
-historyBG: #dfe4e8;
 
 historyToEnd: iconedButton(btnDefIconed) {
 	bgColor: transparent;
@@ -768,6 +775,7 @@ msgOutSelectBG: #b7dbdb;
 msgInSelectBG: #c2dcf2; // #358cd4 with 30% opacity
 msgOutSelectOverlay: #358cd44c;
 msgInSelectOverlay: #358cd44c;
+msgStickerOverlay: #358cd47f;
 msgOutServiceColor: #3a8e26;
 msgInServiceColor: #0e7acd;
 msgShadow: 2px;
@@ -855,6 +863,12 @@ dlgActiveTextStyle: textStyle(defaultTextStyle) {
 	lnkDownColor: dlgActiveColor;
 	lnkOverFlags: font(fsize);
 }
+introLabelTextStyle: textStyle(defaultTextStyle) {
+	lineHeight: 30px;
+}
+introErrLabelTextStyle: textStyle(defaultTextStyle) {
+	lineHeight: 27px;
+}
 
 mediaMaxWidth: 250px;
 mediaFont: font(fsize);
@@ -960,7 +974,6 @@ taMsgField: flatTextarea(taDefFlat) {
 	font: msgFont;
 }
 maxFieldHeight: 250px;
-minFieldHeight: 28px;
 
 newMsgSound: ':/gui/art/newmsg.wav';
 
@@ -1025,6 +1038,7 @@ notifyBorder: #f1f1f1;
 notifyBorderWidth: 1px;
 notifySlowHide: 4000;
 notifyPhotoSize: 62px;
+notifyMacPhotoSize: 64px;
 notifyPhotoPos: point(9px, 9px);
 notifyClosePos: point(1px, 2px);
 notifyClose: iconedButton(btnDefIconed) {
@@ -1280,6 +1294,9 @@ aboutCloseButton: flatButton(contactsClose) {
 	overTextTop: 15px;
 	downTextTop: 16px;
 }
+btnInfoClose: flatButton(aboutCloseButton) {
+	width: confirmWidth;
+}
 
 emojiTextFont: font(16px);
 emojiReplaceWidth: 56px;
@@ -1370,6 +1387,9 @@ dpiFont3: linkFont;
 dpiFont4: linkFont;
 
 emojiScroll: flatScroll(scrollDef) {
+	width: 5px;
+	deltax: 2px;
+	deltay: 1px;
 	topsh: 0px;
 	bottomsh: 0px;
 }
@@ -1391,12 +1411,15 @@ 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);
 rbEmoji: flatCheckbox {
 	textColor: transparent;
 	bgColor: transparent;
 	disColor: transparent;
 
-	width: 36px;
+	width: 29px;
 	height: 36px;
 
 	textTop: 0px;
@@ -1407,7 +1430,7 @@ rbEmoji: flatCheckbox {
 	cursor: cursor(pointer);
 
 	disabledCursor: cursor(default);
-	imagePos: point(8px, 8px);
+	imagePos: point(5px, 8px);
 }
 rbEmojiRecent: flatCheckbox(rbEmoji) {
 	imageRect: emojiRecent;
@@ -1457,15 +1480,26 @@ rbEmojiSymbols: flatCheckbox(rbEmoji) {
 	disImageRect: emojiSymbols;
 	chkDisImageRect: emojiSymbolsActive;
 }
-emojiPanPadding: margins(10px, 5px, 0px, 5px);
+rbEmojiStickers: flatCheckbox(rbEmojiRecent) {
+	imageRect: emojiStickers;
+	chkImageRect: emojiStickersActive;
+	overImageRect: emojiStickersOver;
+	chkOverImageRect: emojiStickersActive;
+	disImageRect: emojiStickers;
+	chkDisImageRect: emojiStickersActive;
+}
+emojiPanPadding: margins(5px, 0px, 0px, 5px);
 emojiPanSize: size(28px, 28px);
-emojiPanFont: font(fsize);
-emojiPanText: #999;
 emojiPanSub: 0px;
 emojiPanDuration: 200;
 emojiPanHover: #f0f0f0;
 emojiPanRound: 2px;
 
+stickerPanRound: 3px;
+stickerPanPadding: 2px;
+stickerPanDelete: sprite(158px, 197px, 12px, 12px);
+stickerPanDeleteOpacity: 0.5;
+
 medviewNavBarWidth: 132px;
 medviewLightNav: 0.5;
 medviewDarkNav: 1;
@@ -1569,13 +1603,17 @@ 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);
 
 overviewPhotoSkip: 10px;
 overviewPhotoMinSize: 100px;
+overviewPhotoCheck: sprite(245px, 308px, 32px, 32px);
+overviewPhotoChecked: sprite(278px, 308px, 32px, 32px);
+overviewPhotoSelectOverlay: #0a7bb03f;
 
 // Mac specific
 
-macAccessoryHeight: 90;
+macAccessory: size(450, 90);
 macEnableFilterAdd: 2;
 macEnableFilterTop: 5;
 macSelectorTop: 6;
@@ -1591,7 +1629,7 @@ btnContext: iconedButton(btnDefIconed) {
 	opacity: 1;
 	overOpacity: 1;
 
-	width: 172px;
+	width: -32px;
 	height: 36px;
 
 	color: black;
@@ -1619,8 +1657,9 @@ mediaviewLoader: size(78px, 33px);
 mediaviewLoaderPoint: size(9px, 9px);
 mediaviewLoaderSkip: 9px;
 
-minPhotoWidth: 90px;
-minPhotoHeight: 90px;
+minPhotoSize: 90px;
+maxMediaSize: 420px;
+maxStickerSize: 256px;
 
 usernameFont: font(14px);
 usernameColor: #777;
@@ -1635,3 +1674,23 @@ usernameDone: flatButton(btnSelectDone) {
 usernameCancel: flatButton(btnSelectCancel) {
 	width: 167px;
 }
+
+youtubeIcon: sprite(336px, 221px, 60px, 60px);
+vimeoIcon: sprite(336px, 283px, 60px, 60px);
+locationSize: size(320, 240);
+
+langsWidth: 220px;
+langsPadding: margins(10px, 10px, 10px, 10px);
+langPadding: margins(10px, 10px, 10px, 10px);
+langButton: flatCheckbox(rbDefFlat) {
+	width: 200px;
+}
+langsCloseButton: flatButton(aboutCloseButton) {
+	width: langsWidth;
+}
+
+backgroundPadding: 10px;
+backgroundSize: size(108px, 193px);
+backgroundScroll: flatScroll(newGroupScroll) {
+	topsh: -2px;
+}

Telegram/Resources/style_classes.txt

@@ -1,6 +1,6 @@
 /*
 This file is part of Telegram Desktop,
-an unofficial desktop messaging app, see https://telegram.org
+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
@@ -13,7 +13,7 @@ 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://tdesktop.com
+Copyright (c) 2014 John Preston, https://desktop.telegram.org
 */
 textStyle {
 	lnkFlags: font;

Telegram/Setup.iss

@@ -3,9 +3,6 @@
 
 #define MyAppShortName "Telegram"
 #define MyAppName "Telegram Desktop"
-#define MyAppVersion "0.6.7"
-#define MyAppVersionZero "0.6.7"
-#define MyAppFullVersion "0.6.7.0"
 #define MyAppPublisher "Telegram Messenger LLP"
 #define MyAppURL "https://tdesktop.com"
 #define MyAppExeName "Telegram.exe"
@@ -27,8 +24,8 @@ DefaultDirName={userappdata}\{#MyAppName}
 DefaultGroupName={#MyAppName}
 AllowNoIcons=yes
 OutputDir=.\..\Win32\Deploy
-OutputBaseFilename=tsetup.{#MyAppVersionZero}
-SetupIconFile=.\SourceFiles\art\iconround256.ico
+OutputBaseFilename=tsetup.{#MyAppVersionForExe}
+SetupIconFile=.\SourceFiles\art\icon256.ico
 UninstallDisplayIcon={app}\Telegram.exe
 Compression=lzma
 SolidCompression=yes         
@@ -75,6 +72,13 @@ Type: filesandordirs; Name: "{userappdata}\{#MyAppName}\tdata"
 Type: filesandordirs; Name: "{userappdata}\{#MyAppName}\tdumps"
 Type: dirifempty; Name: "{userappdata}\{#MyAppName}"
 
+[Languages]
+Name: "it"; MessagesFile: "compiler:Languages\Italian.isl"
+Name: "es"; MessagesFile: "compiler:Languages\Spanish.isl"
+Name: "de"; MessagesFile: "compiler:Languages\German.isl"
+Name: "nl"; MessagesFile: "compiler:Languages\Dutch.isl"
+Name: "pt"; MessagesFile: "compiler:Languages\Portuguese.isl"
+
 [Code]
 procedure CurUninstallStepChanged(CurUninstallStep: TUninstallStep);
 var ResultCode: Integer;

Telegram/SignMac.sh

@@ -1 +0,0 @@
-codesign --force --deep --sign "Developer ID Application: John Preston" ./../Mac/Release/Telegram.app

Telegram/SignWin.bat

@@ -1,4 +0,0 @@
-cd ..\Win32\Deploy
-call ..\..\..\TelegramPrivate\Sign.bat Telegram.exe
-call ..\..\..\TelegramPrivate\Sign.bat Updater.exe
-cd ..\..\Telegram

Telegram/SourceFiles/_other/genemoji.cpp

@@ -1,6 +1,6 @@
 /*
 This file is part of Telegram Desktop,
-an unofficial desktop messaging app, see https://telegram.org
+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
@@ -13,7 +13,7 @@ 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://tdesktop.com
+Copyright (c) 2014 John Preston, https://desktop.telegram.org
 */
 #include "genemoji.h"
 
@@ -52,38 +52,41 @@ struct EmojiReplace {
 };
 
 EmojiReplace replaces[] = {
-	{0xD83DDE0AU, ":-)"},
-	{0xD83DDE03U, ":-D"},
-	{0xD83DDE09U, ";-)"},
-	{0xD83DDE06U, "xD"},
-	{0xD83DDE1CU, ";-P"},
-	{0xD83DDE0BU, ":-p"},
-	{0xD83DDE0DU, "8-)"},
-	{0xD83DDE0EU, "B-)"},
-	{0xD83DDE12U, ":-("},
-	{0xD83DDE0FU, ":]"},
-	{0xD83DDE14U, "3("},
-	{0xD83DDE22U, ":'("},
-	{0xD83DDE2DU, ":_("},
-	{0xD83DDE29U, ":(("},
-	{0xD83DDE28U, ":o"},
-	{0xD83DDE10U, ":|"},
-	{0xD83DDE0CU, "3-)"},
-	{0xD83DDE20U, ">("},
-	{0xD83DDE21U, ">(("},
-	{0xD83DDE07U, "O:)"},
-	{0xD83DDE30U, ";o"},
-	{0xD83DDE33U, "8|"},
-	{0xD83DDE32U, "8o"},
-	{0xD83DDE37U, ":X"},
-	{0xD83DDE1AU, ":-*"},
-	{0xD83DDE08U, "}:)"},
-	{0x2764FE0FU, "<3"},
-	{0xD83DDC4DU, ":like:"},
-	{0xD83DDC4EU, ":dislike:"},
-	{0x261DFE0FU, ":up:"},
-	{0x270CFE0FU, ":v:"},
-	{0xD83DDC4CU, ":ok:"}
+	{ 0xD83DDE0AU, ":-)" },
+	{ 0xD83DDE0DU, "8-)" },
+	{ 0x2764U, "<3" },
+	{ 0xD83DDC8BU, ":kiss:" },
+	{ 0xD83DDE01U, ":grin:" },
+	{ 0xD83DDE02U, ":joy:" },
+	{ 0xD83DDE1AU, ":-*" },
+	{ 0xD83DDE06U, "xD" },
+	{ 0xD83DDC4DU, ":like:" },
+	{ 0xD83DDC4EU, ":dislike:" },
+	{ 0x261DU, ":up:" },
+	{ 0x270CU, ":v:" },
+	{ 0xD83DDC4CU, ":ok:" },
+	{ 0xD83DDE0EU, "B-)" },
+	{ 0xD83DDE03U, ":-D" },
+	{ 0xD83DDE09U, ";-)" },
+	{ 0xD83DDE1CU, ";-P" },
+	{ 0xD83DDE0BU, ":-p" },
+	{ 0xD83DDE14U, "3(" },
+	{ 0xD83DDE1EU, ":-(" },
+	{ 0xD83DDE0FU, ":]" },
+	{ 0xD83DDE22U, ":'(" },
+	{ 0xD83DDE2DU, ":_(" },
+	{ 0xD83DDE29U, ":((" },
+	{ 0xD83DDE28U, ":o" },
+	{ 0xD83DDE10U, ":|" },
+	{ 0xD83DDE0CU, "3-)" },
+	{ 0xD83DDE20U, ">(" },
+	{ 0xD83DDE21U, ">((" },
+	{ 0xD83DDE07U, "O:)" },
+	{ 0xD83DDE30U, ";o" },
+	{ 0xD83DDE33U, "8|" },
+	{ 0xD83DDE32U, "8o" },
+	{ 0xD83DDE37U, ":X" },
+	{ 0xD83DDE08U, "}:)" },
 };
 const uint32 replacesCount = sizeof(replaces) / sizeof(EmojiReplace);
 typedef QMap<QString, uint32> ReplaceMap;
@@ -102,7 +105,7 @@ uint64 emojiCategory0[] = {
 	0xD83DDE03LLU,
 	0xD83DDE00LLU,
 	0xD83DDE0ALLU,
-	0x263AFE0FLLU,
+	0x263ALLU,
 	0xD83DDE09LLU,
 	0xD83DDE0DLLU,
 	0xD83DDE18LLU,
@@ -208,7 +211,7 @@ uint64 emojiCategory0[] = {
 	0xD83DDC4CLLU,
 	0xD83DDC4ALLU,
 	0x270ALLU,
-	0x270CFE0FLLU,
+	0x270CLLU,
 	0xD83DDC4BLLU,
 	0x270BLLU,
 	0xD83DDC50LLU,
@@ -218,7 +221,7 @@ uint64 emojiCategory0[] = {
 	0xD83DDC48LLU,
 	0xD83DDE4CLLU,
 	0xD83DDE4FLLU,
-	0x261DFE0FLLU,
+	0x261DLLU,
 	0xD83DDC4FLLU,
 	0xD83DDCAALLU,
 	0xD83DDEB6LLU,
@@ -270,7 +273,7 @@ uint64 emojiCategory0[] = {
 	0xD83DDC99LLU,
 	0xD83DDC9CLLU,
 	0xD83DDC9ALLU,
-	0x2764FE0FLLU,
+	0x2764LLU,
 	0xD83DDC94LLU,
 	0xD83DDC97LLU,
 	0xD83DDC93LLU,
@@ -395,12 +398,12 @@ uint64 emojiCategory1[] = {
 	0xD83CDF0CLLU,
 	0xD83CDF20LLU,
 	0x2B50LLU,
-	0x2600FE0FLLU,
+	0x2600LLU,
 	0x26C5LLU,
-	0x2601FE0FLLU,
+	0x2601LLU,
 	0x26A1LLU,
 	0x2614LLU,
-	0x2744FE0FLLU,
+	0x2744LLU,
 	0x26C4LLU,
 	0xD83CDF00LLU,
 	0xD83CDF01LLU,
@@ -440,7 +443,7 @@ uint64 emojiCategory2[] = {
 	0xD83DDCBELLU,
 	0xD83DDCBBLLU,
 	0xD83DDCF1LLU,
-	0x260EFE0FLLU,
+	0x260ELLU,
 	0xD83DDCDELLU,
 	0xD83DDCDFLLU,
 	0xD83DDCE0LLU,
@@ -497,7 +500,7 @@ uint64 emojiCategory2[] = {
 	0xD83DDCE7LLU,
 	0xD83DDCE5LLU,
 	0xD83DDCE4LLU,
-	0x2709FE0FLLU,
+	0x2709LLU,
 	0xD83DDCE9LLU,
 	0xD83DDCE8LLU,
 	0xD83DDCEFLLU,
@@ -521,11 +524,11 @@ uint64 emojiCategory2[] = {
 	0xD83DDCC7LLU,
 	0xD83DDCC1LLU,
 	0xD83DDCC2LLU,
-	0x2702FE0FLLU,
+	0x2702LLU,
 	0xD83DDCCCLLU,
 	0xD83DDCCELLU,
-	0x2712FE0FLLU,
-	0x270FFE0FLLU,
+	0x2712LLU,
+	0x270FLLU,
 	0xD83DDCCFLLU,
 	0xD83DDCD0LLU,
 	0xD83DDCD5LLU,
@@ -564,7 +567,7 @@ uint64 emojiCategory2[] = {
 	0xD83CDFC8LLU,
 	0xD83CDFC0LLU,
 	0x26BDLLU,
-	0x26BEFE0FLLU,
+	0x26BELLU,
 	0xD83CDFBELLU,
 	0xD83CDFB1LLU,
 	0xD83CDFC9LLU,
@@ -680,7 +683,7 @@ uint64 emojiCategory3[] = {
 	0xD83DDEA3LLU,
 	0x2693LLU,
 	0xD83DDE80LLU,
-	0x2708FE0FLLU,
+	0x2708LLU,
 	0xD83DDCBALLU,
 	0xD83DDE81LLU,
 	0xD83DDE82LLU,
@@ -721,13 +724,13 @@ uint64 emojiCategory3[] = {
 	0xD83CDFABLLU,
 	0xD83DDEA6LLU,
 	0xD83DDEA5LLU,
-	0x26A0FE0FLLU,
+	0x26A0LLU,
 	0xD83DDEA7LLU,
 	0xD83DDD30LLU,
 	0x26FDLLU,
 	0xD83CDFEELLU,
 	0xD83CDFB0LLU,
-	0x2668FE0FLLU,
+	0x2668LLU,
 	0xD83DDDFFLLU,
 	0xD83CDFAALLU,
 	0xD83CDFADLLU,
@@ -760,33 +763,33 @@ uint64 emojiCategory4[] = {
 	0xD83DDD22LLU,
 	0x2320E3LLU,
 	0xD83DDD23LLU,
-	0x2B06FE0FLLU,
-	0x2B07FE0FLLU,
-	0x2B05FE0FLLU,
-	0x27A1FE0FLLU,
+	0x2B06LLU,
+	0x2B07LLU,
+	0x2B05LLU,
+	0x27A1LLU,
 	0xD83DDD20LLU,
 	0xD83DDD21LLU,
 	0xD83DDD24LLU,
-	0x2197FE0FLLU,
-	0x2196FE0FLLU,
-	0x2198FE0FLLU,
-	0x2199FE0FLLU,
-	0x2194FE0FLLU,
-	0x2195FE0FLLU,
+	0x2197LLU,
+	0x2196LLU,
+	0x2198LLU,
+	0x2199LLU,
+	0x2194LLU,
+	0x2195LLU,
 	0xD83DDD04LLU,
-	0x25C0FE0FLLU,
-	0x25B6FE0FLLU,
+	0x25C0LLU,
+	0x25B6LLU,
 	0xD83DDD3CLLU,
 	0xD83DDD3DLLU,
-	0x21A9FE0FLLU,
-	0x21AAFE0FLLU,
-	0x2139FE0FLLU,
+	0x21A9LLU,
+	0x21AALLU,
+	0x2139LLU,
 	0x23EALLU,
 	0x23E9LLU,
 	0x23EBLLU,
 	0x23ECLLU,
-	0x2935FE0FLLU,
-	0x2934FE0FLLU,
+	0x2935LLU,
+	0x2934LLU,
 	0xD83CDD97LLU,
 	0xD83DDD00LLU,
 	0xD83DDD01LLU,
@@ -802,8 +805,8 @@ uint64 emojiCategory4[] = {
 	0xD83CDE2FLLU,
 	0xD83CDE33LLU,
 	0xD83CDE35LLU,
-	0xD83CDE32LLU,
 	0xD83CDE34LLU,
+	0xD83CDE32LLU,
 	0xD83CDE50LLU,
 	0xD83CDE39LLU,
 	0xD83CDE3ALLU,
@@ -822,14 +825,14 @@ uint64 emojiCategory4[] = {
 	0xD83CDE37LLU,
 	0xD83CDE38LLU,
 	0xD83CDE02LLU,
-	0x24C2FE0FLLU,
+	0x24C2LLU,
 	0xD83DDEC2LLU,
 	0xD83DDEC4LLU,
 	0xD83DDEC5LLU,
 	0xD83DDEC3LLU,
 	0xD83CDE51LLU,
-	0x3299FE0FLLU,
-	0x3297FE0FLLU,
+	0x3299LLU,
+	0x3297LLU,
 	0xD83CDD91LLU,
 	0xD83CDD98LLU,
 	0xD83CDD94LLU,
@@ -842,11 +845,11 @@ uint64 emojiCategory4[] = {
 	0xD83DDEB7LLU,
 	0xD83DDEB8LLU,
 	0x26D4LLU,
-	0x2733FE0FLLU,
-	0x2747FE0FLLU,
+	0x2733LLU,
+	0x2747LLU,
 	0x274ELLU,
 	0x2705LLU,
-	0x2734FE0FLLU,
+	0x2734LLU,
 	0xD83DDC9FLLU,
 	0xD83CDD9ALLU,
 	0xD83DDCF3LLU,
@@ -857,7 +860,7 @@ uint64 emojiCategory4[] = {
 	0xD83CDD7ELLU,
 	0xD83DDCA0LLU,
 	0x27BFLLU,
-	0x267BFE0FLLU,
+	0x267BLLU,
 	0x2648LLU,
 	0x2649LLU,
 	0x264ALLU,
@@ -880,8 +883,8 @@ uint64 emojiCategory4[] = {
 	0xAELLU,
 	0x2122LLU,
 	0x274CLLU,
-	0x203CFE0FLLU,
-	0x2049FE0FLLU,
+	0x203CLLU,
+	0x2049LLU,
 	0x2757LLU,
 	0x2753LLU,
 	0x2755LLU,
@@ -921,26 +924,26 @@ uint64 emojiCategory4[] = {
 	0x2795LLU,
 	0x2796LLU,
 	0x2797LLU,
-	0x2660FE0FLLU,
-	0x2665FE0FLLU,
-	0x2663FE0FLLU,
-	0x2666FE0FLLU,
+	0x2660LLU,
+	0x2665LLU,
+	0x2663LLU,
+	0x2666LLU,
 	0xD83DDCAELLU,
 	0xD83DDCAFLLU,
-	0x2714FE0FLLU,
-	0x2611FE0FLLU,
+	0x2714LLU,
+	0x2611LLU,
 	0xD83DDD18LLU,
 	0xD83DDD17LLU,
 	0x27B0LLU,
 	0x3030LLU,
-	0x303DFE0FLLU,
+	0x303DLLU,
 	0xD83DDD31LLU,
-	0x25FCFE0FLLU,
-	0x25FBFE0FLLU,
+	0x25FCLLU,
+	0x25FBLLU,
 	0x25FELLU,
 	0x25FDLLU,
-	0x25AAFE0FLLU,
-	0x25ABFE0FLLU,
+	0x25AALLU,
+	0x25ABLLU,
 	0xD83DDD3ALLU,
 	0xD83DDD32LLU,
 	0xD83DDD33LLU,
@@ -957,61 +960,105 @@ uint64 emojiCategory4[] = {
 	0xD83DDD39LLU,
 };
 
-uint64 emojiClones[] = {
-	0x263ALLU,
-	0x270CLLU,
-	0x261DLLU,
-	0x2764LLU,
-	0x2600LLU,
-	0x2601LLU,
-	0x2744LLU,
-	0x260ELLU,
-	0x2709LLU,
-	0x2702LLU,
-	0x2712LLU,
-	0x270FLLU,
-	0x26BELLU,
-	0x2708LLU,
-	0x26A0LLU,
-	0x2668LLU,
-	0x2B06LLU,
-	0x2B07LLU,
-	0x2B05LLU,
-	0x27A1LLU,
-	0x2197LLU,
-	0x2196LLU,
-	0x2198LLU,
-	0x2199LLU,
-	0x2194LLU,
-	0x2195LLU,
-	0x25C0LLU,
-	0x25B6LLU,
-	0x21A9LLU,
-	0x21AALLU,
-	0x2139LLU,
-	0x2935LLU,
-	0x2934LLU,
-	0x24C2LLU,
-	0x3299LLU,
-	0x3297LLU,
-	0x2733LLU,
-	0x2747LLU,
-	0x2734LLU,
-	0x267BLLU,
+uint64 emojiPostfixed[] = {
 	0x203CLLU,
 	0x2049LLU,
-	0x2660LLU,
-	0x2665LLU,
-	0x2663LLU,
-	0x2666LLU,
-	0x2714LLU,
-	0x2611LLU,
-	0x303DLLU,
-	0x25FCLLU,
-	0x25FBLLU,
+	0x2139LLU,
+	0x2194LLU,
+	0x2195LLU,
+	0x2196LLU,
+	0x2197LLU,
+	0x2198LLU,
+	0x2199LLU,
+	0x21A9LLU,
+	0x21AALLU,
+	0x231ALLU,
+	0x231BLLU,
+	0x24C2LLU,
 	0x25AALLU,
 	0x25ABLLU,
+	0x25B6LLU,
+	0x25C0LLU,
+	0x25FBLLU,
+	0x25FCLLU,
+	0x25FDLLU,
+	0x25FELLU,
+	0x2600LLU,
+	0x2601LLU,
+	0x260ELLU,
+	0x2611LLU,
+	0x2614LLU,
+	0x2615LLU,
+	0x261DLLU,
+	0x263ALLU,
+	0x2648LLU,
+	0x2649LLU,
+	0x264ALLU,
+	0x264BLLU,
+	0x264CLLU,
+	0x264DLLU,
+	0x264ELLU,
+	0x264FLLU,
+	0x2650LLU,
+	0x2651LLU,
+	0x2652LLU,
+	0x2653LLU,
+	0x2660LLU,
+	0x2663LLU,
+	0x2665LLU,
+	0x2666LLU,
+	0x2668LLU,
+	0x267BLLU,
+	0x267FLLU,
+	0x2693LLU,
+	0x26A0LLU,
+	0x26A1LLU,
+	0x26AALLU,
+	0x26ABLLU,
+	0x26BDLLU,
+	0x26BELLU,
+	0x26C4LLU,
+	0x26C5LLU,
+	0x26D4LLU,
+	0x26EALLU,
+	0x26F2LLU,
+	0x26F3LLU,
+	0x26F5LLU,
+	0x26FALLU,
+	0x26FDLLU,
+	0x2702LLU,
+	0x2708LLU,
+	0x2709LLU,
+	0x270CLLU,
+	0x270FLLU,
+	0x2712LLU,
+	0x2714LLU,
+	0x2716LLU,
+	0x2733LLU,
+	0x2734LLU,
+	0x2744LLU,
+	0x2747LLU,
+	0x2757LLU,
+	0x2764LLU,
+	0x27A1LLU,
+	0x2934LLU,
+	0x2935LLU,
+	0x2B05LLU,
+	0x2B06LLU,
+	0x2B07LLU,
+	0x2B50LLU,
+	0x2B55LLU,
+	0x2B1BLLU,
+	0x2B1CLLU,
+	0x303DLLU,
+	0x3297LLU,
+	0x3299LLU,
+	0xD83CDC04LLU,
+	0xD83CDD7FLLU,
+	0xD83CDE1ALLU,
+	0xD83CDE2FLLU,
 };
+QMap<uint64, bool> emojiWithPostfixes;
 
 uint32 firstCode(uint64 fullCode) {
 	return (fullCode > 0xFFFFFFFFLLU) ? uint32(fullCode >> 32) : (fullCode & 0xFFFFFFFFU);
@@ -1046,7 +1093,7 @@ void writeEmojiCategory(QTextStream &tcpp, uint64 *emojiCategory, uint32 size, c
 
 bool genEmoji(QString emoji_in, const QString &emoji_out, const QString &emoji_png) {
 	int currentRow = 0, currentColumn = 0;
-	uint32 min1 = 0xFFFFFFFFU, max1 = 0, min2 = 0xFFFFFFFFU, max2 = 0, min3 = 0xFFFFFFFFU, max3 = 0;
+	uint32 min1 = 0xFFFFFFFFU, max1 = 0, min2 = 0xFFFFFFFFU, max2 = 0;
 
 	QImage sprites[5];
 	int emojisInRow[] = { 27, 29, 33, 34, 34 };	// [[7,27],[4,29],[7,33],[3,34],[6,34]]
@@ -1100,13 +1147,8 @@ bool genEmoji(QString emoji_in, const QString &emoji_out, const QString &emoji_p
 				}
 			} else if (high == 35 || (high >= 48 && high < 58)) { // digits
 			} else {
-				if (high < 0xD000) {
-					if (data.code < min2) min2 = data.code;
-					if (data.code > max2) max2 = data.code;
-				} else {
-					if (data.code < min3) min3 = data.code;
-					if (data.code > max3) max3 = data.code;
-				}
+				if (data.code < min2) min2 = data.code;
+				if (data.code > max2) max2 = data.code;
 			}
 			EmojisData::const_iterator k = emojisData.constFind(data.code);
 			if (k != emojisData.cend()) {
@@ -1132,7 +1174,7 @@ bool genEmoji(QString emoji_in, const QString &emoji_out, const QString &emoji_p
 		p.fillRect(0, 0, emojisImg.width(), emojisImg.height(), Qt::transparent);
 		for (EmojisData::const_iterator i = emojisData.cbegin(), e = emojisData.cend(); i != e; ++i) {
 			int ind = i->index, row = ind / emojisInRow[i->category], col = ind % emojisInRow[i->category], size = sizes[i->category];
-			QPixmap emoji = QPixmap::fromImage(sprites[i->category].copy(col * size, row * size, size, size).scaled(imSize, imSize, Qt::IgnoreAspectRatio, Qt::SmoothTransformation));
+			QPixmap emoji = QPixmap::fromImage(sprites[i->category].copy(col * size, row * size, size, size).scaled(imSize, imSize, Qt::IgnoreAspectRatio, Qt::SmoothTransformation), Qt::ColorOnly);
 			p.drawPixmap(i->x * imSize, i->y * imSize, emoji);
 		}
 		QString postfix = variantPostfix[variantIndex], emojif = emoji_png + postfix + ".png";
@@ -1170,23 +1212,8 @@ bool genEmoji(QString emoji_in, const QString &emoji_out, const QString &emoji_p
 		}
 	}
 
-	for (int i = 0, l = sizeof(emojiClones) / sizeof(emojiClones[0]); i < l; ++i) {
-		uint64 cloneCode = emojiClones[i], originalCode = (cloneCode << 16) | 0xFE0F;
-		EmojisData::const_iterator j = emojisData.constFind(originalCode);
-		if (j == emojisData.cend()) {
-			cout << "Could not find data for emoji clone 0x" << QString::number(cloneCode, 16).toUpper().toUtf8().constData() << "!\n";
-			return false;
-		}
-		EmojiData clone;
-		clone.code = firstCode(cloneCode);
-		clone.code2 = secondCode(cloneCode);
-		clone.category = -1;
-		clone.index = -1;
-		clone.x = j->x;
-		clone.y = j->y;
-		emojisData.insert(cloneCode, clone);
-		if (clone.code < min1) min1 = clone.code;
-		if (clone.code > max1) max1 = clone.code;
+	for (int i = 0, l = sizeof(emojiPostfixed) / sizeof(emojiPostfixed[0]); i < l; ++i) {
+		emojiWithPostfixes.insert(emojiPostfixed[i], true);
 	}
 
 	try {
@@ -1201,7 +1228,7 @@ Created from emoji config by \'/MetaEmoji\' project\n\
 WARNING! All changes made in this file will be lost!\n\
 \n\
 This file is part of Telegram Desktop, \n\
-an unofficial desktop messaging app, see https://telegram.org\n\
+the official desktop version of Telegram messaging app, see https://telegram.org\n\
 \n\
 Telegram Desktop is free software: you can redistribute it and/or modify\n\
 it under the terms of the GNU General Public License as published by\n\
@@ -1214,7 +1241,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n\
 GNU General Public License for more details.\n\
 \n\
 Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE\n\
-Copyright (c) 2014 John Preston, https://tdesktop.com\n\
+Copyright (c) 2014 John Preston, https://desktop.telegram.org\n\
 */\n";
 			tcpp << "#include \"stdafx.h\"\n#include \"gui/emoji_config.h\"\n\n";
 
@@ -1229,7 +1256,8 @@ Copyright (c) 2014 John Preston, https://tdesktop.com\n\
                 tcpp << "\tEmojiData *toFill = emojis = (EmojiData*)emojisData;\n\n";
                 for (EmojisData::const_iterator i = emojisData.cbegin(), e = emojisData.cend(); i != e; ++i) {
                     int len = i->code2 ? 4 : ((i->code >> 16) ? 2 : 1);
-                    tcpp << "\tnew (toFill++) EmojiData(" << (i->x * imSize) << ", " << (i->y * imSize) << ", 0x" << QString("%1").arg(i->code, 0, 16).toUpper().toUtf8().constData() << "U, 0x" << QString("%1").arg(i->code2, 0, 16).toUpper().toUtf8().constData() << "U, " << len << ");\n";
+					bool withPostfix = emojiWithPostfixes.constFind(i->code) != emojiWithPostfixes.constEnd();
+                    tcpp << "\tnew (toFill++) EmojiData(" << (i->x * imSize) << ", " << (i->y * imSize) << ", 0x" << QString("%1").arg(i->code, 0, 16).toUpper().toUtf8().constData() << "U, 0x" << QString("%1").arg(i->code2, 0, 16).toUpper().toUtf8().constData() << "U, " << len << (withPostfix ? ", 0xFE0F" : "") << ");\n";
                 }
                 tcpp << "}\n\n";
             }
@@ -1283,18 +1311,7 @@ Copyright (c) 2014 John Preston, https://tdesktop.com\n\
 			tcpp << "\t\treturn 0;\n";
 			tcpp << "\t}\n\n";
 
-			tcpp << "\tif (code >= 0x" << QString("%1").arg(min2, 0, 16).toUpper().toUtf8().constData() << "U && code <= 0x" << QString("%1").arg(max2, 0, 16).toUpper().toUtf8().constData() << "U) {\n";
-			tcpp << "\t\tif ((code & 0xFFFFU) != 0xFE0F) return 0;\n\n";
-			tcpp << "\t\tswitch (code) {\n";
-			for (; i != e; ++i) {
-				if (i->code2 || ((i->code >> 16) >= 0xD000)) break;
-				tcpp << "\t\t\tcase 0x" << QString("%1").arg(i->code, 0, 16).toUpper().toUtf8().constData() << "U: return &emojis[" << (index++) << "];\n";
-			}
-			tcpp << "\t\t}\n\n";
-			tcpp << "\t\treturn 0;\n";
-			tcpp << "\t}\n\n";
-
-            tcpp << "\tif (code < 0x" << QString("%1").arg(min3, 0, 16).toUpper().toUtf8().constData() << "U || code > 0x" << QString("%1").arg(max3, 0, 16).toUpper().toUtf8().constData() << "U) return 0;\n\n";
+            tcpp << "\tif (code < 0x" << QString("%1").arg(min2, 0, 16).toUpper().toUtf8().constData() << "U || code > 0x" << QString("%1").arg(max2, 0, 16).toUpper().toUtf8().constData() << "U) return 0;\n\n";
 			tcpp << "\tswitch (code) {\n";
 			for (; i != e; ++i) {
                 tcpp << "\tcase 0x" << QString("%1").arg(i->code, 0, 16).toUpper().toUtf8().constData() << "U: return &emojis[" << (index++) << "];\n";

Telegram/SourceFiles/_other/genemoji.h

@@ -1,6 +1,6 @@
 /*
 This file is part of Telegram Desktop,
-an unofficial desktop messaging app, see https://telegram.org
+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
@@ -13,7 +13,7 @@ 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://tdesktop.com
+Copyright (c) 2014 John Preston, https://desktop.telegram.org
 */
 #include <QtCore/QMap>
 #include <QtCore/QVector>

Telegram/SourceFiles/_other/genlang.cpp

@@ -1,6 +1,6 @@
 /*
 This file is part of Telegram Desktop,
-an unofficial desktop messaging app, see https://telegram.org
+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
@@ -13,7 +13,7 @@ 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://tdesktop.com
+Copyright (c) 2014 John Preston, https://desktop.telegram.org
 */
 #include "genlang.h"
 
@@ -39,10 +39,20 @@ Q_IMPORT_PLUGIN(QWebpPlugin)
 typedef unsigned int uint32;
 
 QString layoutDirection;
-typedef QMap<QString, QString> LangKeys;
+typedef QMap<QByteArray, QString> LangKeys;
 LangKeys keys;
-typedef QVector<QString> KeysOrder;
+typedef QMap<QByteArray, ushort> LangTags;
+LangTags tags;
+typedef QMap<QByteArray, QVector<QByteArray> > LangKeysTags;
+LangKeysTags keysTags;
+typedef QVector<QByteArray> KeysOrder;
 KeysOrder keysOrder;
+KeysOrder tagsOrder;
+typedef QMap<QByteArray, QMap<QByteArray, QVector<QString> > > LangKeysCounted;
+LangKeysCounted keysCounted;
+
+static const QChar TextCommand(0x0010);
+static const QChar TextCommandLangTag(0x0020);
 
 bool skipWhitespaces(const char *&from, const char *end) {
 	while (from < end && (*from == ' ' || *from == '\n' || *from == '\t' || *from == '\r')) {
@@ -86,68 +96,177 @@ bool skipJunk(const char *&from, const char *end) {
 	return true;
 }
 
+inline bool _lngEquals(const QByteArray &key, int from, int len, const char *value, int size) {
+	if (size != len || from + len > key.size()) return false;
+	for (const char *v = key.constData() + from, *e = v + len; v != e; ++v, ++value) {
+		if (*v != *value) return false;
+	}
+	return true;
+}
+
+#define LNG_EQUALS_PART(key, from, len, value) _lngEquals(key, from, len, value, sizeof(value) - 1)
+#define LNG_EQUALS_TAIL(key, from, value) _lngEquals(key, from, key.size() - from, value, sizeof(value) - 1)
+#define LNG_EQUALS(key, value) _lngEquals(key, 0, key.size(), value, sizeof(value) - 1)
+
+static const int MaxCountedValues = 6;
+
 void readKeyValue(const char *&from, const char *end) {
 	if (!skipJunk(from, end)) return;
 
-	const char *nameStart = from;
+	if (*from != '"') throw Exception(QString("Expected quote before key name!"));
+	const char *nameStart = ++from;
 	while (from < end && ((*from >= 'a' && *from <= 'z') || (*from >= 'A' && *from <= 'Z') || *from == '_' || (*from >= '0' && *from <= '9'))) {
 		++from;
 	}
 
-	QString varName = QString::fromUtf8(nameStart, int(from - nameStart));
+	if (from == nameStart) throw Exception(QString("Expected key name!"));
+	QByteArray varName = QByteArray(nameStart, int(from - nameStart));
+	for (const char *t = nameStart; t + 1 < from; ++t) {
+		if (*t == '_') {
+			if (*(t + 1) == '_') throw Exception(QString("Bad key name: %1").arg(QLatin1String(varName)));
+			++t;
+		}
+	}
 
-	if (!skipJunk(from, end)) throw Exception("Unexpected end of file!");
-	if (*from != ':') throw Exception(QString("':' expected after '%1'").arg(varName));
+	if (from == end || *from != '"') throw Exception(QString("Expected quote after key name in key '%1'!").arg(QLatin1String(varName)));
+	++from;
 
-	if (!skipJunk(++from, end)) throw Exception("Unexpected end of file!");
-	if (*from != '"') throw Exception(QString("Expected string after '%1:'").arg(varName));
+	if (!skipJunk(from, end)) throw Exception(QString("Unexpected end of file in key '%1'!").arg(QLatin1String(varName)));
+	if (*from != '=') throw Exception(QString("'=' expected in key '%1'!").arg(QLatin1String(varName)));
+
+	if (!skipJunk(++from, end)) throw Exception(QString("Unexpected end of file in key '%1'!").arg(QLatin1String(varName)));
+	if (*from != '"') throw Exception(QString("Expected string after '=' in key '%1'!").arg(QLatin1String(varName)));
 
 	QByteArray varValue;
 	const char *start = ++from;
+	QVector<QByteArray> tagsList;
 	while (from < end && *from != '"') {
+		if (*from == '\n') {
+			throw Exception(QString("Unexpected end of string in key '%1'!").arg(QLatin1String(varName)));
+		}
 		if (*from == '\\') {
-			if (from + 1 >= end) throw Exception("Unexpected end of file!");
-			if (*(from + 1) == '"' || *(from + 1) == '\\') {
+			if (from + 1 >= end) throw Exception(QString("Unexpected end of file in key '%1'!").arg(QLatin1String(varName)));
+			if (*(from + 1) == '"' || *(from + 1) == '\\' || *(from + 1) == '{') {
 				if (from > start) varValue.append(start, int(from - start));
 				start = ++from;
+			} else if (*(from + 1) == 'n') {
+				if (from > start) varValue.append(start, int(from - start));
+
+				varValue.append('\n');
+
+				start = (++from) + 1;
 			}
+		} else if (*from == '{') {
+			if (from > start) varValue.append(start, int(from - start));
+
+			const char *tagStart = ++from;
+			while (from < end && ((*from >= 'a' && *from <= 'z') || (*from >= 'A' && *from <= 'Z') || *from == '_' || (*from >= '0' && *from <= '9'))) {
+				++from;
+			}
+			if (from == tagStart) throw Exception(QString("Expected tag name in key '%1'!").arg(QLatin1String(varName)));
+			QByteArray tagName = QByteArray(tagStart, int(from - tagStart));
+
+			if (from == end || (*from != '}' && *from != ':')) throw Exception(QString("Expected '}' or ':' after tag name in key '%1'!").arg(QLatin1String(varName)));
+
+			LangTags::const_iterator i = tags.constFind(tagName);
+			if (i == tags.cend()) {
+				i = tags.insert(tagName, tagsOrder.size());
+				tagsOrder.push_back(tagName);
+			}
+			if (0x0020 + *i > 0x007F) throw Exception(QString("Too many different tags in key '%1'").arg(QLatin1String(varName)));
+
+			QString tagReplacer(4, TextCommand);
+			tagReplacer[1] = TextCommandLangTag;
+			tagReplacer[2] = QChar(0x0020 + *i);
+			varValue.append(tagReplacer.toUtf8());
+			for (int j = 0, s = tagsList.size(); j < s; ++j) {
+				if (tagsList.at(j) == tagName) throw Exception(QString("Tag '%1' double used in key '%2'!").arg(QLatin1String(tagName)).arg(QLatin1String(varName)));
+			}
+			tagsList.push_back(tagName);
+
+			if (*from == ':') {
+				start = ++from;
+				
+				QVector<QString> &counted(keysCounted[varName][tagName]);
+				QByteArray subvarValue;
+				bool foundtag = false;
+				while (from < end && *from != '"' && *from != '}') {
+					if (*from == '|') {
+						if (from > start) subvarValue.append(start, int(from - start));
+						counted.push_back(QString::fromUtf8(subvarValue));
+						subvarValue = QByteArray();
+						foundtag = false;
+						start = from + 1;
+					}
+					if (*from == '\n') {
+						throw Exception(QString("Unexpected end of string inside counted tag '%1' in '%2' key!").arg(QLatin1String(tagName)).arg(QLatin1String(varName)));
+					}
+					if (*from == '\\') {
+						if (from + 1 >= end) throw Exception(QString("Unexpected end of file inside counted tag '%1' in '%2' key!").arg(QLatin1String(tagName)).arg(QLatin1String(varName)));
+						if (*(from + 1) == '"' || *(from + 1) == '\\' || *(from + 1) == '{' || *(from + 1) == '#') {
+							if (from > start) subvarValue.append(start, int(from - start));
+							start = ++from;
+						} else if (*(from + 1) == 'n') {
+							if (from > start) subvarValue.append(start, int(from - start));
+
+							subvarValue.append('\n');
+
+							start = (++from) + 1;
+						}
+					} else if (*from == '{') {
+						throw Exception(QString("Unexpected tag inside counted tag '%1' in '%2' key!").arg(QLatin1String(tagName)).arg(QLatin1String(varName)));
+					} else if (*from == '#') {
+						if (foundtag) throw Exception(QString("Replacement '#' double used inside counted tag '%1' in '%2' key!").arg(QLatin1String(tagName)).arg(QLatin1String(varName)));
+						foundtag = true;
+						if (from > start) subvarValue.append(start, int(from - start));
+						subvarValue.append(tagReplacer.toUtf8());
+						start = from + 1;
+					}
+					++from;
+				}
+				if (from >= end) throw Exception(QString("Unexpected end of file inside counted tag '%1' in '%2' key!").arg(QLatin1String(tagName)).arg(QLatin1String(varName)));
+				if (*from == '"') throw Exception(QString("Unexpected end of string inside counted tag '%1' in '%2' key!").arg(QLatin1String(tagName)).arg(QLatin1String(varName)));
+
+				if (from > start) subvarValue.append(start, int(from - start));
+				counted.push_back(QString::fromUtf8(subvarValue));
+
+				if (counted.size() > MaxCountedValues) {
+					throw Exception(QString("Too many values inside counted tag '%1' in '%2' key!").arg(QLatin1String(tagName)).arg(QLatin1String(varName)));
+				}
+			}
+			start = from + 1;
 		}
 		++from;
 	}
-	if (from >= end) throw Exception("Unexpected end of file!");
+	if (from >= end) throw Exception(QString("Unexpected end of file in key '%1'!").arg(QLatin1String(varName)));
 	if (from > start) varValue.append(start, int(from - start));
 
-	if (!skipJunk(++from, end)) throw Exception("Unexpected end of file!");
-	if (*from != ';') throw Exception(QString("';' expected after '%1: \"value\"'").arg(varName));
+	if (!skipJunk(++from, end)) throw Exception(QString("Unexpected end of file in key '%1'!").arg(QLatin1String(varName)));
+	if (*from != ';') throw Exception(QString("';' expected after \"value\" in key '%1'!").arg(QLatin1String(varName)));
 
 	skipJunk(++from, end);
 
 	if (varName == "direction") {
-		if (varValue == "LTR" || varValue == "RTL") {
-			layoutDirection = QString::fromUtf8(varValue);
-		} else {
-			throw Exception(QString("Unexpected value for 'direction' key: '%1'").arg(QString::fromUtf8(varValue)));
-		}
-	} else if (varName.midRef(0, 4) != "lng_") {
-		throw Exception(QString("Bad key '%1'").arg(varName));
+		throw Exception(QString("Unexpected value for 'direction' in key '%1'!").arg(QLatin1String(varName)));
+	} else if (!LNG_EQUALS_PART(varName, 0, 4, "lng_")) {
+		throw Exception(QString("Bad key '%1'!").arg(QLatin1String(varName)));
 	} else if (keys.constFind(varName) != keys.cend()) {
-		throw Exception(QString("Key doubled '%1'").arg(varName));
+		throw Exception(QString("Key '%1' doubled!").arg(QLatin1String(varName)));
 	} else {
 		keys.insert(varName, QString::fromUtf8(varValue));
+		keysTags.insert(varName, tagsList);
 		keysOrder.push_back(varName);
 	}
 }
 
-QString escapeCpp(const QString &key, QString value, bool wideChar) {
+QString escapeCpp(const QByteArray &key, QString value, bool wideChar) {
 	if (value.isEmpty()) return "QString()";
-	value = value.replace('\\', "\\\\").replace('\n', "\\n").replace('\r', "").replace('"', "\\\"");
+
 	QString res;
 	res.reserve(value.size() * 10);
 	bool instr = false;
 	for (const QChar *ch = value.constData(), *e = value.constData() + value.size(); ch != e; ++ch) {
-		if (ch->unicode() < 32) {
-			throw Exception(QString("Bad value for key '%1'").arg(key));
-		} else if (ch->unicode() > 127) {
+		if (ch->unicode() > 0x007F) {
 			if (instr) {
 				res.append('"');
 				instr = false;
@@ -170,14 +289,39 @@ QString escapeCpp(const QString &key, QString value, bool wideChar) {
 				res.append('"');
 				instr = true;
 			}
-			res.append(*ch);
+			if (ch->unicode() == '\\' || ch->unicode() == '\n' || ch->unicode() == '\r' || ch->unicode() == '"') {
+				res.append('\\');
+				if (ch->unicode() == '\\' || ch->unicode() == '"') {
+					res.append(*ch);
+				} else if (ch->unicode() == '\n') {
+					res.append('n');
+				} else if (ch->unicode() == '\r') {
+					res.append('r');
+				}
+			} else if (ch->unicode() < 0x0020) {
+				if (*ch == TextCommand) {
+					if (ch + 3 >= e || (ch + 1)->unicode() != TextCommandLangTag || (ch + 2)->unicode() > 0x007F || (ch + 2)->unicode() < 0x0020 || *(ch + 3) != TextCommand) {
+						throw Exception(QString("Bad value for key '%1'").arg(QLatin1String(key)));
+					} else {
+						res.append('\\').append('x').append(QString("%1").arg(ch->unicode(), 2, 16, QChar('0')));
+						res.append('\\').append('x').append(QString("%1").arg((ch + 1)->unicode(), 2, 16, QChar('0')));
+						res.append('\\').append('x').append(QString("%1").arg((ch + 2)->unicode(), 2, 16, QChar('0')));
+						res.append('\\').append('x').append(QString("%1").arg((ch + 3)->unicode(), 2, 16, QChar('0')));
+						ch += 3;
+					}
+				} else {
+					throw Exception(QString("Bad value for key '%1'").arg(QLatin1String(key)));
+				}
+			} else {
+				res.append(*ch);
+			}
 		}
 	}
 	if (instr) res.append('"');
 	return (wideChar ? "qsl(" : "QString::fromUtf8(") + res.mid(wideChar ? 2 : 1) + ")";
 }
 
-void writeCppKey(QTextStream &tcpp, const QString &key, const QString &val) {
+void writeCppKey(QTextStream &tcpp, const QByteArray &key, const QString &val) {
 	QString wide = escapeCpp(key, val, true), utf = escapeCpp(key, val, false);
 	if (wide.indexOf(" L\"") < 0) {
 		tcpp << "\t\t\tset(" << key << ", " << wide << ");\n";
@@ -194,17 +338,57 @@ bool genLang(const QString &lang_in, const QString &lang_out) {
 	QString lang_cpp = lang_out + ".cpp", lang_h = lang_out + ".h";
 	QFile f(lang_in);
 	if (!f.open(QIODevice::ReadOnly)) {
-		cout << "Could not open styles input file '" << lang_in.toUtf8().constData() << "'!\n";
+		cout << "Could not open lang input file '" << lang_in.toUtf8().constData() << "'!\n";
 		QCoreApplication::exit(1);
 		return false;
 	}
+	QByteArray checkCodec = f.read(3);
+	if (checkCodec.size() < 3) {
+		cout << "Bad lang input file '" << lang_in.toUtf8().constData() << "'!\n";
+		QCoreApplication::exit(1);
+		return false;
+	}
+	f.seek(0);
 
-	QByteArray blob = f.readAll();
-	const char *text = blob.constData(), *end = blob.constData() + blob.size();
-	f.close();
+	QByteArray data;
+	int skip = 0;
+	if ((checkCodec.at(0) == '\xFF' && checkCodec.at(1) == '\xFE') || (checkCodec.at(0) == '\xFE' && checkCodec.at(1) == '\xFF') || (checkCodec.at(1) == 0)) {
+		QTextStream stream(&f);
+		stream.setCodec("UTF-16");
 
+		QString string = stream.readAll();
+		if (stream.status() != QTextStream::Ok) {
+			cout << "Could not read valid UTF-16 file '" << lang_in.toUtf8().constData() << "'!\n";
+			QCoreApplication::exit(1);
+			return false;
+		}
+		f.close();
+
+		data = string.toUtf8();
+	} else if (checkCodec.at(0) == 0) {
+		QByteArray tmp = "\xFE\xFF" + f.readAll(); // add fake UTF-16 BOM
+		f.close();
+
+		QTextStream stream(&tmp);
+		stream.setCodec("UTF-16");
+		QString string = stream.readAll();
+		if (stream.status() != QTextStream::Ok) {
+			cout << "Could not read valid UTF-16 file '" << lang_in.toUtf8().constData() << "'!\n";
+			QCoreApplication::exit(1);
+			return false;
+		}
+
+		data = string.toUtf8();
+	} else {
+		data = f.readAll();
+		if (checkCodec.at(0) == '\xEF' && checkCodec.at(1) == '\xBB' && checkCodec.at(2) == '\xBF') {
+			skip = 3; // skip UTF-8 BOM
+		}
+	}
+
+	const char *text = data.constData() + skip, *end = text + data.size() - skip;
 	try {
-		while (text != end) {
+		while (text < end) {
 			readKeyValue(text, end);
 		}
 
@@ -220,7 +404,7 @@ Created from \'/Resources/lang.txt\' by \'/MetaLang\' project\n\
 WARNING! All changes made in this file will be lost!\n\
 \n\
 This file is part of Telegram Desktop,\n\
-an unofficial desktop messaging app, see https://telegram.org\n\
+the official desktop version of Telegram messaging app, see https://telegram.org\n\
 \n\
 Telegram Desktop is free software: you can redistribute it and/or modify\n\
 it under the terms of the GNU General Public License as published by\n\
@@ -233,48 +417,66 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n\
 GNU General Public License for more details.\n\
 \n\
 Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE\n\
-Copyright (c) 2014 John Preston, https://tdesktop.com\n\
+Copyright (c) 2014 John Preston, https://desktop.telegram.org\n\
 */\n";
 			th << "#pragma once\n\n";
+
+			for (int i = 0, l = tagsOrder.size(); i < l; ++i) {
+				th << "enum lngtag_" << tagsOrder[i] << " { lt_" << tagsOrder[i] << " = " << i << " };\n";
+			}
+			th << "static const ushort lngtags_cnt = " << tagsOrder.size() << ";\n";
+			th << "static const ushort lngtags_max_counted_values = " << MaxCountedValues << ";\n";
+			th << "\n";
+
 			th << "enum LangKey {\n";
 			for (int i = 0, l = keysOrder.size(); i < l; ++i) {
-				th << "\t" << keysOrder[i] << (i ? "" : " = 0") << ",\n";
+				if (keysTags[keysOrder[i]].isEmpty()) {
+					th << "\t" << keysOrder[i] << (i ? "" : " = 0") << ",\n";
+				} else {
+					th << "\t" << keysOrder[i] << "__tagged" << (i ? "" : " = 0") << ",\n";
+					QMap<QByteArray, QVector<QString> > &countedTags(keysCounted[keysOrder[i]]);
+					if (!countedTags.isEmpty()) {
+						for (QMap<QByteArray, QVector<QString> >::const_iterator j = countedTags.cbegin(), e = countedTags.cend(); j != e; ++j) {
+							const QVector<QString> &counted(*j);
+							for (int k = 0, s = counted.size(); k < s; ++k) {
+								th << "\t" << keysOrder[i] << "__" + j.key() + QString::number(k).toUtf8() << ",\n";
+							}
+						}
+					}
+				}
 			}
-			th << "\n\tlng_keys_cnt\n";
+			th << "\n\tlngkeys_cnt\n";
 			th << "};\n\n";
-			th << "QString lang(LangKey key);\n";
-			th << "inline QString langDayOfMonth(const QDate &date) {\n";
-			th << "\tint32 month = date.month(), day = date.day();\n";
-			th << "\treturn (month > 0 && month <= 12) ? lang(lng_month_day).replace(qsl(\"{month}\"), lang(LangKey(lng_month1 + month - 1))).replace(qsl(\"{day}\"), QString::number(day)) : qsl(\"{err}\");\n";
-			th << "}\n\n";
-			th << "inline QString langDayOfWeek(const QDate &date) {\n";
-			th << "\tint32 day = date.dayOfWeek();\n";
-			th << "\treturn (day > 0 && day <= 7) ? lang(LangKey(lng_weekday1 + day - 1)) : qsl(\"{err}\");\n";
-			th << "}\n\n";
-			th << "Qt::LayoutDirection langDir();\n\n";
-			th << "class LangLoader {\n";
-			th << "public:\n";
-			th << "\tconst QString &errors() const;\n";
-			th << "\tconst QString &warnings() const;\n\n";
-			th << "protected:\n";
-			th << "\tLangLoader() : _checked(false) {\n";
-			th << "\t\tmemset(_found, 0, sizeof(_found));\n";
-			th << "\t}\n\n";
-			th << "\tbool feedKeyValue(const QString &key, const QString &value);\n\n";
-			th << "\tvoid error(const QString &text) {\n";
-			th << "\t\t_err.push_back(text);\n";
-			th << "\t}\n";
-			th << "\tvoid warning(const QString &text) {\n";
-			th << "\t\t_warn.push_back(text);\n";
-			th << "\t}\n\n";
-			th << "private:\n";
-			th << "\tmutable QStringList _err, _warn;\n";
-			th << "\tmutable QString _errors, _warnings;\n";
-			th << "\tmutable bool _checked;\n";
-			th << "\tbool _found[lng_keys_cnt];\n\n";
-			th << "\tLangLoader(const LangLoader &);\n";
-			th << "\tLangLoader &operator=(const LangLoader &);\n";
-			th << "};\n";
+
+			th << "LangString lang(LangKey key);\n\n";
+			th << "LangString langOriginal(LangKey key);\n\n";
+
+			for (int i = 0, l = keysOrder.size(); i < l; ++i) {
+				QVector<QByteArray> &tagsList(keysTags[keysOrder[i]]);
+				if (tagsList.isEmpty()) continue;
+
+				QMap<QByteArray, QVector<QString> > &countedTags(keysCounted[keysOrder[i]]);
+				th << "inline LangString " << keysOrder[i] << "(";
+				for (int j = 0, s = tagsList.size(); j < s; ++j) {
+					if (countedTags[tagsList[j]].isEmpty()) {
+						th << "lngtag_" << tagsList[j] << ", const QString &" << tagsList[j] << "__val";
+					} else {
+						th << "lngtag_" << tagsList[j] << ", float64 " << tagsList[j] << "__val";
+					}
+					if (j + 1 < s) th << ", ";
+				}
+				th << ") {\n";
+				th << "\treturn lang(" << keysOrder[i] << "__tagged)";
+				for (int j = 0, s = tagsList.size(); j < s; ++j) {
+					if (countedTags[tagsList[j]].isEmpty()) {
+						th << ".tag(lt_" << tagsList[j] << ", " << tagsList[j] << "__val)";
+					} else {
+						th << ".tag(lt_" << tagsList[j] << ", langCounted(" << keysOrder[i] << "__" << tagsList[j] << "0, lt_" << tagsList[j] << ", " << tagsList[j] << "__val))";
+					}
+				}
+				th << ";\n";
+				th << "}\n";
+			}
 
 			tcpp << "\
 /*\n\
@@ -283,7 +485,7 @@ Created from \'/Resources/lang.txt\' by \'/MetaLang\' project\n\
 WARNING! All changes made in this file will be lost!\n\
 \n\
 This file is part of Telegram Desktop,\n\
-an unofficial desktop messaging app, see https://telegram.org\n\
+the official desktop version of Telegram messaging app, see https://telegram.org\n\
 \n\
 Telegram Desktop is free software: you can redistribute it and/or modify\n\
 it under the terms of the GNU General Public License as published by\n\
@@ -296,68 +498,148 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n\
 GNU General Public License for more details.\n\
 \n\
 Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE\n\
-Copyright (c) 2014 John Preston, https://tdesktop.com\n\
+Copyright (c) 2014 John Preston, https://desktop.telegram.org\n\
 */\n";
 			tcpp << "#include \"stdafx.h\"\n#include \"lang.h\"\n\n";
 			tcpp << "namespace {\n";
-			tcpp << "\tQt::LayoutDirection _langDir = Qt::" << (layoutDirection == "LTR" ? "LeftToRight" : "RightToLeft") << ";\n";
-			tcpp << "\tconst char *_langKeyNames[lng_keys_cnt + 1] = {\n";
+
+			tcpp << "\tconst char *_langKeyNames[lngkeys_cnt] = {\n";
 			for (int i = 0, l = keysOrder.size(); i < l; ++i) {
-				tcpp << "\t\t\"" << keysOrder[i] << "\",\n";
+				if (keysTags[keysOrder[i]].isEmpty()) {
+					tcpp << "\t\t\"" << keysOrder[i] << "\",\n";
+				} else {
+					tcpp << "\t\t\"" << keysOrder[i] << "__tagged\",\n";
+					QMap<QByteArray, QVector<QString> > &countedTags(keysCounted[keysOrder[i]]);
+					if (!countedTags.isEmpty()) {
+						for (QMap<QByteArray, QVector<QString> >::const_iterator j = countedTags.cbegin(), e = countedTags.cend(); j != e; ++j) {
+							const QVector<QString> &counted(*j);
+							for (int k = 0, s = counted.size(); k < s; ++k) {
+								tcpp << "\t\t\"" << keysOrder[i] << "__" + j.key() + QString::number(k).toUtf8() << "\",\n";
+							}
+						}
+					}
+				}
 			}
-			tcpp << "\t\t\"lng_keys_cnt\"\n";
 			tcpp << "\t};\n\n";
-			tcpp << "\tQString _langValues[lng_keys_cnt + 1];\n\n";
+
+			tcpp << "\tLangString _langValues[lngkeys_cnt], _langValuesOriginal[lngkeys_cnt];\n\n";
 			tcpp << "\tvoid set(LangKey key, const QString &val) {\n";
 			tcpp << "\t\t_langValues[key] = val;\n";
 			tcpp << "\t}\n\n";
+
 			tcpp << "\tclass LangInit {\n";
 			tcpp << "\tpublic:\n";
 			tcpp << "\t\tLangInit() {\n";
 			for (int i = 0, l = keysOrder.size(); i < l; ++i) {
-				writeCppKey(tcpp, keysOrder[i], keys[keysOrder[i]]);
+				writeCppKey(tcpp, keysOrder[i] + (keysTags[keysOrder[i]].isEmpty() ? "" : "__tagged"), keys[keysOrder[i]]);
+
+				QMap<QByteArray, QVector<QString> > &countedTags(keysCounted[keysOrder[i]]);
+				if (!countedTags.isEmpty()) {
+					for (QMap<QByteArray, QVector<QString> >::const_iterator j = countedTags.cbegin(), e = countedTags.cend(); j != e; ++j) {
+						const QVector<QString> &counted(*j);
+						for (int k = 0, s = counted.size(); k < s; ++k) {
+							writeCppKey(tcpp, keysOrder[i] + "__" + j.key() + QString::number(k).toUtf8(), counted[k]);
+						}
+					}
+				}
 			}
-			tcpp << "\t\t\tset(lng_keys_cnt, QString());\n";
 			tcpp << "\t\t}\n";
 			tcpp << "\t};\n\n";
-			tcpp << "\tLangInit _langInit;\n";
-			tcpp << "}\n\n";
 
-			tcpp << "QString lang(LangKey key) {\n";
-			tcpp << "\treturn _langValues[(key < 0 || key > lng_keys_cnt) ? lng_keys_cnt : key];\n";
-			tcpp << "}\n\n";
+			tcpp << "\tLangInit _langInit;\n\n";
 
-			tcpp << "Qt::LayoutDirection langDir() {\n";
-			tcpp << "\treturn _langDir;\n";
-			tcpp << "}\n\n";
-
-			tcpp << "bool LangLoader::feedKeyValue(const QString &key, const QString &value) {\n";
-			tcpp << "\tif (key == qsl(\"direction\")) {\n";
-			tcpp << "\t\tif (value == qsl(\"LTR\")) {\n";
-			tcpp << "\t\t\t_langDir = Qt::LeftToRight;\n";
-			tcpp << "\t\t\treturn true;\n";
-			tcpp << "\t\t} else if (value == qsl(\"RTL\")) {\n";
-			tcpp << "\t\t\t_langDir = Qt::RightToLeft;\n";
-			tcpp << "\t\t\treturn true;\n";
-			tcpp << "\t\t} else {\n";
-			tcpp << "\t\t\t_err.push_back(qsl(\"Bad value for 'direction' key.\"));\n";
-			tcpp << "\t\t\treturn false;\n";
+			tcpp << "\tinline bool _lngEquals(const QByteArray &key, int from, int len, const char *value, int size) {\n";
+			tcpp << "\t\tif (size != len || from + len > key.size()) return false;\n";
+			tcpp << "\t\tfor (const char *v = key.constData() + from, *e = v + len; v != e; ++v, ++value) {\n";
+			tcpp << "\t\t\tif (*v != *value) return false;\n";
 			tcpp << "\t\t}\n";
+			tcpp << "\t\treturn true; \n";
 			tcpp << "\t}\n";
-			tcpp << "\tif (key.size() < 5 || key.midRef(0, 4) != qsl(\"lng_\")) {\n";
-			tcpp << "\t\t_err.push_back(qsl(\"Bad key name '%1'\").arg(key));\n";
-			tcpp << "\t\treturn false;\n";
-			tcpp << "\t}\n\n";
+
+			tcpp << "}\n\n";
+
+			tcpp << "#define LNG_EQUALS_PART(key, from, len, value) _lngEquals(key, from, len, value, sizeof(value) - 1)\n";
+			tcpp << "#define LNG_EQUALS_TAIL(key, from, value) _lngEquals(key, from, key.size() - from, value, sizeof(value) - 1)\n";
+			tcpp << "#define LNG_EQUALS(key, value) _lngEquals(key, 0, key.size(), value, sizeof(value) - 1)\n\n";
+
+			tcpp << "LangString lang(LangKey key) {\n";
+			tcpp << "\treturn (key < 0 || key > lngkeys_cnt) ? QString() : _langValues[key];\n";
+			tcpp << "}\n\n";
+
+			tcpp << "LangString langOriginal(LangKey key) {\n";
+			tcpp << "\treturn (key < 0 || key > lngkeys_cnt || _langValuesOriginal[key] == qsl(\"{}\")) ? QString() : (_langValuesOriginal[key].isEmpty() ? _langValues[key] : _langValuesOriginal[key]);\n";
+			tcpp << "}\n\n";
+
+			tcpp << "const char *langKeyName(LangKey key) {\n";
+			tcpp << "\treturn (key < 0 || key > lngkeys_cnt) ? \"\" : _langKeyNames[key];\n";
+			tcpp << "}\n\n";
+
+			tcpp << "ushort LangLoader::tagIndex(const QByteArray &tag) const {\n";
+			tcpp << "\tif (tag.isEmpty()) return lngtags_cnt;\n\n";
+			if (!tags.isEmpty()) {
+				QString tab("\t");
+				tcpp << "\tconst char *ch = tag.constData(), *e = tag.constData() + tag.size();\n";
+				QByteArray current;
+				int depth = current.size();
+				tcpp << "\tswitch (*ch) {\n";
+				for (LangTags::const_iterator i = tags.cbegin(), j = i + 1, e = tags.cend(); i != e; ++i) {
+					QByteArray tag = i.key();
+					while (depth > 0 && tag.mid(0, depth) != current) {
+						tcpp << tab.repeated(depth + 1) << "}\n";
+						current.chop(1);
+						--depth;
+						tcpp << tab.repeated(depth + 1) << "break;\n";
+					}
+					do {
+						if (tag == current) break;
+
+						char ich = i.key().at(current.size());
+						tcpp << tab.repeated(current.size() + 1) << "case '" << ich << "':\n";
+						if (j == e || ich != ((j.key().size() > depth) ? j.key().at(depth) : 0)) {
+							if (tag == current + ich) {
+								tcpp << tab.repeated(depth + 1) << "\tif (ch + " << (depth + 1) << " == e) return lt_" << tag << ";\n";
+							} else {
+								tcpp << tab.repeated(depth + 1) << "\tif (LNG_EQUALS_TAIL(tag, " << (depth + 1) << ", \"" << i.key().mid(depth + 1) << "\")) return lt_" << tag << ";\n";
+							}
+							tcpp << tab.repeated(depth + 1) << "break;\n";
+							break;
+						}
+
+						++depth;
+						current += ich;
+
+						if (tag == current) {
+							tcpp << tab.repeated(depth + 1) << "if (ch + " << depth << " == e) {\n";
+							tcpp << tab.repeated(depth + 1) << "\treturn lt_" << tag << ";\n";
+							tcpp << tab.repeated(depth + 1) << "}\n";
+						}
+
+						tcpp << tab.repeated(depth + 1) << "if (ch + " << depth << " < e) switch (*(ch + " << depth << ")) {\n";
+					} while (true);
+					++j;
+				}
+				while (QByteArray() != current) {
+					tcpp << tab.repeated(depth + 1) << "}\n";
+					current.chop(1);
+					--depth;
+					tcpp << tab.repeated(depth + 1) << "break;\n";
+				}
+				tcpp << "\t}\n\n";
+			}
+			tcpp << "\treturn lngtags_cnt;\n";
+			tcpp << "}\n\n";
+
+			tcpp << "LangKey LangLoader::keyIndex(const QByteArray &key) const {\n";
+			tcpp << "\tif (key.size() < 5 || !LNG_EQUALS_PART(key, 0, 4, \"lng_\")) return lngkeys_cnt;\n\n";
 			if (!keys.isEmpty()) {
 				QString tab("\t");
-				tcpp << "\tLangKey keyIndex = lng_keys_cnt;\n";
-				tcpp << "\tconst QChar *ch = key.constData(), *e = key.constData() + key.size();\n";
-				QString current("lng_");
+				tcpp << "\tconst char *ch = key.constData(), *e = key.constData() + key.size();\n";
+				QByteArray current("lng_");
 				int depth = current.size();
-				tcpp << "\tswitch ((ch + " << depth << ")->unicode()) {\n";
+				tcpp << "\tswitch (*(ch + " << depth << ")) {\n";
 				for (LangKeys::const_iterator i = keys.cbegin(), j = i + 1, e = keys.cend(); i != e; ++i) {
-					QString key = i.key();
-					while (key.midRef(0, depth) != current) {
+					QByteArray key = i.key();
+					while (key.mid(0, depth) != current) {
 						tcpp << tab.repeated(depth - 3) << "}\n";
 						current.chop(1);
 						--depth;
@@ -366,13 +648,13 @@ Copyright (c) 2014 John Preston, https://tdesktop.com\n\
 					do {
 						if (key == current) break;
 							
-						QChar ich = i.key().at(current.size());
+						char ich = i.key().at(current.size());
 						tcpp << tab.repeated(current.size() - 3) << "case '" << ich << "':\n";
 						if (j == e || ich != ((j.key().size() > depth) ? j.key().at(depth) : 0)) {
 							if (key == current + ich) {
-								tcpp << tab.repeated(depth - 3) << "\tif (ch + " << (depth + 1) << " == e) keyIndex = " << key << ";\n";
+								tcpp << tab.repeated(depth - 3) << "\tif (ch + " << (depth + 1) << " == e) return " << key << (keysTags[key].isEmpty() ? "" : "__tagged") << ";\n";
 							} else {
-								tcpp << tab.repeated(depth - 3) << "\tif (key.midRef(" << (depth + 1) << ") == qsl(\"" << i.key().mid(depth + 1) << "\")) keyIndex = " << key << ";\n";
+								tcpp << tab.repeated(depth - 3) << "\tif (LNG_EQUALS_TAIL(key, " << (depth + 1) << ", \"" << i.key().mid(depth + 1) << "\")) return " << key << (keysTags[key].isEmpty() ? "" : "__tagged") << ";\n";
 							}
 							tcpp << tab.repeated(depth - 3) << "break;\n";
 							break;
@@ -383,52 +665,81 @@ Copyright (c) 2014 John Preston, https://tdesktop.com\n\
 
 						if (key == current) {
 							tcpp << tab.repeated(depth - 3) << "if (ch + " << depth << " == e) {\n";
-							tcpp << tab.repeated(depth - 3) << "\tkeyIndex = " << key << ";\n";
+							tcpp << tab.repeated(depth - 3) << "\treturn " << key << (keysTags[key].isEmpty() ? "" : "__tagged") << ";\n";
 							tcpp << tab.repeated(depth - 3) << "}\n";
 						}
 
-						tcpp << tab.repeated(depth - 3) << "if (ch + " << depth << " < e) switch ((ch + " << depth << ")->unicode()) {\n";
+						tcpp << tab.repeated(depth - 3) << "if (ch + " << depth << " < e) switch (*(ch + " << depth << ")) {\n";
 					} while (true);
 					++j;
 				}
-				while (QString("lng_") != current) {
+				while (QByteArray("lng_") != current) {
 					tcpp << tab.repeated(depth - 3) << "}\n";
 					current.chop(1);
 					--depth;
 					tcpp << tab.repeated(depth - 3) << "break;\n";
 				}
 				tcpp << "\t}\n\n";
-				tcpp << "\tif (keyIndex < lng_keys_cnt) {\n";
-				tcpp << "\t\t_found[keyIndex] = 1;\n";
-				tcpp << "\t\t_langValues[keyIndex] = value;\n";
-				tcpp << "\t\treturn true;\n";
+			}
+			tcpp << "\treturn lngkeys_cnt;\n";
+			tcpp << "}\n\n";
+
+			tcpp << "bool LangLoader::tagReplaced(LangKey key, ushort tag) const {\n";
+			if (!tags.isEmpty()) {
+				tcpp << "\tswitch (key) {\n";
+				for (int i = 0, l = keysOrder.size(); i < l; ++i) {
+					QVector<QByteArray> &tagsList(keysTags[keysOrder[i]]);
+					if (tagsList.isEmpty()) continue;
+
+					tcpp << "\tcase " << keysOrder[i] << "__tagged: {\n";
+					tcpp << "\t\tswitch (tag) {\n";
+					for (int j = 0, s = tagsList.size(); j < s; ++j) {
+						tcpp << "\t\tcase lt_" << tagsList[j] << ":\n";
+					}
+					tcpp << "\t\t\treturn true;\n";
+					tcpp << "\t\t}\n";
+					tcpp << "\t} break;\n";
+				}
 				tcpp << "\t}\n\n";
 			}
-			tcpp << "\t_err.push_back(qsl(\"Unknown key name '%1'\").arg(key));\n";
+			tcpp << "\treturn false;";
+			tcpp << "}\n\n";
+
+			tcpp << "LangKey LangLoader::subkeyIndex(LangKey key, ushort tag, ushort index) const {\n";
+			tcpp << "\tif (index >= lngtags_max_counted_values) return lngkeys_cnt;\n\n";
+			if (!tags.isEmpty()) {
+				tcpp << "\tswitch (key) {\n";
+				for (int i = 0, l = keysOrder.size(); i < l; ++i) {
+					QVector<QByteArray> &tagsList(keysTags[keysOrder[i]]);
+					if (tagsList.isEmpty()) continue;
+
+					QMap<QByteArray, QVector<QString> > &countedTags(keysCounted[keysOrder[i]]);
+					tcpp << "\tcase " << keysOrder[i] << "__tagged: {\n";
+					tcpp << "\t\tswitch (tag) {\n";
+					for (int j = 0, s = tagsList.size(); j < s; ++j) {
+						if (!countedTags[tagsList[j]].isEmpty()) {
+							tcpp << "\t\tcase lt_" << tagsList[j] << ": return LangKey(" << keysOrder[i] << "__" << tagsList[j] << "0 + index);\n";
+						}
+					}
+					tcpp << "\t\t}\n";
+					tcpp << "\t} break;\n";
+				}
+				tcpp << "\t}\n\n";
+			}
+			tcpp << "\treturn lngkeys_cnt;";
+			tcpp << "}\n\n";
+
+			tcpp << "bool LangLoader::feedKeyValue(LangKey key, const QString &value) {\n";
+			tcpp << "\tif (key < lngkeys_cnt) {\n";
+			tcpp << "\t\t_found[key] = 1;\n";
+			tcpp << "\t\tif (_langValuesOriginal[key].isEmpty()) {\n";
+			tcpp << "\t\t\t_langValuesOriginal[key] = _langValues[key].isEmpty() ? qsl(\"{}\") : _langValues[key];\n";
+			tcpp << "\t\t}\n";
+			tcpp << "\t\t_langValues[key] = value;\n";
+			tcpp << "\t\treturn true;\n";
+			tcpp << "\t}\n";
 			tcpp << "\treturn false;\n";
 			tcpp << "}\n\n";
-
-			tcpp << "const QString &LangLoader::errors() const {\n";
-			tcpp << "\tif (_errors.isEmpty() && !_err.isEmpty()) {\n";
-			tcpp << "\t\t_errors = _err.join('\\n');\n";
-			tcpp << "\t}\n";
-			tcpp << "\treturn _errors;\n";
-			tcpp << "}\n\n";
-
-			tcpp << "const QString &LangLoader::warnings() const {\n";
-			tcpp << "\tif (!_checked) {\n";
-			tcpp << "\t\tfor (int32 i = 0; i < lng_keys_cnt; ++i) {\n";
-			tcpp << "\t\t\tif (!_found[i]) {\n";
-			tcpp << "\t\t\t\t_warn.push_back(qsl(\"No value found for key '%1'\").arg(_langKeyNames[i]));\n";
-			tcpp << "\t\t\t}\n";
-			tcpp << "\t\t}\n";
-			tcpp << "\t\t_checked = true;\n";
-			tcpp << "\t}\n";
-			tcpp << "\tif (_warnings.isEmpty() && !_warn.isEmpty()) {\n";
-			tcpp << "\t\t_warnings = _warn.join('\\n');\n";
-			tcpp << "\t}\n";
-			tcpp << "\treturn _warnings;\n";
-			tcpp << "}\n";
 		}
 
 		QFile cpp(lang_cpp), h(lang_h);

Telegram/SourceFiles/_other/genlang.h

@@ -1,6 +1,6 @@
 /*
 This file is part of Telegram Desktop,
-an unofficial desktop messaging app, see https://telegram.org
+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
@@ -13,7 +13,7 @@ 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://tdesktop.com
+Copyright (c) 2014 John Preston, https://desktop.telegram.org
 */
 #include <QtCore/QMap>
 #include <QtCore/QVector>

Telegram/SourceFiles/_other/genstyles.cpp

@@ -1,6 +1,6 @@
 /*
 This file is part of Telegram Desktop,
-an unofficial desktop messaging app, see https://telegram.org
+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
@@ -13,7 +13,7 @@ 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://tdesktop.com
+Copyright (c) 2014 John Preston, https://desktop.telegram.org
 */
 #include "genstyles.h"
 
@@ -361,7 +361,7 @@ Created from \'/Resources/style_classes.txt\' by \'/MetaStyle\' project\n\
 WARNING! All changes made in this file will be lost!\n\
 \n\
 This file is part of Telegram Desktop,\n\
-an unofficial desktop messaging app, see https://telegram.org\n\
+the official desktop version of Telegram messaging app, see https://telegram.org\n\
 \n\
 Telegram Desktop is free software: you can redistribute it and/or modify\n\
 it under the terms of the GNU General Public License as published by\n\
@@ -374,7 +374,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n\
 GNU General Public License for more details.\n\
 \n\
 Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE\n\
-Copyright (c) 2014 John Preston, https://tdesktop.com\n\
+Copyright (c) 2014 John Preston, https://desktop.telegram.org\n\
 */\n";
 			tout << "#pragma once\n\n#include \"style.h\"\n\nnamespace style {\n";
 			for (int i = 0, l = byIndex.size(); i < l; ++i) {
@@ -845,7 +845,7 @@ ScalarValue prepareSprite(int variant, const char *&text, const char *end) {
 		QImage lastCopy = variantSprites[variantsCount - 1].copy(adjustPx(varLast, sprite.x(), true), adjustPx(varLast, sprite.y(), true), adjustPx(varLast, sprite.width(), true), adjustPx(varLast, sprite.height(), true));
 		for (int i = 1; i < variantsCount - 1; ++i) {
 			QPainter p(&variantSprites[i]);
-			QPixmap copy = QPixmap::fromImage(lastCopy.scaled(adjustPx(variants[i], sprite.width(), true), adjustPx(variants[i], sprite.height(), true), Qt::IgnoreAspectRatio, Qt::SmoothTransformation));
+			QPixmap copy = QPixmap::fromImage(lastCopy.scaled(adjustPx(variants[i], sprite.width(), true), adjustPx(variants[i], sprite.height(), true), Qt::IgnoreAspectRatio, Qt::SmoothTransformation), Qt::ColorOnly);
 			p.drawPixmap(QPoint(adjustPx(variants[i], sprite.x(), true), adjustPx(variants[i], sprite.y(), true)), copy);
 		}
 
@@ -1365,7 +1365,7 @@ bool genStyles(const QString &classes_in, const QString &classes_out, const QStr
 	}
 	variantSprites[variantsCount - 1] = QImage(spriteLast);
 
-	QPixmap spriteMaxPix = QPixmap::fromImage(variantSprites[variantsCount - 1]);
+	QPixmap spriteMaxPix = QPixmap::fromImage(variantSprites[variantsCount - 1], Qt::ColorOnly);
 	spriteMax = &spriteMaxPix;
 
 	if (!variantSprites[0].width() || !variantSprites[0].height()) {
@@ -1498,7 +1498,7 @@ Created from \'/Resources/style.txt\' by \'/MetaStyle\' project\n\
 WARNING! All changes made in this file will be lost!\n\
 \n\
 This file is part of Telegram Desktop,\n\
-an unofficial desktop messaging app, see https://telegram.org\n\
+the official desktop version of Telegram messaging app, see https://telegram.org\n\
 \n\
 Telegram Desktop is free software: you can redistribute it and/or modify\n\
 it under the terms of the GNU General Public License as published by\n\
@@ -1511,7 +1511,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n\
 GNU General Public License for more details.\n\
 \n\
 Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE\n\
-Copyright (c) 2014 John Preston, https://tdesktop.com\n\
+Copyright (c) 2014 John Preston, https://desktop.telegram.org\n\
 */\n";
 			tout << "#pragma once\n\n#include \"style.h\"\n\nnamespace st {\n";
 			tcpp << "\
@@ -1521,7 +1521,7 @@ Created from \'/Resources/style.txt\' by \'/MetaStyle\' project\n\
 WARNING! All changes made in this file will be lost!\n\
 \n\
 This file is part of Telegram Desktop,\n\
-an unofficial desktop messaging app, see https://telegram.org\n\
+the official desktop version of Telegram messaging app, see https://telegram.org\n\
 \n\
 Telegram Desktop is free software: you can redistribute it and/or modify\n\
 it under the terms of the GNU General Public License as published by\n\
@@ -1534,7 +1534,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n\
 GNU General Public License for more details.\n\
 \n\
 Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE\n\
-Copyright (c) 2014 John Preston, https://tdesktop.com\n\
+Copyright (c) 2014 John Preston, https://desktop.telegram.org\n\
 */\n";
 			tcpp << "#include \"stdafx.h\"\n#include \"style_auto.h\"\n\nnamespace {\n";
 			for (int i = 0, l = scalars.size(); i < l; ++i) {

Telegram/SourceFiles/_other/genstyles.h

@@ -1,6 +1,6 @@
 /*
 This file is part of Telegram Desktop,
-an unofficial desktop messaging app, see https://telegram.org
+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
@@ -13,7 +13,7 @@ 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://tdesktop.com
+Copyright (c) 2014 John Preston, https://desktop.telegram.org
 */
 #include <QtCore/QMap>
 #include <QtCore/QVector>

Telegram/SourceFiles/_other/memain.cpp

@@ -1,6 +1,6 @@
 /*
 This file is part of Telegram Desktop,
-an unofficial desktop messaging app, see https://telegram.org
+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
@@ -13,7 +13,7 @@ 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://tdesktop.com
+Copyright (c) 2014 John Preston, https://desktop.telegram.org
 */
 #include "memain.h"
 

Telegram/SourceFiles/_other/memain.h

@@ -1,6 +1,6 @@
 /*
 This file is part of Telegram Desktop,
-an unofficial desktop messaging app, see https://telegram.org
+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
@@ -13,7 +13,7 @@ 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://tdesktop.com
+Copyright (c) 2014 John Preston, https://desktop.telegram.org
 */
 #include <QtCore/QTimer>
 

Telegram/SourceFiles/_other/mlmain.cpp

@@ -1,6 +1,6 @@
 /*
 This file is part of Telegram Desktop,
-an unofficial desktop messaging app, see https://telegram.org
+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
@@ -13,12 +13,12 @@ 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://tdesktop.com
+Copyright (c) 2014 John Preston, https://desktop.telegram.org
 */
 #include "mlmain.h"
 
 int main(int argc, char *argv[]) {
-	QString lang_in("lang.txt"), lang_out("lang");
+	QString lang_in("lang.strings"), lang_out("lang");
 	for (int i = 0; i < argc; ++i) {
 		if (string("-lang_in") == argv[i]) {
 			if (++i < argc) lang_in = argv[i];

Telegram/SourceFiles/_other/mlmain.h

@@ -1,6 +1,6 @@
 /*
 This file is part of Telegram Desktop,
-an unofficial desktop messaging app, see https://telegram.org
+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
@@ -13,7 +13,7 @@ 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://tdesktop.com
+Copyright (c) 2014 John Preston, https://desktop.telegram.org
 */
 #include <QtCore/QTimer>
 

Telegram/SourceFiles/_other/msmain.cpp

@@ -1,6 +1,6 @@
 /*
 This file is part of Telegram Desktop,
-an unofficial desktop messaging app, see https://telegram.org
+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
@@ -13,7 +13,7 @@ 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://tdesktop.com
+Copyright (c) 2014 John Preston, https://desktop.telegram.org
 */
 #include "msmain.h"
 #include <QtCore/QDir>

Telegram/SourceFiles/_other/msmain.h

@@ -1,6 +1,6 @@
 /*
 This file is part of Telegram Desktop,
-an unofficial desktop messaging app, see https://telegram.org
+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
@@ -13,7 +13,7 @@ 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://tdesktop.com
+Copyright (c) 2014 John Preston, https://desktop.telegram.org
 */
 #include <QtCore/QTimer>
 

Telegram/SourceFiles/_other/packer.cpp

@@ -1,6 +1,6 @@
 /*
 This file is part of Telegram Desktop,
-an unofficial desktop messaging app, see https://telegram.org
+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
@@ -13,7 +13,7 @@ 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://tdesktop.com
+Copyright (c) 2014 John Preston, https://desktop.telegram.org
 */
 #include "packer.h"
 
@@ -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;
 		}
 	}
 
@@ -388,7 +401,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 +424,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;

Telegram/SourceFiles/_other/packer.h

@@ -1,6 +1,6 @@
 /*
 This file is part of Telegram Desktop,
-an unofficial desktop messaging app, see https://telegram.org
+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
@@ -13,7 +13,7 @@ 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://tdesktop.com
+Copyright (c) 2014 John Preston, https://desktop.telegram.org
 */
 #pragma once
 

Telegram/SourceFiles/_other/prepare.cpp

@@ -1,6 +1,6 @@
 /*
 This file is part of Telegram Desktop,
-an unofficial desktop messaging app, see https://telegram.org
+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
@@ -13,10 +13,12 @@ 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://tdesktop.com
+Copyright (c) 2014 John Preston, https://desktop.telegram.org
 */
 #include "prepare.h"
 
+bool DevChannel = false;
+
 int prepare(QFileInfo f, QStringList paths) {
 	if (paths.isEmpty()) {
 		cout << "No -path args were passed :(\n";
@@ -28,7 +30,7 @@ int prepare(QFileInfo f, QStringList paths) {
 	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());
+		QRegularExpressionMatch m = QRegularExpression("/tsetup\\.((\\d+)\\.(\\d+)\\.(\\d+))(?:\\.dev)?\\.exe$").match(i->absoluteFilePath());
 		if (!m.hasMatch()) continue;
 
 		int version = m.captured(2).toInt() * 1000000 + m.captured(3).toInt() * 1000 + m.captured(4).toInt();
@@ -40,15 +42,18 @@ int prepare(QFileInfo f, QStringList paths) {
 	}
 
 	if (!lastVersion) {
-		cout << "No tsetup.X.Y.Z.exe found :(\n";
+		cout << "No tsetup.X.Y.Z.exe or tsetup.X.Y.Z.dev.exe found :(\n";
 		return -1;
 	}
 
-	cout << "Last version: " << lastVersionStr.toUtf8().constData() << " (" << lastVersion << "), executing packer..\n";
+	cout << "Last version: " << (lastVersionStr + (DevChannel ? ".dev" : "")).toUtf8().constData() << " (" << lastVersion << "), executing packer..\n";
 
-	QDir dir("deploy/" + lastVersionStr);
+	QDir dir("deploy/" + lastVersionStr + (DevChannel ? ".dev" : ""));
 	if (dir.exists()) {
-		cout << "Version " << lastVersionStr.toUtf8().constData() << " already exists in /deploy..\n";
+		cout << "Version " << (lastVersionStr + (DevChannel ? ".dev" : "")).toUtf8().constData() << " already exists in /deploy..\n";
+		return -1;
+	} else if (QDir("deploy/" + lastVersionStr + (DevChannel ? "" : ".dev")).exists()) {
+		cout << "Version " << (lastVersionStr + (DevChannel ? "" : ".dev")).toUtf8().constData() << " already exists in /deploy..\n";
 		return -1;
 	}
 
@@ -56,6 +61,7 @@ int prepare(QFileInfo f, QStringList paths) {
 	for (QStringList::iterator i = paths.begin(), e = paths.end(); i != e; ++i) {
 		packer += " -path " + *i;
 	}
+	if (DevChannel) packer += " -dev";
 
 	int res = system(packer.toUtf8().constData());
 
@@ -65,11 +71,11 @@ int prepare(QFileInfo f, QStringList paths) {
 
 	paths.push_back("Telegram.pdb");
 	paths.push_back("Updater.pdb");
-	paths.push_back("tsetup." + lastVersionStr + ".exe");
+	paths.push_back("tsetup." + lastVersionStr + (DevChannel ? ".dev" : "") + ".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";
+		if (!QFile::copy(*i, "deploy/" + lastVersionStr + (DevChannel ? ".dev" : "") + "/" + *i)) {
+			cout << "Could not copy " << i->toUtf8().constData() << " to deploy/" << (lastVersionStr + (DevChannel ? ".dev" : "")).toUtf8().constData() << "\n";
 			return -1;
 		}
 		cout << "Copied " << i->toUtf8().constData() << "..\n";
@@ -78,7 +84,7 @@ int prepare(QFileInfo f, QStringList paths) {
 		QFile::remove(*i);
 	}
 
-	cout << "Update created in deploy/" << lastVersionStr.toUtf8().constData() << "\n";
+	cout << "Update created in deploy/" << (lastVersionStr + (DevChannel ? ".dev" : "")).toUtf8().constData() << "\n";
 
 	return 0;
 }
@@ -91,9 +97,10 @@ int main(int argc, char *argv[])
 	for (int i = 1; i < argc; ++i) {
 		if (string(argv[i]) == "-path" && i + 1 < argc) {
 			paths.push_back(QString(argv[i + 1]));
+		} else if (string(argv[i]) == "-dev") {
+			DevChannel = true;
 		}
 	}
 	int res = prepare(f, paths);
-	system("PAUSE");
 	return res;
 }

Telegram/SourceFiles/_other/prepare.h

@@ -1,6 +1,6 @@
 /*
 This file is part of Telegram Desktop,
-an unofficial desktop messaging app, see https://telegram.org
+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
@@ -13,7 +13,7 @@ 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://tdesktop.com
+Copyright (c) 2014 John Preston, https://desktop.telegram.org
 */
 #pragma once
 

Telegram/SourceFiles/_other/updater.cpp

@@ -1,6 +1,6 @@
 /*
 This file is part of Telegram Desktop,
-an unofficial desktop messaging app, see https://telegram.org
+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
@@ -13,13 +13,13 @@ 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://tdesktop.com
+Copyright (c) 2014 John Preston, https://desktop.telegram.org
 */
 #include "updater.h"
 
 bool _debug = false;
 
-wstring exeName, exeDir;
+wstring exeName, exeDir, updateTo;
 
 bool equal(const wstring &a, const wstring &b) {
 	return !_wcsicmp(a.c_str(), b.c_str());
@@ -133,7 +133,7 @@ bool update() {
 		wstring dir = dirs.front();
 		dirs.pop_front();
 
-		wstring toDir = exeDir;
+		wstring toDir = updateTo;
 		if (dir.size() > updDir.size() + 1) {
 			toDir += (dir.substr(updDir.size() + 1) + L"\\");
 			forcedirs.push_back(toDir);
@@ -161,7 +161,7 @@ bool update() {
 				}
 			} else {
 				wstring fname = dir + L"\\" + findData.cFileName;
-				wstring tofname = exeDir + fname.substr(updDir.size() + 1);
+				wstring tofname = updateTo + fname.substr(updDir.size() + 1);
 				if (equal(tofname, exeName)) { // bad update - has Updater.exe - delete all dir
 					writeLog(L"Error: bad update, has Updater.exe! '" + tofname + L"' equal '" + exeName + L"'");
 					delFolder();
@@ -230,10 +230,9 @@ bool update() {
 }
 
 void updateRegistry() {
-	writeLog(L"Updating registry..");
-
-	HANDLE versionFile = CreateFile(L"tdata\\version", GENERIC_READ, FILE_SHARE_READ, 0, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, 0);
+	HANDLE versionFile = CreateFile((updateTo + L"tdata\\version").c_str(), GENERIC_READ, FILE_SHARE_READ, 0, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, 0);
 	if (versionFile != INVALID_HANDLE_VALUE) {
+		writeLog(L"Updating registry..");
 		DWORD versionNum = 0, versionLen = 0, readLen = 0;
 		WCHAR versionStr[32];
 		if (ReadFile(versionFile, &versionNum, sizeof(DWORD), &readLen, NULL) != TRUE || readLen != sizeof(DWORD)) {
@@ -284,7 +283,7 @@ void updateRegistry() {
 									wsprintf(dateStr, L"%04d%02d%02d", stLocalTime.wYear, stLocalTime.wMonth, stLocalTime.wDay);
 									RegSetValueEx(rkey, L"InstallDate", 0, REG_SZ, (BYTE*)dateStr, (wcslen(dateStr) + 1) * sizeof(WCHAR));
 
-									WCHAR *appURL = L"https://tdesktop.com";
+									WCHAR *appURL = L"https://desktop.telegram.org";
 									RegSetValueEx(rkey, L"HelpLink", 0, REG_SZ, (BYTE*)appURL, (wcslen(appURL) + 1) * sizeof(WCHAR));
 									RegSetValueEx(rkey, L"URLInfoAbout", 0, REG_SZ, (BYTE*)appURL, (wcslen(appURL) + 1) * sizeof(WCHAR));
 									RegSetValueEx(rkey, L"URLUpdateInfo", 0, REG_SZ, (BYTE*)appURL, (wcslen(appURL) + 1) * sizeof(WCHAR));
@@ -296,6 +295,8 @@ void updateRegistry() {
 				RegCloseKey(rkey);
 			}
 		}
+	} else {
+		writeLog(L"Could not open version file to update registry :(");
 	}
 }
 
@@ -313,7 +314,7 @@ int APIENTRY WinMain(HINSTANCE instance, HINSTANCE prevInstance, LPSTR cmdParama
 	LPWSTR *args;
 	int argsCount;
 
-	bool needupdate = false, autostart = false, debug = false;
+	bool needupdate = false, autostart = false, debug = false, writeprotected = false, startintray = false;
 	args = CommandLineToArgvW(GetCommandLine(), &argsCount);
 	if (args) {
 		for (int i = 1; i < argsCount; ++i) {
@@ -324,10 +325,21 @@ 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"-writeprotected") && ++i < argsCount) {
+				writeprotected = true;
+				updateTo = args[i];
+				for (int i = 0, l = updateTo.size(); i < l; ++i) {
+					if (updateTo[i] == L'/') {
+						updateTo[i] = L'\\';
+					}
+				}
 			}
 		}
 		if (needupdate) writeLog(L"Need to update!");
 		if (autostart) writeLog(L"From autostart!");
+		if (writeprotected) writeLog(L"Write Protected folder!");
 
 		exeName = args[0];
 		writeLog(L"Exe name is: " + exeName);
@@ -335,9 +347,20 @@ int APIENTRY WinMain(HINSTANCE instance, HINSTANCE prevInstance, LPSTR cmdParama
 			if (equal(exeName.substr(exeName.size() - 11), L"Updater.exe")) {
 				exeDir = exeName.substr(0, exeName.size() - 11);
 				writeLog(L"Exe dir is: " + exeDir);
+				if (!writeprotected) {
+					updateTo = exeDir;
+				}
+				writeLog(L"Update to: " + updateTo);
 				if (needupdate && update()) {
 					updateRegistry();
 				}
+				if (writeprotected) { // if we can't clear all tupdates\ready (Updater.exe is there) - clear only version
+					if (DeleteFile(L"tupdates\\ready\\tdata\\version")) {
+						writeLog(L"Version file deleted!");
+					} else {
+						writeLog(L"Error: could not delete version file");
+					}
+				}
 			} else {
 				writeLog(L"Error: bad exe name!");
 			}
@@ -349,11 +372,57 @@ int APIENTRY WinMain(HINSTANCE instance, HINSTANCE prevInstance, LPSTR cmdParama
 		writeLog(L"Error: No command line arguments!");
 	}
 
-	wstring targs = L"-noupdate";
+	wstring targs;
 	if (autostart) targs += L" -autostart";
 	if (debug) targs += L" -debug";
+	if (startintray) targs += L" -startintray";
 
-	ShellExecute(0, 0, (exeDir + L"Telegram.exe").c_str(), targs.c_str(), 0, SW_SHOWNORMAL);
+	bool executed = false;
+	if (writeprotected) { // run un-elevated
+		writeLog(L"Trying to run un-elevated by temp.lnk");
+
+		HRESULT hres = CoInitialize(0);
+		if (SUCCEEDED(hres)) {
+			wstring lnk = L"tupdates\\ready\\temp.lnk";
+			IShellLink* psl;
+			HRESULT hres = CoCreateInstance(CLSID_ShellLink, NULL, CLSCTX_INPROC_SERVER, IID_IShellLink, (LPVOID*)&psl);
+			if (SUCCEEDED(hres)) {
+				IPersistFile* ppf;
+
+				wstring exe = updateTo + L"Telegram.exe", dir = updateTo;
+				psl->SetArguments((targs.size() ? targs.substr(1) : targs).c_str());
+				psl->SetPath(exe.c_str());
+				psl->SetWorkingDirectory(dir.c_str());
+				psl->SetDescription(L"");
+
+				hres = psl->QueryInterface(IID_IPersistFile, (LPVOID*)&ppf);
+
+				if (SUCCEEDED(hres)) {
+					hres = ppf->Save(lnk.c_str(), TRUE);
+					ppf->Release();
+
+					if (SUCCEEDED(hres)) {
+						writeLog(L"Executing un-elevated through link..");
+						ShellExecute(0, 0, L"explorer.exe", lnk.c_str(), 0, SW_SHOWNORMAL);
+						executed = true;
+					} else {
+						writeLog(L"Error: ppf->Save failed");
+					}
+				} else {
+					writeLog(L"Error: Could not create interface IID_IPersistFile");
+				}
+				psl->Release();
+			} else {
+				writeLog(L"Error: could not create instance of IID_IShellLink");
+			}
+			CoUninitialize();
+		} else {
+			writeLog(L"Error: Could not initialize COM");
+		}
+	}
+	if (!executed) {
+		ShellExecute(0, 0, (updateTo + L"Telegram.exe").c_str(), (L"-noupdate" + targs).c_str(), 0, SW_SHOWNORMAL);
+	}
 
 	writeLog(L"Executed Telegram.exe, closing log and quiting..");
 	closeLog();

Telegram/SourceFiles/_other/updater.h

@@ -1,6 +1,6 @@
 /*
 This file is part of Telegram Desktop,
-an unofficial desktop messaging app, see https://telegram.org
+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
@@ -13,7 +13,7 @@ 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://tdesktop.com
+Copyright (c) 2014 John Preston, https://desktop.telegram.org
 */
 #pragma once
 

Telegram/SourceFiles/_other/updater_linux.cpp

@@ -1,6 +1,6 @@
 /*
 This file is part of Telegram Desktop,
-an unofficial desktop messaging app, see https://telegram.org
+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
@@ -13,7 +13,7 @@ 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://tdesktop.com
+Copyright (c) 2014 John Preston, https://desktop.telegram.org
 */
 #include <cstdio>
 #include <sys/stat.h>
@@ -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;
 
     char *key = 0;
     for (int i = 1; i < argc; ++i) {
@@ -311,9 +311,11 @@ 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], "-tosettings")) {
             tosettings = true;
         } else if (equal(argv[i], "-key") && ++i < argc) {
@@ -377,12 +379,13 @@ 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";
     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 (tosettings) args[argIndex++] = p_tosettings;
     if (key) {
         args[argIndex++] = p_key;

Telegram/SourceFiles/_other/updater_osx.m

@@ -1,6 +1,6 @@
 /*
 This file is part of Telegram Desktop,
-an unofficial desktop messaging app, see https://telegram.org
+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
@@ -13,7 +13,7 @@ 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://tdesktop.com
+Copyright (c) 2014 John Preston, https://desktop.telegram.org
 */
 #import <Cocoa/Cocoa.h>
 
@@ -64,15 +64,21 @@ int main(int argc, const char * argv[]) {
 	if (!path) {
 		return -1;
 	}
-	NSRange range = [path rangeOfString:appName options:NSBackwardsSearch];
+	NSRange range = [path rangeOfString:@".app/" options:NSBackwardsSearch];
 	if (range.location == NSNotFound) {
 		return -1;
 	}
-	appDir = [path substringToIndex:range.location > 0 ? range.location : 0];
+	path = [path substringToIndex:range.location > 0 ? range.location : 0];
+
+	range = [path rangeOfString:@"/" options:NSBackwardsSearch];
+	NSString *appRealName = (range.location == NSNotFound) ? path : [path substringFromIndex:range.location + 1];
+	appRealName = [[NSArray arrayWithObjects:appRealName, @".app", nil] componentsJoinedByString:@""];
+	appDir = (range.location == NSNotFound) ? @"" : [path substringToIndex:range.location + 1];
+	NSString *appDirFull = [appDir stringByAppendingString:appRealName];
 
 	openLog();
 	pid_t procId = 0;
-	BOOL update = YES, toSettings = NO, autoStart = NO;
+	BOOL update = YES, toSettings = NO, autoStart = NO, startInTray = NO;
 	NSString *key = nil;
 	for (int i = 0; i < argc; ++i) {
 		if ([@"-workpath" isEqualToString:[NSString stringWithUTF8String:argv[i]]]) {
@@ -93,6 +99,8 @@ 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 ([@"-key" isEqualToString:[NSString stringWithUTF8String:argv[i]]]) {
 			if (++i < argc) key = [NSString stringWithUTF8String:argv[i]];
 		}
@@ -144,11 +152,12 @@ int main(int argc, const char * argv[]) {
 				break;
 			}
 			NSString *pathPart = [srcPath substringFromIndex:r.length];
-			if ([pathPart rangeOfString:appName].location != 0) {
+			r = [pathPart rangeOfString:appName];
+			if (r.location != 0) {
 				writeLog([@"Skipping not app file " stringByAppendingString:srcPath]);
 				continue;
 			}
-			NSString *dstPath = [appDir stringByAppendingString:pathPart];
+			NSString *dstPath = [appDirFull stringByAppendingString:[pathPart substringFromIndex:r.length]];
 			NSError *error;
 			NSNumber *isDirectory = nil;
 			writeLog([[NSArray arrayWithObjects: @"Copying file ", srcPath, @" to ", dstPath, nil] componentsJoinedByString:@""]);
@@ -180,10 +189,11 @@ int main(int argc, const char * argv[]) {
 		delFolder();
 	}
 
-	NSString *appPath = [[NSArray arrayWithObjects:appDir, appName, nil] componentsJoinedByString:@""];
+	NSString *appPath = [[NSArray arrayWithObjects:appDir, appRealName, nil] componentsJoinedByString:@""];
 	NSMutableArray *args = [[NSMutableArray alloc] initWithObjects:@"-noupdate", nil];
 	if (toSettings) [args addObject:@"-tosettings"];
 	if (_debug) [args addObject:@"-debug"];
+	if (startInTray) [args addObject:@"-startintray"];
 	if (autoStart) [args addObject:@"-autostart"];
 	if (key) {
 		[args addObject:@"-key"];

Telegram/SourceFiles/app.cpp

@@ -1,6 +1,6 @@
 /*
 This file is part of Telegram Desktop,
-an unofficial desktop messaging app, see https://telegram.org
+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
@@ -13,7 +13,7 @@ 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://tdesktop.com
+Copyright (c) 2014 John Preston, https://desktop.telegram.org
 */
 #include "stdafx.h"
 #include "lang.h"
@@ -26,6 +26,8 @@ Copyright (c) 2014 John Preston, https://tdesktop.com
 #include "mainwidget.h"
 #include <libexif/exif-data.h>
 
+#include "localstorage.h"
+
 namespace {
 	bool quiting = false;
 
@@ -43,6 +45,9 @@ namespace {
 	typedef QHash<AudioId, AudioData*> AudiosData;
 	AudiosData audiosData;
 
+	typedef QHash<QString, ImageLinkData*> ImageLinksData;
+	ImageLinksData imageLinksData;
+
 	typedef QHash<DocumentId, DocumentData*> DocumentsData;
 	DocumentsData documentsData;
 
@@ -73,6 +78,13 @@ namespace {
 	LastPhotosList lastPhotos;
 	typedef QHash<PhotoData*, LastPhotosList::iterator> LastPhotosMap;
 	LastPhotosMap lastPhotosMap;
+
+	style::color _msgServiceBG;
+	style::color _historyScrollBarColor;
+	style::color _historyScrollBgColor;
+	style::color _historyScrollBarOverColor;
+	style::color _historyScrollBgOverColor;
+	style::color _introPointHoverColor;
 }
 
 namespace App {
@@ -111,13 +123,14 @@ namespace App {
 	bool loggedOut() {
 		Window *w(wnd());
 		if (w) {
-			w->tempDirDelete();
+			w->tempDirDelete(Local::ClearManagerAll);
 			w->notifyClearFast();
 			w->setupIntro(true);
 		}
 		MainWidget *m(main());
 		if (m) m->destroyData();
 		MTP::authed(0);
+		cSetOtherOnline(0);
 		histories().clear();
 		globalNotifyAllPtr = UnknownNotifySettings;
 		globalNotifyUsersPtr = UnknownNotifySettings;
@@ -162,8 +175,37 @@ namespace App {
         return (peer_id & 0x100000000L) ? int32(peer_id & 0xFFFFFFFFL) : 0;
     }
 
+	int32 onlineForSort(int32 online, int32 now) {
+		if (online <= 0) {
+			switch (online) {
+			case 0:
+			case -1: return online;
+
+			case -2: {
+				QDate yesterday(date(now).date());
+				return int32(QDateTime(yesterday.addDays(-3)).toTime_t());
+			} break;
+
+			case -3: {
+				QDate weekago(date(now).date());
+				return int32(QDateTime(weekago.addDays(-7)).toTime_t());
+			} break;
+
+			case -4: {
+				QDate monthago(date(now).date());
+				return int32(QDateTime(monthago.addDays(-30)).toTime_t());
+			} break;
+			}
+			return -online;
+		}
+		return online;
+	}
+
 	int32 onlineWillChangeIn(int32 online, int32 now) {
-		if (online <= 0) return 86400;
+        if (online <= 0) {
+            if (-online > now) return -online - now;
+            return 86400;
+        }
 		if (online > now) {
 			return online - now;
 		}
@@ -179,9 +221,21 @@ namespace App {
 		return dNow.secsTo(dTomorrow);
 	}
 
-	QString onlineText(int32 online, int32 now, bool precise) {
-		if (!online) return lang(lng_status_offline);
-		if (online < 0) return lang(lng_status_invisible);
+	QString onlineText(UserData *user, int32 now, bool precise) {
+		if (isServiceUser(user->id)) {
+			return lang(lng_status_service_notifications);
+		}
+		int32 online = user->onlineTill;
+		if (online <= 0) {
+			switch (online) {
+			case 0: return lang(lng_status_offline);
+            case -1: return lang(lng_status_invisible);
+			case -2: return lang(lng_status_recently);
+			case -3: return lang(lng_status_last_week);
+			case -4: return lang(lng_status_last_month);
+			}
+            return (-online > now) ? lang(lng_status_online) : lang(lng_status_recently);
+		}
 		if (online > now) {
 			return lang(lng_status_online);
 		}
@@ -189,46 +243,51 @@ namespace App {
 		if (precise) {
 			QDateTime dOnline(date(online)), dNow(date(now));
 			if (dOnline.date() == dNow.date()) {
-				when = lang(lng_status_lastseen_today).replace(qsl("{time}"), dOnline.time().toString(qsl("hh:mm")));
+				return lng_status_lastseen_today(lt_time, dOnline.time().toString(cTimeFormat()));
 			} else if (dOnline.date().addDays(1) == dNow.date()) {
-				when = lang(lng_status_lastseen_yesterday).replace(qsl("{time}"), dOnline.time().toString(qsl("hh:mm")));
-			} else {
-				when = lang(lng_status_lastseen_date_time).replace(qsl("{date}"), dOnline.date().toString(qsl("dd.MM.yy"))).replace(qsl("{time}"), dOnline.time().toString(qsl("hh:mm")));
+				return lng_status_lastseen_yesterday(lt_time, dOnline.time().toString(cTimeFormat()));
 			}
-			return lang(lng_status_lastseen).replace(qsl("{when}"), when);
+			return lng_status_lastseen_date_time(lt_date, dOnline.date().toString(qsl("dd.MM.yy")), lt_time, dOnline.time().toString(cTimeFormat()));
 		}
 		int32 minutes = (now - online) / 60;
 		if (!minutes) {
-			when = lang(lng_status_lastseen_now);
-		} else if (minutes == 1) {
-			when = lang(lng_status_lastseen_minute).arg(minutes);
+			return lang(lng_status_lastseen_now);
 		} else if (minutes < 60) {
-			when = lang(lng_status_lastseen_minutes).arg(minutes);
-		} else {
-			int32 hours = (now - online) / 3600;
-			if (hours == 1) {
-				when = lang(lng_status_lastseen_hour).arg(hours);
-			} else if (hours < 12) {
-				when = lang(lng_status_lastseen_hours).arg(hours);
-			} else {
-				QDateTime dOnline(date(online)), dNow(date(now));
-				if (dOnline.date() == dNow.date()) {
-					when = lang(lng_status_lastseen_today).replace(qsl("{time}"), dOnline.time().toString(qsl("hh:mm")));
-				} else if (dOnline.date().addDays(1) == dNow.date()) {
-					when = lang(lng_status_lastseen_yesterday).replace(qsl("{time}"), dOnline.time().toString(qsl("hh:mm")));
-				} else {
-					when = lang(lng_status_lastseen_date).replace(qsl("{date}"), dOnline.date().toString(qsl("dd.MM.yy")));
-				}
-			}
+			return lng_status_lastseen_minutes(lt_count, minutes);
 		}
-		return lang(lng_status_lastseen).replace(qsl("{when}"), when);
+		int32 hours = (now - online) / 3600;
+		if (hours < 12) {
+			return lng_status_lastseen_hours(lt_count, hours);
+		}
+		QDateTime dOnline(date(online)), dNow(date(now));
+		if (dOnline.date() == dNow.date()) {
+			return lng_status_lastseen_today(lt_time, dOnline.time().toString(cTimeFormat()));
+		} else if (dOnline.date().addDays(1) == dNow.date()) {
+			return lng_status_lastseen_yesterday(lt_time, dOnline.time().toString(cTimeFormat()));
+		}
+		return lng_status_lastseen_date(lt_date, dOnline.date().toString(qsl("dd.MM.yy")));
 	}
 
-	void feedUsers(const MTPVector<MTPUser> &users) {
+	bool onlineColorUse(int32 online, int32 now) {
+		if (online <= 0) {
+			switch (online) {
+			case 0:
+			case -1:
+			case -2:
+			case -3:
+			case -4: return false;
+			}
+			return (-online > now);
+		}
+		return (online > now);
+	}
+
+	UserData *feedUsers(const MTPVector<MTPUser> &users) {
+        UserData *data = 0;
 		const QVector<MTPUser> &v(users.c_vector().v);
 		for (QVector<MTPUser>::const_iterator i = v.cbegin(), e = v.cend(); i != e; ++i) {
 			const MTPuser &user(*i);
-            UserData *data = 0;
+            data = 0;
 			bool wasContact = false;
 			const MTPUserStatus *status = 0;
 
@@ -274,7 +333,10 @@ namespace App {
 				data->contact = -1;
 				status = &d.vstatus;
 
-				::self = data;
+				if (::self != data) {
+					::self = data;
+					if (App::wnd()) App::wnd()->updateGlobalMenu();
+				}
 			} break;
 			case mtpc_userContact: {
 				const MTPDuserContact &d(user.c_userContact());
@@ -299,7 +361,7 @@ namespace App {
 				data->input = MTP_inputPeerForeign(d.vid, d.vaccess_hash);
 				data->inputUser = MTP_inputUserForeign(d.vid, d.vaccess_hash);
 				data->setPhone(qs(d.vphone));
-				data->setName(textOneLine(qs(d.vfirst_name)), textOneLine(qs(d.vlast_name)), (data->id != 333000 && !data->phone.isEmpty()) ? formatPhone(data->phone) : QString(), textOneLine(qs(d.vusername)));
+				data->setName(textOneLine(qs(d.vfirst_name)), textOneLine(qs(d.vlast_name)), (!isServiceUser(data->id) && !data->phone.isEmpty()) ? formatPhone(data->phone) : QString(), textOneLine(qs(d.vusername)));
 				data->setPhoto(d.vphoto);
 				data->access = d.vaccess_hash.v;
 				wasContact = (data->contact > 0);
@@ -326,6 +388,14 @@ namespace App {
 
 			data->loaded = true;
 			if (status) switch (status->type()) {
+			case mtpc_userStatusEmpty: data->onlineTill = 0; break;
+			case mtpc_userStatusRecently:
+				if (data->onlineTill > -10) { // don't modify pseudo-online
+					data->onlineTill = -2;
+				}
+			break;
+			case mtpc_userStatusLastWeek: data->onlineTill = -3; break;
+			case mtpc_userStatusLastMonth: data->onlineTill = -4; break;
 			case mtpc_userStatusOffline: data->onlineTill = status->c_userStatusOffline().vwas_online.v; break;
 			case mtpc_userStatusOnline: data->onlineTill = status->c_userStatusOnline().vexpires.v; break;
 			}
@@ -341,6 +411,8 @@ namespace App {
 
 			if (App::main()) App::main()->peerUpdated(data);
 		}
+
+		return data;
 	}
 
 	void feedChats(const MTPVector<MTPChat> &chats) {
@@ -405,7 +477,7 @@ namespace App {
 			if (!data) continue;
 
 			data->loaded = true;
-			data->updateName(title.trimmed(), QString());
+			data->updateName(title.trimmed(), QString(), QString());
 
 			if (App::main()) App::main()->peerUpdated(data);
 		}
@@ -561,13 +633,20 @@ namespace App {
 	}
 	
 	void feedWereDeleted(const QVector<MTPint> &msgsIds) {
+		bool resized = false;
 		for (QVector<MTPint>::const_iterator i = msgsIds.cbegin(), e = msgsIds.cend(); i != e; ++i) {
 			MsgsData::const_iterator j = msgsData.constFind(i->v);
 			if (j != msgsData.cend()) {
 				History *h = (*j)->history();
 				(*j)->destroy();
+				if (App::main() && h->peer == App::main()->peer()) {
+					resized = true;
+				}
 			}
 		}
+		if (resized) {
+			App::main()->itemResized(0);
+		}
 	}
 
 	void feedUserLinks(const MTPVector<MTPcontacts_Link> &links) {
@@ -619,13 +698,13 @@ namespace App {
 			if (user->contact > 0) {
 				if (!wasContact) {
 					App::main()->addNewContact(App::userFromPeer(user->id), false);
-					user->input = MTP_inputPeerContact(userId);
-					user->inputUser = MTP_inputUserContact(userId);
+					if (user->input.type() != mtpc_inputPeerSelf) user->input = MTP_inputPeerContact(userId);
+					if (user->inputUser.type() != mtpc_inputUserSelf) user->inputUser = MTP_inputUserContact(userId);
 				}
 			} else {
 				if (user->access) {
-					user->input = MTP_inputPeerForeign(userId, MTP_long(user->access));
-					user->inputUser = MTP_inputUserForeign(userId, MTP_long(user->access));
+					if (user->input.type() != mtpc_inputPeerSelf) user->input = MTP_inputPeerForeign(userId, MTP_long(user->access));
+					if (user->inputUser.type() != mtpc_inputUserSelf) user->inputUser = MTP_inputUserForeign(userId, MTP_long(user->access));
 				}
 				if (user->contact < 0 && !user->phone.isEmpty() && App::userFromPeer(user->id) != MTP::authedId()) {
 					user->contact = 0;
@@ -634,7 +713,7 @@ namespace App {
 					App::main()->removeContact(user);
 				}
 			}
-			user->setName(textOneLine(user->firstName), textOneLine(user->lastName), (user->contact || user->id == 333000 || user->phone.isEmpty()) ? QString() : App::formatPhone(user->phone), textOneLine(user->username));
+			user->setName(textOneLine(user->firstName), textOneLine(user->lastName), (user->contact || isServiceUser(user->id) || user->phone.isEmpty()) ? QString() : App::formatPhone(user->phone), textOneLine(user->username));
 			if (App::main()) App::main()->peerUpdated(user);
 		}
 	}
@@ -673,8 +752,8 @@ namespace App {
 			switch (i.key()) {
 			case 's': newThumbLevel = 0; newMediumLevel = 5; newFullLevel = 4; break; // box 100x100
 			case 'm': newThumbLevel = 2; newMediumLevel = 0; newFullLevel = 3; break; // box 320x320
-			case 'x': newThumbLevel = 5; newMediumLevel = 3; newFullLevel = 0; break; // box 800x800
-			case 'y': newThumbLevel = 6; newMediumLevel = 6; newFullLevel = 1; break; // box 1280x1280
+			case 'x': newThumbLevel = 5; newMediumLevel = 3; newFullLevel = 1; break; // box 800x800
+			case 'y': newThumbLevel = 6; newMediumLevel = 6; newFullLevel = 0; break; // box 1280x1280
 			case 'w': newThumbLevel = 8; newMediumLevel = 8; newFullLevel = 2; break; // box 2560x2560
 			case 'a': newThumbLevel = 1; newMediumLevel = 4; newFullLevel = 8; break; // crop 160x160
 			case 'b': newThumbLevel = 3; newMediumLevel = 1; newFullLevel = 7; break; // crop 320x320
@@ -733,8 +812,8 @@ namespace App {
 			switch (size) {
 			case 's': newThumbLevel = 0; newMediumLevel = 5; newFullLevel = 4; break; // box 100x100
 			case 'm': newThumbLevel = 2; newMediumLevel = 0; newFullLevel = 3; break; // box 320x320
-			case 'x': newThumbLevel = 5; newMediumLevel = 3; newFullLevel = 0; break; // box 800x800
-			case 'y': newThumbLevel = 6; newMediumLevel = 6; newFullLevel = 1; break; // box 1280x1280
+			case 'x': newThumbLevel = 5; newMediumLevel = 3; newFullLevel = 1; break; // box 800x800
+			case 'y': newThumbLevel = 6; newMediumLevel = 6; newFullLevel = 0; break; // box 1280x1280
 			case 'w': newThumbLevel = 8; newMediumLevel = 8; newFullLevel = 2; break; // box 2560x2560
 			case 'a': newThumbLevel = 1; newMediumLevel = 4; newFullLevel = 8; break; // crop 160x160
 			case 'b': newThumbLevel = 3; newMediumLevel = 1; newFullLevel = 7; break; // crop 320x320
@@ -768,14 +847,14 @@ namespace App {
 	}
 
 	AudioData *feedAudio(const MTPDaudio &audio, AudioData *convert) {
-		return App::audio(audio.vid.v, convert, audio.vaccess_hash.v, audio.vuser_id.v, audio.vdate.v, audio.vduration.v, audio.vdc_id.v, audio.vsize.v);
+		return App::audio(audio.vid.v, convert, audio.vaccess_hash.v, audio.vuser_id.v, audio.vdate.v, qs(audio.vmime_type), audio.vduration.v, audio.vdc_id.v, audio.vsize.v);
 	}
 
 	DocumentData *feedDocument(const MTPdocument &document, const QPixmap &thumb) {
 		switch (document.type()) {
 		case mtpc_document: {
 			const MTPDdocument &d(document.c_document());
-			return App::document(d.vid.v, 0, d.vaccess_hash.v, d.vuser_id.v, d.vdate.v, qs(d.vfile_name), qs(d.vmime_type), ImagePtr(thumb, "JPG"), d.vdc_id.v, d.vsize.v);
+			return App::document(d.vid.v, 0, d.vaccess_hash.v, d.vdate.v, d.vattributes.c_vector().v, qs(d.vmime_type), ImagePtr(thumb, "JPG"), d.vdc_id.v, d.vsize.v);
 		} break;
 		case mtpc_documentEmpty: return App::document(document.c_documentEmpty().vid.v);
 		}
@@ -795,7 +874,7 @@ namespace App {
 	}
 
 	DocumentData *feedDocument(const MTPDdocument &document, DocumentData *convert) {
-		return App::document(document.vid.v, convert, document.vaccess_hash.v, document.vuser_id.v, document.vdate.v, qs(document.vfile_name), qs(document.vmime_type), App::image(document.vthumb), document.vdc_id.v, document.vsize.v);
+		return App::document(document.vid.v, convert, document.vaccess_hash.v, document.vdate.v, document.vattributes.c_vector().v, qs(document.vmime_type), App::image(document.vthumb), document.vdc_id.v, document.vsize.v);
 	}
 
 	UserData *userLoaded(const PeerId &user) {
@@ -848,6 +927,15 @@ namespace App {
 		return ::self;
 	}
 
+	UserData *userByName(const QString &username) {
+		for (PeersData::const_iterator i = peersData.cbegin(), e = peersData.cend(); i != e; ++i) {
+			if (!i.value()->chat && !i.value()->asUser()->username.compare(username.trimmed(), Qt::CaseInsensitive)) {
+				return i.value()->asUser();
+			}
+		}
+		return 0;
+	}
+
 	ChatData *chat(const PeerId &peer) {
 		PeerData *d = App::peer(peer);
 		return d->asChat();
@@ -911,14 +999,6 @@ namespace App {
 		return result;
 	}
 
-	void forgetPhotos() {
-		lastPhotos.clear();
-		lastPhotosMap.clear();
-		for (PhotosData::const_iterator i = photosData.cbegin(), e = photosData.cend(); i != e; ++i) {
-			i.value()->forget();
-		}
-	}
-	
 	VideoData *video(const VideoId &video, VideoData *convert, const uint64 &access, int32 user, int32 date, int32 duration, int32 w, int32 h, const ImagePtr &thumb, int32 dc, int32 size) {
 		if (convert) {
 			if (convert->id != video) {
@@ -967,13 +1047,7 @@ namespace App {
 		return result;
 	}
 
-	void forgetVideos() {
-		for (VideosData::const_iterator i = videosData.cbegin(), e = videosData.cend(); i != e; ++i) {
-			i.value()->forget();
-		}
-	}
-
-	AudioData *audio(const AudioId &audio, AudioData *convert, const uint64 &access, int32 user, int32 date, int32 duration, int32 dc, int32 size) {
+	AudioData *audio(const AudioId &audio, AudioData *convert, const uint64 &access, int32 user, int32 date, const QString &mime, int32 duration, int32 dc, int32 size) {
 		if (convert) {
 			if (convert->id != audio) {
 				AudiosData::iterator i = audiosData.find(convert->id);
@@ -987,6 +1061,7 @@ namespace App {
 			if (!convert->user && !convert->date && (user || date)) {
 				convert->user = user;
 				convert->date = date;
+				convert->mime = mime;
 				convert->duration = duration;
 				convert->dc = dc;
 				convert->size = size;
@@ -998,7 +1073,7 @@ namespace App {
 			if (convert) {
 				result = convert;
 			} else {
-				result = new AudioData(audio, access, user, date, duration, dc, size);
+				result = new AudioData(audio, access, user, date, mime, duration, dc, size);
 			}
 			audiosData.insert(audio, result);
 		} else {
@@ -1007,6 +1082,7 @@ namespace App {
 				result->access = access;
 				result->user = user;
 				result->date = date;
+				result->mime = mime;
 				result->duration = duration;
 				result->dc = dc;
 				result->size = size;
@@ -1015,13 +1091,7 @@ namespace App {
 		return result;
 	}
 
-	void forgetAudios() {
-		for (AudiosData::const_iterator i = audiosData.cbegin(), e = audiosData.cend(); i != e; ++i) {
-			i.value()->forget();
-		}
-	}
-
-	DocumentData *document(const DocumentId &document, DocumentData *convert, const uint64 &access, int32 user, int32 date, const QString &name, const QString &mime, const ImagePtr &thumb, int32 dc, int32 size) {
+	DocumentData *document(const DocumentId &document, DocumentData *convert, const uint64 &access, int32 date, const QVector<MTPDocumentAttribute> &attributes, const QString &mime, const ImagePtr &thumb, int32 dc, int32 size) {
 		if (convert) {
 			if (convert->id != document) {
 				DocumentsData::iterator i = documentsData.find(convert->id);
@@ -1032,14 +1102,19 @@ namespace App {
 				convert->status = FileReady;
 			}
 			convert->access = access;
-			if (!convert->user && !convert->date && (user || date)) {
-				convert->user = user;
+			if (!convert->date && date) {
 				convert->date = date;
-				convert->name = name;
+				convert->setattributes(attributes);
 				convert->mime = mime;
 				convert->thumb = thumb;
 				convert->dc = dc;
 				convert->size = size;
+			} else if (convert->thumb->isNull() && !thumb->isNull()) {
+				convert->thumb = thumb;
+			}
+
+			if (convert->location.check()) {
+				Local::writeFileLocation(mediaKey(mtpc_inputDocumentFileLocation, convert->dc, convert->id), convert->location);
 			}
 		}
 		DocumentsData::const_iterator i = documentsData.constFind(document);
@@ -1048,29 +1123,59 @@ namespace App {
 			if (convert) {
 				result = convert;
 			} else {
-				result = new DocumentData(document, access, user, date, name, mime, thumb, dc, size);
+				result = new DocumentData(document, access, date, attributes, mime, thumb, dc, size);
 			}
 			documentsData.insert(document, result);
 		} else {
 			result = i.value();
-			if (result != convert && !result->user && !result->date && (user || date)) {
-				result->access = access;
-				result->user = user;
-				result->date = date;
-				result->name = name;
-				result->mime = mime;
-				result->thumb = thumb;
-				result->dc = dc;
-				result->size = size;
+			if (result != convert) {
+				if (!result->date && date) {
+					result->access = access;
+					result->date = date;
+					result->setattributes(attributes);
+					result->mime = mime;
+					result->thumb = thumb;
+					result->dc = dc;
+					result->size = size;
+				} else if (result->thumb->isNull() && !thumb->isNull()) {
+					result->thumb = thumb;
+				}
 			}
 		}
 		return result;
 	}
 
-	void forgetDocuments() {
+	ImageLinkData *imageLink(const QString &imageLink, ImageLinkType type, const QString &url) {
+		ImageLinksData::const_iterator i = imageLinksData.constFind(imageLink);
+		ImageLinkData *result;
+		if (i == imageLinksData.cend()) {
+			result = new ImageLinkData(imageLink);
+			imageLinksData.insert(imageLink, result);
+			result->type = type;
+		} else {
+			result = i.value();
+		}
+		return result;
+	}
+
+	void forgetMedia() {
+		lastPhotos.clear();
+		lastPhotosMap.clear();
+		for (PhotosData::const_iterator i = photosData.cbegin(), e = photosData.cend(); i != e; ++i) {
+			i.value()->forget();
+		}
+		for (VideosData::const_iterator i = videosData.cbegin(), e = videosData.cend(); i != e; ++i) {
+			i.value()->forget();
+		}
+		for (AudiosData::const_iterator i = audiosData.cbegin(), e = audiosData.cend(); i != e; ++i) {
+			i.value()->forget();
+		}
 		for (DocumentsData::const_iterator i = documentsData.cbegin(), e = documentsData.cend(); i != e; ++i) {
 			i.value()->forget();
 		}
+		for (ImageLinksData::const_iterator i = imageLinksData.cbegin(), e = imageLinksData.cend(); i != e; ++i) {
+			i.value()->thumb->forget();
+		}
 	}
 
 	MTPPhoto photoFromUserPhoto(MTPint userId, MTPint date, const MTPUserProfilePhoto &photo) {
@@ -1218,12 +1323,17 @@ namespace App {
 			delete *i;
 		}
 		documentsData.clear();
+		cSetRecentStickers(RecentStickerPack());
+		cSetStickersHash(QByteArray());
+		cSetStickers(AllStickers());
+		cSetEmojiStickers(EmojiStickersMap());
 		::videoItems.clear();
 		::audioItems.clear();
 		::documentItems.clear();
 		lastPhotos.clear();
 		lastPhotosMap.clear();
 		::self = 0;
+		if (App::wnd()) App::wnd()->updateGlobalMenu();
 	}
 /* // don't delete history without deleting its' peerdata
 	void deleteHistory(const PeerId &peer) {
@@ -1284,6 +1394,7 @@ namespace App {
 			clearAllImages();
 		} else {
 			clearStorageImages();
+			cSetServerBackgrounds(WallPapers());
 		}
 
 		serviceImageCacheSize = imageCacheSize();
@@ -1357,13 +1468,13 @@ namespace App {
 				p.fillRect(0, 0, img.width(), img.height(), Qt::transparent);
 				p.drawPixmap(QPoint(st::emojiPadding * cIntRetinaFactor(), (fontHeight * cIntRetinaFactor() - st::emojiImgSize) / 2), App::emojis(), QRect(emoji->x, emoji->y, st::emojiImgSize, st::emojiImgSize));
 			}
-			i = map->insert(emoji->code, QPixmap::fromImage(img));
+			i = map->insert(emoji->code, QPixmap::fromImage(img, Qt::ColorOnly));
 		}
 		return i.value();
 	}
 
 	void playSound() {
-		if (cSoundNotify()) audioPlayNotify();
+		if (cSoundNotify() && !psSkipAudioNotify()) audioPlayNotify();
 	}
 
 	void writeConfig() {
@@ -1383,6 +1494,8 @@ namespace App {
 			configStream << quint32(dbiAutoUpdate) << qint32(cAutoUpdate());
 			configStream << quint32(dbiLastUpdateCheck) << qint32(cLastUpdateCheck());
 			configStream << quint32(dbiScale) << qint32(cConfigScale());
+			configStream << quint32(dbiLang) << qint32(cLang());
+			configStream << quint32(dbiLangFile) << cLangFile();
 
 			configStream << quint32(dbiConnectionType) << qint32(cConnectionType());
 			if (cConnectionType() == dbictHttpProxy || cConnectionType() == dbictTcpProxy) {
@@ -1486,8 +1599,8 @@ namespace App {
 						p.port = uint32(port);
 						cSetConnectionProxy(p);
 					}
-					cSetConnectionType(DBIConnectionType(v));
-					break;
+						cSetConnectionType(DBIConnectionType(v));
+						break;
 					case dbictHttpAuto:
 					default: cSetConnectionType(dbictAuto); break;
 					};
@@ -1523,10 +1636,25 @@ namespace App {
 					case dbisOneAndHalf: s = dbisOneAndHalf; break;
 					case dbisTwo: s = dbisTwo; break;
 					}
+					if (cRetina()) s = dbisOne;
 					cSetConfigScale(s);
 					cSetRealScale(s);
 				} break;
 
+				case dbiLang: {
+					qint32 v;
+					configStream >> v;
+					if (v == languageTest || (v >= 0 && v < languageCount)) {
+						cSetLang(v);
+					}
+				} break;
+
+				case dbiLangFile: {
+					QString v;
+					configStream >> v;
+					cSetLangFile(v);
+				} break;
+
 				case dbiWindowPosition: {
 					TWindowPos pos;
 					configStream >> pos.x >> pos.y >> pos.w >> pos.h >> pos.moncrc >> pos.maximized;
@@ -1561,7 +1689,7 @@ namespace App {
 				}
 
 				stream << quint32(dbiSendKey) << qint32(cCtrlEnter() ? dbiskCtrlEnter : dbiskEnter);
-				stream << quint32(dbiCatsAndDogs) << qint32(cCatsAndDogs() ? 1 : 0);
+				stream << quint32(dbiTileBackground) << qint32(cTileBackground() ? 1 : 0);
 				stream << quint32(dbiReplaceEmojis) << qint32(cReplaceEmojis() ? 1 : 0);
 				stream << quint32(dbiDefaultAttach) << qint32(cDefaultAttach());
 				stream << quint32(dbiSoundNotify) << qint32(cSoundNotify());
@@ -1597,7 +1725,7 @@ namespace App {
 			}
 			QByteArray encrypted(16 + fullSize, Qt::Uninitialized); // 128bit of sha1 - key128, sizeof(data), data
 			hashSha1(toEncrypt.constData(), toEncrypt.size(), encrypted.data());
-			aesEncryptLocal(toEncrypt.constData(), encrypted.data() + 16, fullSize, &MTP::localKey(), encrypted.constData());
+			aesEncryptLocal(toEncrypt.constData(), encrypted.data() + 16, fullSize, &Local::oldKey(), encrypted.constData());
 
 			DEBUG_LOG(("App Info: writing user config file"));
 			QDataStream configStream(&configFile);
@@ -1648,7 +1776,7 @@ namespace App {
 				}
 
 				cSetLocalSalt(salt);
-				MTP::createLocalKey(QByteArray(), &salt);
+				Local::createOldKey(&salt);
 
 				if (data.size() <= 16 || (data.size() & 0x0F)) {
 					LOG(("App Error: bad encrypted part size: %1").arg(data.size()));
@@ -1657,7 +1785,7 @@ namespace App {
 				uint32 fullDataLen = data.size() - 16;
 				decrypted.resize(fullDataLen);
 				const char *dataKey = data.constData(), *encrypted = data.constData() + 16;
-				aesDecryptLocal(encrypted, decrypted.data(), fullDataLen, &MTP::localKey(), dataKey);
+				aesDecryptLocal(encrypted, decrypted.data(), fullDataLen, &Local::oldKey(), dataKey);
 				uchar sha1Buffer[20];
 				if (memcmp(hashSha1(decrypted.constData(), decrypted.size(), sha1Buffer), dataKey, 16)) {
 					LOG(("App Error: bad decrypt key, data from user-config not decrypted"));
@@ -1700,7 +1828,12 @@ namespace App {
 			case dbiCatsAndDogs: {
 				qint32 v;
 				stream >> v;
-				cSetCatsAndDogs(v == 1);
+			} break;
+
+			case dbiTileBackground: {
+				qint32 v;
+				stream >> v;
+				cSetTileBackground(v == 1);
 			} break;
 
 			case dbiReplaceEmojis: {
@@ -1762,12 +1895,13 @@ namespace App {
 				qint32 v;
 				stream >> v;
 				switch (v) {
-				case dbietRecent : cSetEmojiTab(dbietRecent);  break;
-				case dbietPeople : cSetEmojiTab(dbietPeople);  break;
-				case dbietNature : cSetEmojiTab(dbietNature);  break;
-				case dbietObjects: cSetEmojiTab(dbietObjects); break;
-				case dbietPlaces : cSetEmojiTab(dbietPlaces);  break;
-				case dbietSymbols: cSetEmojiTab(dbietSymbols); break;
+				case dbietRecent  : cSetEmojiTab(dbietRecent);   break;
+				case dbietPeople  : cSetEmojiTab(dbietPeople);   break;
+				case dbietNature  : cSetEmojiTab(dbietNature);   break;
+				case dbietObjects : cSetEmojiTab(dbietObjects);  break;
+				case dbietPlaces  : cSetEmojiTab(dbietPlaces);   break;
+				case dbietSymbols : cSetEmojiTab(dbietSymbols);  break;
+				case dbietStickers: cSetEmojiTab(dbietStickers); break;
 				}
 			} break;
 
@@ -1854,10 +1988,7 @@ namespace App {
 	void checkImageCacheSize() {
 		int64 nowImageCacheSize = imageCacheSize();
 		if (nowImageCacheSize > serviceImageCacheSize + MemoryForImageCache) {
-			App::forgetPhotos();
-			App::forgetVideos();
-			App::forgetAudios();
-			App::forgetDocuments();
+			App::forgetMedia();
 			serviceImageCacheSize = imageCacheSize();
 		}
 	}
@@ -1887,8 +2018,7 @@ namespace App {
 		::quiting = true;
 	}
 
-
-    QImage readImage(QByteArray data, QByteArray *format) {
+	QImage readImage(QByteArray data, QByteArray *format, bool opaque, bool *animated) {
         QByteArray tmpFormat;
 		QImage result;
 		QBuffer buffer(&data);
@@ -1896,6 +2026,7 @@ namespace App {
             format = &tmpFormat;
         }
         QImageReader reader(&buffer, *format);
+		if (animated) *animated = reader.supportsAnimation() && reader.imageCount() > 1;
 		if (!reader.read(&result)) {
 			return QImage();
 		}
@@ -1924,7 +2055,7 @@ namespace App {
 				}
 				exif_data_free(exifData);
 			}
-		} else {
+		} else if (opaque && result.hasAlphaChannel()) {
 			QImage solid(result.width(), result.height(), QImage::Format_ARGB32_Premultiplied);
 			solid.fill(st::white->c);
 			{
@@ -1935,12 +2066,16 @@ namespace App {
 		return result;
 	}
 
-    QImage readImage(const QString &file, QByteArray *format) {
+	QImage readImage(const QString &file, QByteArray *format, bool opaque, bool *animated, QByteArray *content) {
 		QFile f(file);
 		if (!f.open(QIODevice::ReadOnly)) {
+			if (animated) *animated = false;
 			return QImage();
 		}
-		return readImage(f.readAll(), format);
+		QByteArray img = f.readAll();
+		QImage result = readImage(img, format, opaque, animated);
+		if (content && !result.isNull()) *content = img;
+		return result;
 	}
 
 	void regVideoItem(VideoData *data, HistoryItem *item) {
@@ -2003,4 +2138,184 @@ namespace App {
 		}
 	}
 
+	void openUserByName(const QString &username) {
+		if (App::main()) {
+			App::main()->openUserByName(username);
+		}
+	}
+
+	void openLocalUrl(const QString &url) {
+		if (App::main()) {
+			App::main()->openLocalUrl(url);
+		}
+	}
+
+	void initBackground(int32 id, const QImage &p, bool nowrite) {
+		if (Local::readBackground()) return;
+
+		QImage img(p);
+		if (p.isNull()) {
+			img.load(st::msgBG);
+			id = 0;
+		}
+		if (img.format() != QImage::Format_ARGB32 && img.format() != QImage::Format_ARGB32_Premultiplied && img.format() != QImage::Format_RGB32) {
+			img = img.convertToFormat(QImage::Format_RGB32);
+		}
+		img.setDevicePixelRatio(cRetinaFactor());
+
+		if (!nowrite) Local::writeBackground(id, img);
+
+		delete cChatBackground();
+		cSetChatBackground(new QPixmap(QPixmap::fromImage(img, Qt::ColorOnly)));
+		cSetChatBackgroundId(id);
+
+		if (App::main()) App::main()->clearCachedBackground();
+
+		uint64 components[3] = { 0 }, componentsScroll[3] = { 0 }, componentsPoint[3] = { 0 };
+		int w = img.width(), h = img.height(), size = w * h;
+		const uchar *pix = img.constBits();
+		if (pix) {
+			for (int32 i = 0, l = size * 4; i < l; i += 4) {
+				components[2] += pix[i + 0];
+				components[1] += pix[i + 1];
+				components[0] += pix[i + 2];
+			}
+		}
+		if (size) {
+			for (int32 i = 0; i < 3; ++i) components[i] /= size;
+		}
+		int maxtomin[3] = { 0, 1, 2 };
+		if (components[maxtomin[0]] < components[maxtomin[1]]) {
+			qSwap(maxtomin[0], maxtomin[1]);
+		}
+		if (components[maxtomin[1]] < components[maxtomin[2]]) {
+			qSwap(maxtomin[1], maxtomin[2]);
+			if (components[maxtomin[0]] < components[maxtomin[1]]) {
+				qSwap(maxtomin[0], maxtomin[1]);
+			}
+		}
+
+		uint64 max = qMax(1ULL, components[maxtomin[0]]), mid = qMax(1ULL, components[maxtomin[1]]), min = qMax(1ULL, components[maxtomin[2]]);
+
+		QImage dog = App::sprite().toImage().copy(st::msgDogImg);
+		QImage::Format f = dog.format();
+		if (f != QImage::Format_ARGB32 && f != QImage::Format_ARGB32_Premultiplied) {
+			dog = dog.convertToFormat(QImage::Format_ARGB32_Premultiplied);
+		}
+		uchar *dogBits = dog.bits();
+		if (max != min) {
+			float64 coef = float64(mid - min) / float64(max - min);
+			for (int i = 0, s = dog.width() * dog.height() * 4; i < s; i += 4) {
+				int dogmaxtomin[3] = { i, i + 1, i + 2 };
+				if (dogBits[dogmaxtomin[0]] < dogBits[dogmaxtomin[1]]) {
+					qSwap(dogmaxtomin[0], dogmaxtomin[1]);
+				}
+				if (dogBits[dogmaxtomin[1]] < dogBits[dogmaxtomin[2]]) {
+					qSwap(dogmaxtomin[1], dogmaxtomin[2]);
+					if (dogBits[dogmaxtomin[0]] < dogBits[dogmaxtomin[1]]) {
+						qSwap(dogmaxtomin[0], dogmaxtomin[1]);
+					}
+				}
+				uchar result[3];
+				result[maxtomin[0]] = dogBits[dogmaxtomin[0]];
+				result[maxtomin[2]] = dogBits[dogmaxtomin[2]];
+				result[maxtomin[1]] = uchar(qRound(result[maxtomin[2]] + (result[maxtomin[0]] - result[maxtomin[2]]) * coef));
+				dogBits[i] = result[2];
+				dogBits[i + 1] = result[1];
+				dogBits[i + 2] = result[0];
+			}
+		} else {
+			for (int i = 0, s = dog.width() * dog.height() * 4; i < s; i += 4) {
+				uchar b = dogBits[i], g = dogBits[i + 1], r = dogBits[i + 2];
+				dogBits[i] = dogBits[i + 1] = dogBits[i + 2] = (r + r + b + g + g + g) / 6;
+			}
+		}
+		delete cChatDogImage();
+		cSetChatDogImage(new QPixmap(QPixmap::fromImage(dog)));
+
+		memcpy(componentsScroll, components, sizeof(components));
+		memcpy(componentsPoint, components, sizeof(components));
+
+		if (max != min) {
+			if (min > uint64(qRound(0.77 * max))) {
+				uint64 newmin = qRound(0.77 * max); // min saturation 23%
+				uint64 newmid = max - ((max - mid) * (max - newmin)) / (max - min);
+				components[maxtomin[1]] = newmid;
+				components[maxtomin[2]] = newmin;
+			}
+			uint64 newmin = qRound(0.77 * max); // saturation 23% for scroll
+			uint64 newmid = max - ((max - mid) * (max - newmin)) / (max - min);
+			componentsScroll[maxtomin[1]] = newmid;
+			componentsScroll[maxtomin[2]] = newmin;
+
+			uint64 pmax = 227; // 89% brightness
+			uint64 pmin = qRound(0.75 * pmax); // 41% saturation
+			uint64 pmid = pmax - ((max - mid) * (pmax - pmin)) / (max - min);
+			componentsPoint[maxtomin[0]] = pmax;
+			componentsPoint[maxtomin[1]] = pmid;
+			componentsPoint[maxtomin[2]] = pmin;
+		} else {
+			componentsPoint[0] = componentsPoint[1] = componentsPoint[2] = 227; // 89% brightness
+		}
+
+		float64 luminance = 0.299 * componentsScroll[0] + 0.587 * componentsScroll[1] + 0.114 * componentsScroll[2];
+		uint64 maxScroll = max;
+		if (luminance < 0.5 * 0xFF) {
+			maxScroll += qRound(0.2 * 0xFF);
+		} else {
+			maxScroll -= qRound(0.2 * 0xFF);
+		}
+		componentsScroll[maxtomin[2]] = qMin(uint64(float64(componentsScroll[maxtomin[2]]) * maxScroll / float64(componentsScroll[maxtomin[0]])), 0xFFULL);
+		componentsScroll[maxtomin[1]] = qMin(uint64(float64(componentsScroll[maxtomin[1]]) * maxScroll / float64(componentsScroll[maxtomin[0]])), 0xFFULL);
+		componentsScroll[maxtomin[0]] = qMin(maxScroll, 0xFFULL);
+
+        if (max > uint64(qRound(0.2 * 0xFF))) { // brightness greater than 20%
+			max -= qRound(0.2 * 0xFF);
+		} else {
+			max = 0;
+		}
+		components[maxtomin[2]] = uint64(float64(components[maxtomin[2]]) * max / float64(components[maxtomin[0]]));
+		components[maxtomin[1]] = uint64(float64(components[maxtomin[1]]) * max / float64(components[maxtomin[0]]));
+		components[maxtomin[0]] = max;
+
+		uchar r = uchar(components[0]), g = uchar(components[1]), b = uchar(components[2]);
+		_msgServiceBG = style::color(r, g, b, qRound(st::msgServiceBG->c.alphaF() * 0xFF));
+
+		uchar rScroll = uchar(componentsScroll[0]), gScroll = uchar(componentsScroll[1]), bScroll = uchar(componentsScroll[2]);
+		_historyScrollBarColor = style::color(rScroll, gScroll, bScroll, qRound(st::historyScroll.barColor->c.alphaF() * 0xFF));
+		_historyScrollBgColor = style::color(rScroll, gScroll, bScroll, qRound(st::historyScroll.bgColor->c.alphaF() * 0xFF));
+		_historyScrollBarOverColor = style::color(rScroll, gScroll, bScroll, qRound(st::historyScroll.barOverColor->c.alphaF() * 0xFF));
+		_historyScrollBgOverColor = style::color(rScroll, gScroll, bScroll, qRound(st::historyScroll.bgOverColor->c.alphaF() * 0xFF));
+
+		uchar rPoint = uchar(componentsPoint[0]), gPoint = uchar(componentsPoint[1]), bPoint = uchar(componentsPoint[2]);
+		_introPointHoverColor = style::color(rPoint, gPoint, bPoint);
+		if (App::main()) App::main()->updateScrollColors();
+	}
+
+	style::color msgServiceBG() {
+		return _msgServiceBG;
+	}
+
+	style::color historyScrollBarColor() {
+		return _historyScrollBarColor;
+	}
+
+	style::color historyScrollBgColor() {
+		return _historyScrollBgColor;
+	}
+
+	style::color historyScrollBarOverColor() {
+		return _historyScrollBarOverColor;
+	}
+
+	style::color historyScrollBgOverColor() {
+		return _historyScrollBgOverColor;
+	}
+
+	style::color introPointHoverColor() {
+		return _introPointHoverColor;
+	}
+
+	WallPapers gServerBackgrounds;
+
 }

Telegram/SourceFiles/app.h

@@ -1,6 +1,6 @@
 /*
 This file is part of Telegram Desktop,
-an unofficial desktop messaging app, see https://telegram.org
+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
@@ -13,7 +13,7 @@ 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://tdesktop.com
+Copyright (c) 2014 John Preston, https://desktop.telegram.org
 */
 #pragma once
 
@@ -63,10 +63,12 @@ namespace App {
     int32 userFromPeer(const PeerId &peer_id);
     int32 chatFromPeer(const PeerId &peer_id);
 
+	int32 onlineForSort(int32 online, int32 now);
 	int32 onlineWillChangeIn(int32 onlineOnServer, int32 nowOnServer);
-	QString onlineText(int32 onlineOnServer, int32 nowOnServer, bool precise = false);
+	QString onlineText(UserData *user, int32 nowOnServer, bool precise = false);
+	bool onlineColorUse(int32 online, int32 now);
 
-	void feedUsers(const MTPVector<MTPUser> &users);
+	UserData *feedUsers(const MTPVector<MTPUser> &users); // returnes last user
 	void feedChats(const MTPVector<MTPChat> &chats);
 	void feedParticipants(const MTPChatParticipants &p);
 	void feedParticipantAdd(const MTPDupdateChatParticipantAdd &d);
@@ -79,6 +81,8 @@ namespace App {
 	void feedMessageMedia(MsgId msgId, const MTPMessage &msg);
 	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);
@@ -98,17 +102,16 @@ namespace App {
 	UserData *user(const PeerId &peer);
 	UserData *user(int32 user);
 	UserData *self();
+	UserData *userByName(const QString &username);
 	ChatData *chat(const PeerId &peer);
 	ChatData *chat(int32 chat);
 	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());
-	void forgetPhotos();
 	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);
-	void forgetVideos();
-	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);
-	void forgetAudios();
-	DocumentData *document(const DocumentId &document, DocumentData *convert = 0, const uint64 &access = 0, int32 user = 0, int32 date = 0, const QString &name = QString(), const QString &mime = QString(), const ImagePtr &thumb = ImagePtr(), int32 dc = 0, int32 size = 0);
-	void forgetDocuments();
+	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);
+	ImageLinkData *imageLink(const QString &imageLink, ImageLinkType type = InvalidImageLink, const QString &url = QString());
+	void forgetMedia();
 
 	MTPPhoto photoFromUserPhoto(MTPint userId, MTPint date, const MTPUserProfilePhoto &photo);
 
@@ -168,9 +171,8 @@ namespace App {
 	bool quiting();
 	void setQuiting();
 
-
-    QImage readImage(QByteArray data, QByteArray *format = 0);
-    QImage readImage(const QString &file, QByteArray *format = 0);
+    QImage readImage(QByteArray data, QByteArray *format = 0, bool opaque = true, bool *animated = 0);
+	QImage readImage(const QString &file, QByteArray *format = 0, bool opaque = true, bool *animated = 0, QByteArray *content = 0);
 
 	void regVideoItem(VideoData *data, HistoryItem *item);
 	void unregVideoItem(VideoData *data, HistoryItem *item);
@@ -188,5 +190,26 @@ namespace App {
 	void setProxySettings(QTcpSocket &socket);
 
 	void searchByHashtag(const QString &tag);
+	void openUserByName(const QString &username);
+	void openLocalUrl(const QString &url);
+
+	void initBackground(int32 id = 0, 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);
 
 };

Telegram/SourceFiles/application.cpp

@@ -1,6 +1,6 @@
 /*
 This file is part of Telegram Desktop,
-an unofficial desktop messaging app, see https://telegram.org
+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
@@ -13,7 +13,7 @@ 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://tdesktop.com
+Copyright (c) 2014 John Preston, https://desktop.telegram.org
 */
 #include "stdafx.h"
 #include "application.h"
@@ -28,6 +28,8 @@ Copyright (c) 2014 John Preston, https://tdesktop.com
 #include "boxes/confirmbox.h"
 #include "langloaderplain.h"
 
+#include "localstorage.h"
+
 namespace {
 	Application *mainApp = 0;
 	FileUploader *uploader = 0;
@@ -85,7 +87,9 @@ namespace {
 
 Application::Application(int &argc, char **argv) : PsApplication(argc, argv),
     serverName(psServerPrefix() + cGUIDStr()), closing(false),
-	updateRequestId(0), updateReply(0), updateThread(0), updateDownloader(0) {
+	updateRequestId(0), updateReply(0), updateThread(0), updateDownloader(0), _translator(0) {
+
+	DEBUG_LOG(("Application Info: creation.."));
 
 	QByteArray d(QDir((cPlatform() == dbipWindows ? cExeDir() : cWorkingDir()).toLower()).absolutePath().toUtf8());
 	char h[33] = { 0 };
@@ -100,7 +104,6 @@ Application::Application(int &argc, char **argv) : PsApplication(argc, argv),
 
 	installEventFilter(new _DebugWaiter(this));
 
-    QFontDatabase::addApplicationFont(qsl(":/gui/art/fonts/DejaVuSans.ttf"));
     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"));
@@ -120,10 +123,27 @@ Application::Application(int &argc, char **argv) : PsApplication(argc, argv),
         cSetRetina(true);
         cSetRetinaFactor(devicePixelRatio());
         cSetIntRetinaFactor(int32(cRetinaFactor()));
+		cSetConfigScale(dbisOne);
+		cSetRealScale(dbisOne);
     }
 
-	if (!cLangFile().isEmpty()) {
-		LangLoaderPlain loader(cLangFile());
+	if (cLang() < languageTest) {
+		cSetLang(languageId());
+	}
+	if (cLang() == languageTest) {
+		if (QFileInfo(cLangFile()).exists()) {
+			LangLoaderPlain loader(cLangFile());
+			cSetLangErrors(loader.errors());
+			if (!cLangErrors().isEmpty()) {
+				LOG(("Lang load errors: %1").arg(cLangErrors()));
+			} else if (!loader.warnings().isEmpty()) {
+				LOG(("Lang load warnings: %1").arg(loader.warnings()));
+			}
+		} else {
+			cSetLang(languageDefault);
+		}
+	} else if (cLang() > languageDefault && cLang() < languageCount) {
+		LangLoaderPlain loader(qsl(":/langs/lang_") + LanguageCodes[cLang()] + qsl(".strings"));
 		if (!loader.errors().isEmpty()) {
 			LOG(("Lang load errors: %1").arg(loader.errors()));
 		} else if (!loader.warnings().isEmpty()) {
@@ -131,15 +151,18 @@ Application::Application(int &argc, char **argv) : PsApplication(argc, argv),
 		}
 	}
 
+	installTranslator(_translator = new Translator());
+
+	Local::start();
 	style::startManager();
 	anim::startManager();
 	historyInit();
 
+	DEBUG_LOG(("Application Info: inited.."));
+
     window = new Window();
 
-    psInstallEventFilter();
-
-	updateCheckTimer.setSingleShot(true);
+	psInstallEventFilter();
 
 	connect(&socket, SIGNAL(connected()), this, SLOT(socketConnected()));
 	connect(&socket, SIGNAL(disconnected()), this, SLOT(socketDisconnected()));
@@ -151,13 +174,13 @@ Application::Application(int &argc, char **argv) : PsApplication(argc, argv),
 	connect(&updateCheckTimer, SIGNAL(timeout()), this, SLOT(startUpdateCheck()));
 	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);
 
-	killDownloadSessionsTimer.setSingleShot(true);
 	connect(&killDownloadSessionsTimer, SIGNAL(timeout()), this, SLOT(killDownloadSessions()));
 
-    if (cManyInstance()) {
+	if (cManyInstance()) {
 		startApp();
 	} else {
         DEBUG_LOG(("Application Info: connecting local socket to %1..").arg(serverName));
@@ -174,6 +197,7 @@ void Application::onAppUpdate(const MTPhelp_AppUpdate &response) {
 		startUpdateCheck();
 	} else {
 		updateThread = new QThread();
+		connect(updateThread, SIGNAL(finished()), updateThread, SLOT(deleteLater()));
 		updateDownloader = new PsUpdateDownloader(updateThread, response.c_help_appUpdate());
 		updateThread->start();
 	}
@@ -196,6 +220,7 @@ void Application::updateGotCurrent() {
 		int32 currentVersion = m.captured(1).toInt();
 		if (currentVersion > AppVersion) {
 			updateThread = new QThread();
+			connect(updateThread, SIGNAL(finished()), updateThread, SLOT(deleteLater()));
 			updateDownloader = new PsUpdateDownloader(updateThread, m.captured(2));
 			updateThread->start();
 		}
@@ -242,7 +267,7 @@ void Application::onUpdateFailed() {
 	if (updateDownloader) {
 		updateDownloader->deleteLater();
 		updateDownloader = 0;
-		if (updateThread) updateThread->deleteLater();
+		if (updateThread) updateThread->quit();
 		updateThread = 0;
 	}
 
@@ -345,16 +370,25 @@ void Application::killDownloadSessionsStop(int32 dc) {
 	}
 }
 
+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() {
 	uint64 ms = getms(), left = MTPAckSendWaiting + MTPKillFileSessionTimeout;
 	for (QMap<int32, uint64>::iterator i = killDownloadSessionTimes.begin(); i != killDownloadSessionTimes.end(); ) {
 		if (i.value() <= ms) {
-			for (int j = 1; j < MTPDownloadSessionsCount; ++j) {
-				MTP::killSession(MTP::dld[j] + i.key());
+			for (int j = 0; j < MTPDownloadSessionsCount; ++j) {
+				MTP::stopSession(MTP::dld[j] + i.key());
 			}
 			i = killDownloadSessionTimes.erase(i);
 		} else {
@@ -422,15 +456,15 @@ void Application::uploadProfilePhoto(const QImage &tosend, const PeerId &peerId)
 	PreparedPhotoThumbs photoThumbs;
 	QVector<MTPPhotoSize> photoSizes;
 
-	QPixmap thumb = QPixmap::fromImage(tosend.scaled(160, 160, Qt::KeepAspectRatio, Qt::SmoothTransformation));
+	QPixmap thumb = QPixmap::fromImage(tosend.scaled(160, 160, Qt::KeepAspectRatio, Qt::SmoothTransformation), Qt::ColorOnly);
 	photoThumbs.insert('a', thumb);
 	photoSizes.push_back(MTP_photoSize(MTP_string("a"), MTP_fileLocationUnavailable(MTP_long(0), MTP_int(0), MTP_long(0)), MTP_int(thumb.width()), MTP_int(thumb.height()), MTP_int(0)));
 
-	QPixmap medium = QPixmap::fromImage(tosend.scaled(320, 320, Qt::KeepAspectRatio, Qt::SmoothTransformation));
+	QPixmap medium = QPixmap::fromImage(tosend.scaled(320, 320, Qt::KeepAspectRatio, Qt::SmoothTransformation), Qt::ColorOnly);
 	photoThumbs.insert('b', medium);
 	photoSizes.push_back(MTP_photoSize(MTP_string("b"), MTP_fileLocationUnavailable(MTP_long(0), MTP_int(0), MTP_long(0)), MTP_int(medium.width()), MTP_int(medium.height()), MTP_int(0)));
 
-	QPixmap full = QPixmap::fromImage(tosend);
+	QPixmap full = QPixmap::fromImage(tosend, Qt::ColorOnly);
 	photoThumbs.insert('c', full);
 	photoSizes.push_back(MTP_photoSize(MTP_string("c"), MTP_fileLocationUnavailable(MTP_long(0), MTP_int(0), MTP_long(0)), MTP_int(full.width()), MTP_int(full.height()), MTP_int(0)));
 
@@ -446,7 +480,7 @@ void Application::uploadProfilePhoto(const QImage &tosend, const PeerId &peerId)
 	int32 filesize = 0;
 	QByteArray data;
 
-	ReadyLocalMedia ready(ToPreparePhoto, file, filename, filesize, data, id, id, 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);
 
 	connect(App::uploader(), SIGNAL(photoReady(MsgId, const MTPInputFile &)), App::app(), SLOT(photoUpdated(MsgId, const MTPInputFile &)), Qt::UniqueConnection);
 
@@ -464,7 +498,7 @@ void Application::stopUpdate() {
 	if (updateDownloader) {
 		updateDownloader->deleteLater();
 		updateDownloader = 0;
-		if (updateThread) updateThread->deleteLater();
+		if (updateThread) updateThread->quit();
 		updateThread = 0;
 	}
 }
@@ -473,8 +507,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()) {
@@ -489,7 +523,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);
@@ -551,6 +588,9 @@ void Application::socketConnected() {
 	for (QStringList::const_iterator i = lst.cbegin(), e = lst.cend(); i != e; ++i) {
 		commands += qsl("SEND:") + _escapeTo7bit(*i) + ';';
 	}
+	if (!cStartUrl().isEmpty()) {
+		commands += qsl("OPEN:") + _escapeTo7bit(cStartUrl()) + ';';
+	}
 	commands += qsl("CMD:show;");
 	DEBUG_LOG(("Application Info: writing commands %1").arg(commands));
 	socket.write(commands.toLocal8Bit());
@@ -611,9 +651,16 @@ void Application::socketError(QLocalSocket::LocalSocketError e) {
 }
 
 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 (!MTP::localKey().created()) {
-		MTP::createLocalKey(QByteArray());
+	if (!Local::oldKey().created()) {
+		Local::createOldKey();
 		cSetNeedConfigResave(true);
 	}
 	if (cNeedConfigResave()) {
@@ -621,20 +668,25 @@ void Application::startApp() {
 		App::writeUserConfig();
 		cSetNeedConfigResave(false);
 	}
+	DEBUG_LOG(("Application Info: user config read.."));
 
 	window->createWinId();
 	window->init();
 
+	DEBUG_LOG(("Application Info: window created.."));
 	readSupportTemplates();
 
-	MTP::setLayer(mtpLayerMax);
 	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);
 	} else {
@@ -648,6 +700,23 @@ void Application::startApp() {
 	}
 
 	QNetworkProxyFactory::setUseSystemConfiguration(true);
+	if (Local::oldMapVersion() < AppVersion) {
+		psRegisterCustomScheme();
+		if (Local::oldMapVersion()) {
+			QString versionFeatures;
+			if (DevChannel && Local::oldMapVersion() < 7015) {
+				versionFeatures = QString::fromUtf8("\xe2\x80\x94 Some translation keys added\n\xe2\x80\x94 Linux: fixed semibold font\n\xe2\x80\x94 Linux: tray icon should work better in non-Unity environments");
+			} else if (!DevChannel && Local::oldMapVersion() < 7016) {
+				versionFeatures = lang(lng_new_version7016).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);
+			}
+		}
+	}
+
+	window->updateIsActive(cOnlineFocusTimeout());
 }
 
 void Application::socketDisconnected() {
@@ -667,6 +736,7 @@ void Application::newInstanceConnected() {
 }
 
 void Application::readClients() {
+	QString startUrl;
 	QStringList toSend;
 	for (ClientSockets::iterator i = clients.begin(), e = clients.end(); i != e; ++i) {
 		i->second.append(i->first->readAll());
@@ -683,6 +753,10 @@ void Application::readClients() {
 					if (cSendPaths().isEmpty()) {
 						toSend.append(_escapeFrom7bit(cmds.mid(from + 5, to - from - 5)));
 					}
+				} else if (cmd.startsWith(qsl("OPEN:"))) {
+					if (cStartUrl().isEmpty()) {
+						startUrl = _escapeFrom7bit(cmds.mid(from + 5, to - from - 5));
+					}
 				} else {
 					LOG(("Application Error: unknown command %1 passed in local socket").arg(QString(cmd.constData(), cmd.length())));
 				}
@@ -703,6 +777,13 @@ void Application::readClients() {
 			App::wnd()->sendPaths();
 		}
 	}
+	if (!startUrl.isEmpty()) {
+		cSetStartUrl(startUrl);
+	}
+	if (!cStartUrl().isEmpty() && App::main() && App::self()) {
+		App::main()->openLocalUrl(cStartUrl());
+		cSetStartUrl(QString());
+	}
 }
 
 void Application::removeClients() {
@@ -746,18 +827,28 @@ Application::~Application() {
 	socket.close();
 	closeApplication();
 	App::deinitMedia();
+	deinitImageLinkManager();
 	mainApp = 0;
 	delete updateReply;
 	delete ::uploader;
 	updateReply = 0;
-	delete updateDownloader;
+	if (updateDownloader) updateDownloader->deleteLater();
 	updateDownloader = 0;
-	delete updateThread;
+	if (updateThread) updateThread->quit();
 	updateThread = 0;
 
 	delete window;
 
+	delete cChatBackground();
+	cSetChatBackground(0);
+
+	delete cChatDogImage();
+	cSetChatDogImage(0);
+
 	style::stopManager();
+	Local::stop();
+
+	delete _translator;
 }
 
 Application *Application::app() {
@@ -768,7 +859,7 @@ Window *Application::wnd() {
 	return mainApp ? mainApp->window : 0;
 }
 
-QString Application::lang() {
+QString Application::language() {
 	if (!lng.length()) {
 		lng = psCurrentLanguage();
 	}
@@ -778,6 +869,16 @@ QString Application::lang() {
 	return lng;
 }
 
+int32 Application::languageId() {
+	QByteArray l = language().toLatin1();
+	for (int32 i = 0; i < languageCount; ++i) {
+		if (l.at(0) == LanguageCodes[i][0] && l.at(1) == LanguageCodes[i][1]) {
+			return i;
+		}
+	}
+	return languageDefault;
+}
+
 MainWidget *Application::main() {
 	return mainApp ? mainApp->window->mainWidget() : 0;
 }

Telegram/SourceFiles/application.h

@@ -1,6 +1,6 @@
 /*
 This file is part of Telegram Desktop,
-an unofficial desktop messaging app, see https://telegram.org
+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
@@ -13,7 +13,7 @@ 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://tdesktop.com
+Copyright (c) 2014 John Preston, https://desktop.telegram.org
 */
 #pragma once
 
@@ -26,6 +26,7 @@ Copyright (c) 2014 John Preston, https://tdesktop.com
 
 class MainWidget;
 class FileUploader;
+class Translator;
 
 class Application : public PsApplication, public RPCSender {
 	Q_OBJECT
@@ -37,7 +38,8 @@ public:
 	
 	static Application *app();
 	static Window *wnd();
-	static QString lang();
+	static QString language();
+	static int32 languageId();
 	static MainWidget *main();
 
 	void onAppUpdate(const MTPhelp_AppUpdate &response);
@@ -73,11 +75,15 @@ public:
 	void killDownloadSessionsStart(int32 dc);
 	void killDownloadSessionsStop(int32 dc);
 
+	void checkLocalTime();
+
 signals:
 
 	void peerPhotoDone(PeerId peer);
 	void peerPhotoFail(PeerId peer);
 
+	void adjustSingleTimers();
+
 public slots:
 
 	void startUpdateCheck(bool forceWait = false);
@@ -104,13 +110,14 @@ public slots:
 	void onWriteUserConfig();
 
 	void killDownloadSessions();
+	void onAppStateChanged(Qt::ApplicationState state);
 
 private:
 
 	QMap<MsgId, PeerId> photoUpdates;
 
 	QMap<int32, uint64> killDownloadSessionTimes;
-	QTimer killDownloadSessionsTimer;
+	SingleTimer killDownloadSessionsTimer;
 
 	void startApp();
 
@@ -124,6 +131,8 @@ private:
 	ClientSockets clients;
 	bool closing;
 
+	uint64 lastActionTime;
+
 	void execExternal(const QString &cmd);
 
 	Window *window;
@@ -131,10 +140,12 @@ private:
 	mtpRequestId updateRequestId;
 	QNetworkAccessManager updateManager;
 	QNetworkReply *updateReply;
-	QTimer updateCheckTimer;
+	SingleTimer updateCheckTimer;
 	QThread *updateThread;
 	PsUpdateDownloader *updateDownloader;
 
 	QTimer writeUserConfigTimer;
-	
+
+	Translator *_translator;
+
 };

Telegram/SourceFiles/audio.cpp

@@ -1,6 +1,6 @@
 /*
 This file is part of Telegram Desktop,
-an unofficial desktop messaging app, see https://telegram.org
+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
@@ -13,7 +13,7 @@ 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://tdesktop.com
+Copyright (c) 2014 John Preston, https://desktop.telegram.org
 */
 #include "stdafx.h"
 #include "audio.h"
@@ -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() {
@@ -348,7 +364,6 @@ void VoiceMessagesFader::onTimer() {
 	VoiceMessages *voice = audioVoice();
 	if (!voice) return;
 
-	uint64 ms = getms();
 	for (int32 i = 0; i < AudioVoiceMsgSimultaneously; ++i) {
 		VoiceMessages::Msg &m(voice->_data[i]);
 		if (m.state == VoiceMessageStopped || m.state == VoiceMessagePaused || !m.source) continue;
@@ -404,7 +419,6 @@ void VoiceMessagesFader::onTimer() {
 						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) {
@@ -429,13 +443,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;
@@ -555,7 +600,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) {
@@ -564,9 +609,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);
@@ -682,6 +729,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();
 			}

Telegram/SourceFiles/audio.h

@@ -1,6 +1,6 @@
 /*
 This file is part of Telegram Desktop,
-an unofficial desktop messaging app, see https://telegram.org
+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
@@ -13,7 +13,7 @@ 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://tdesktop.com
+Copyright (c) 2014 John Preston, https://desktop.telegram.org
 */
 #pragma once
 
@@ -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;
 
 };
 

Telegram/SourceFiles/boxes/aboutbox.cpp

@@ -1,6 +1,6 @@
 /*
 This file is part of Telegram Desktop,
-an unofficial desktop messaging app, see https://telegram.org
+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
@@ -13,7 +13,7 @@ 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://tdesktop.com
+Copyright (c) 2014 John Preston, https://desktop.telegram.org
 */
 #include "stdafx.h"
 #include "lang.h"
@@ -24,7 +24,7 @@ Copyright (c) 2014 John Preston, https://tdesktop.com
 
 AboutBox::AboutBox() :
 _done(this, lang(lng_about_done), st::aboutCloseButton),
-_version(this, qsl("[a href=\"https://tdesktop.com/#version_history\"]") + textClean(lang(lng_about_version).replace(qsl("{version}"), QString::fromWCharArray(AppVersionStr))) + qsl("[/a]"), st::aboutVersion, st::defaultTextStyle),
+_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),
 _hiding(false), a_opacity(0, 1) {
 	

Telegram/SourceFiles/boxes/aboutbox.h

@@ -1,6 +1,6 @@
 /*
 This file is part of Telegram Desktop,
-an unofficial desktop messaging app, see https://telegram.org
+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
@@ -13,7 +13,7 @@ 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://tdesktop.com
+Copyright (c) 2014 John Preston, https://desktop.telegram.org
 */
 #pragma once
 

Telegram/SourceFiles/boxes/addcontactbox.cpp

@@ -1,6 +1,6 @@
 /*
 This file is part of Telegram Desktop,
-an unofficial desktop messaging app, see https://telegram.org
+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
@@ -13,7 +13,7 @@ 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://tdesktop.com
+Copyright (c) 2014 John Preston, https://desktop.telegram.org
 */
 #include "stdafx.h"
 #include "lang.h"
@@ -188,7 +188,7 @@ void AddContactBox::paintEvent(QPaintEvent *e) {
 				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), lang(lng_contact_not_joined).replace(qsl("{name}"), _sentName), style::al_topleft);
+				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);
 			}
 		}
 	} else {
@@ -260,7 +260,7 @@ bool AddContactBox::onSaveSelfFail(const RPCError &error) {
 	QString err(error.type());
 	QString firstName = textOneLine(_firstInput.text()), lastName = textOneLine(_lastInput.text());
 	if (err == "NAME_NOT_MODIFIED") {
-		App::self()->setName(firstName, lastName, firstName + ' ' + lastName, textOneLine(App::self()->username));
+		App::self()->setName(firstName, lastName, QString(), textOneLine(App::self()->username));
 		emit closed();
 		return true;
 	} else if (err == "FIRSTNAME_INVALID") {
@@ -281,7 +281,7 @@ bool AddContactBox::onSaveFail(const RPCError &error) {
 	QString err(error.type());
 	QString firstName = _firstInput.text().trimmed(), lastName = _lastInput.text().trimmed();
 	if (err == "CHAT_TITLE_NOT_MODIFIED") {
-		_peer->updateName(firstName, QString());
+		_peer->updateName(firstName, QString(), QString());
 		emit closed();
 		return true;
 	} else if (err == "NO_CHAT_TITLE") {
@@ -320,7 +320,7 @@ 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, lang(lng_contact_not_joined).replace(qsl("{name}"), _sentName)).height();
+		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 h = st::boxPadding.top() * 2 + theight + _retryButton.height() + st::boxPadding.bottom();
 		resize(_width, h);
 		_retryButton.move(_retryButton.x(), h - _retryButton.height());