wip linux webview

Fix build for macOS / Linux.
Simple receipt viewing.
2021-03-31 22:20:30 +04:00 · 2021-03-31 21:38:32 +04:00 · 2021-03-30 10:03:54 +04:00 · 2021-03-29 19:53:55 +04:00 · 2021-03-29 18:56:26 +04:00 · 2021-03-29 16:16:54 +04:00
966 changed files with 31942 additions and 53374 deletions
--- a/.gitattributes
+++ b/.gitattributes
@@ -4,6 +4,3 @@
 # Ensure diffs have LF endings
 *.diff text eol=lf
 *.bat text eol=crlf
-
-# Ensure lottie animations are treated as binary files
-*.lottie binary
--- a/.github/stale.yml
+++ b/.github/stale.yml
@@ -3,7 +3,7 @@ daysUntilStale: 180
 # Number of days of inactivity before a stale issue is closed
 daysUntilClose: 30
 # Issues with these labels will never be considered stale
-exemptLabels: [ "enhancement" ]
+exemptLabels: []
 # Label to use when marking an issue as stale
 staleLabel: stale
 # Comment to post when marking an issue as stale. Set to `false` to disable
--- a/.github/workflows/linux.yml
+++ b/.github/workflows/linux.yml
@@ -5,7 +5,7 @@ on:
    paths-ignore:
      - 'docs/**'
      - '**.md'
-      - '!docs/building-linux.md'
+      - '!docs/building-cmake.md'
      - 'changelog.txt'
      - 'LEGAL'
      - 'LICENSE'
@@ -13,6 +13,7 @@ on:
      - '!.github/workflows/linux.yml'
      - 'snap/**'
      - 'Telegram/build/**'
+      - 'Telegram/Patches/**'
      - 'Telegram/Resources/uwp/**'
      - 'Telegram/Resources/winrc/**'
      - 'Telegram/SourceFiles/platform/win/**'
@@ -24,7 +25,7 @@ on:
    paths-ignore:
      - 'docs/**'
      - '**.md'
-      - '!docs/building-linux.md'
+      - '!docs/building-cmake.md'
      - 'changelog.txt'
      - 'LEGAL'
      - 'LICENSE'
@@ -32,6 +33,7 @@ on:
      - '!.github/workflows/linux.yml'
      - 'snap/**'
      - 'Telegram/build/**'
+      - 'Telegram/Patches/**'
      - 'Telegram/Resources/uwp/**'
      - 'Telegram/Resources/winrc/**'
      - 'Telegram/SourceFiles/platform/win/**'
@@ -91,12 +93,6 @@ jobs:
          DEFINE=""
          if [ -n "${{ matrix.defines }}" ]; then
            DEFINE="-D ${{ matrix.defines }}=ON"
-            if [ "${{ matrix.defines }}" == "DESKTOP_APP_DISABLE_DBUS_INTEGRATION" ]; then
-              DEFINE="$DEFINE -D DESKTOP_APP_DISABLE_GTK_INTEGRATION=ON -D DESKTOP_APP_DISABLE_WEBKITGTK=ON"
-            fi
-            if [ "${{ matrix.defines }}" == "DESKTOP_APP_DISABLE_GTK_INTEGRATION" ]; then
-              DEFINE="$DEFINE -D DESKTOP_APP_DISABLE_WEBKITGTK=ON"
-            fi
            echo Define from matrix: $DEFINE
            echo "ARTIFACT_NAME=Telegram_${{ matrix.defines }}" >> $GITHUB_ENV
          else
--- a/.github/workflows/mac.yml
+++ b/.github/workflows/mac.yml
@@ -5,7 +5,7 @@ on:
    paths-ignore:
      - 'docs/**'
      - '**.md'
-      - '!docs/building-mac.md'
+      - '!docs/building-xcode.md'
      - 'changelog.txt'
      - 'LEGAL'
      - 'LICENSE'
@@ -14,6 +14,7 @@ on:
      - 'lib/xdg/**'
      - 'snap/**'
      - 'Telegram/build/**'
+      - 'Telegram/Patches/**'
      - 'Telegram/Resources/uwp/**'
      - 'Telegram/Resources/winrc/**'
      - 'Telegram/SourceFiles/platform/win/**'
@@ -23,7 +24,7 @@ on:
    paths-ignore:
      - 'docs/**'
      - '**.md'
-      - '!docs/building-mac.md'
+      - '!docs/building-xcode.md'
      - 'changelog.txt'
      - 'LEGAL'
      - 'LICENSE'
@@ -32,6 +33,7 @@ on:
      - 'lib/xdg/**'
      - 'snap/**'
      - 'Telegram/build/**'
+      - 'Telegram/Patches/**'
      - 'Telegram/Resources/uwp/**'
      - 'Telegram/Resources/winrc/**'
      - 'Telegram/SourceFiles/platform/win/**'
@@ -62,7 +64,7 @@ jobs:
      UPLOAD_ARTIFACT: "false"
      ONLY_CACHE: "false"
      MANUAL_CACHING: "2"
-      DOC_PATH: "docs/building-mac.md"
+      DOC_PATH: "docs/building-xcode.md"
      AUTO_CACHING: "1"

    steps:
@@ -203,16 +205,6 @@ jobs:
          cd $LibrariesPath
          sudo cp -R opus-cache/. /

-      - name: Rnnoise.
-        run: |
-          cd $LibrariesPath
-
-          git clone $GIT/desktop-app/rnnoise.git
-          mkdir -p rnnoise/out/Debug
-          cd rnnoise/out/Debug
-          cmake -G Ninja -DCMAKE_BUILD_TYPE=Debug ../..
-          ninja
-
      - name: Libiconv cache.
        id: cache-libiconv
        uses: actions/cache@v2
@@ -248,7 +240,7 @@ jobs:

          git clone $GIT/FFmpeg/FFmpeg.git ffmpeg
          cd ffmpeg
-          git checkout release/4.4
+          git checkout release/4.2
          CFLAGS=`freetype-config --cflags`
          LDFLAGS=`freetype-config --libs`
          PKG_CONFIG_PATH=$PKG_CONFIG_PATH:/usr/local/lib/pkgconfig:/usr/lib/pkgconfig:/usr/X11/lib/pkgconfig
@@ -325,6 +317,7 @@ jobs:
          --enable-decoder=pcm_u32be \
          --enable-decoder=pcm_u32le \
          --enable-decoder=pcm_u8 \
+          --enable-decoder=pcm_zork \
          --enable-decoder=vorbis \
          --enable-decoder=wavpack \
          --enable-decoder=wmalossless \
@@ -497,7 +490,6 @@ jobs:
          cmake -G Ninja \
          -DCMAKE_BUILD_TYPE=Debug \
          -DTG_OWT_SPECIAL_TARGET=mac \
-          -DTG_OWT_BUILD_AUDIO_BACKENDS=OFF \
          -DTG_OWT_LIBJPEG_INCLUDE_PATH=$PREFIX/include \
          -DTG_OWT_OPENSSL_INCLUDE_PATH=`pwd`/../../../openssl_$OPENSSL_VER/include \
          -DTG_OWT_OPUS_INCLUDE_PATH=$PREFIX/include/opus \
--- a/.github/workflows/snap.yml
+++ b/.github/workflows/snap.yml
@@ -11,6 +11,7 @@ on:
      - '.github/**'
      - '!.github/workflows/snap.yml'
      - 'Telegram/build/**'
+      - 'Telegram/Patches/**'
      - 'Telegram/Resources/uwp/**'
      - 'Telegram/Resources/winrc/**'
      - 'Telegram/SourceFiles/platform/win/**'
@@ -28,6 +29,7 @@ on:
      - '.github/**'
      - '!.github/workflows/snap.yml'
      - 'Telegram/build/**'
+      - 'Telegram/Patches/**'
      - 'Telegram/Resources/uwp/**'
      - 'Telegram/Resources/winrc/**'
      - 'Telegram/SourceFiles/platform/win/**'
--- a/.github/workflows/win.yml
+++ b/.github/workflows/win.yml
@@ -5,7 +5,7 @@ on:
    paths-ignore:
      - 'docs/**'
      - '**.md'
-      - '!docs/building-win.md'
+      - '!docs/building-msvc.md'
      - 'changelog.txt'
      - 'LEGAL'
      - 'LICENSE'
@@ -14,6 +14,8 @@ on:
      - 'lib/xdg/**'
      - 'snap/**'
      - 'Telegram/build/**'
+      - 'Telegram/Patches/**'
+      - '!Telegram/Patches/build_ffmpeg_win.sh'
      - 'Telegram/Resources/uwp/**'
      - 'Telegram/SourceFiles/platform/linux/**'
      - 'Telegram/SourceFiles/platform/mac/**'
@@ -24,7 +26,7 @@ on:
    paths-ignore:
      - 'docs/**'
      - '**.md'
-      - '!docs/building-win.md'
+      - '!docs/building-msvc.md'
      - 'changelog.txt'
      - 'LEGAL'
      - 'LICENSE'
@@ -33,9 +35,12 @@ on:
      - 'lib/xdg/**'
      - 'snap/**'
      - 'Telegram/build/**'
+      - 'Telegram/Patches/**'
+      - '!Telegram/Patches/build_ffmpeg_win.sh'
      - 'Telegram/Resources/uwp/**'
      - 'Telegram/SourceFiles/platform/linux/**'
      - 'Telegram/SourceFiles/platform/mac/**'
+      - '!Telegram/Patches/breakpad.diff'
      - 'Telegram/Telegram/**'
      - 'Telegram/configure.sh'
      - 'Telegram/Telegram.plist'
@@ -60,7 +65,7 @@ jobs:
      UPLOAD_ARTIFACT: "false"
      ONLY_CACHE: "false"
      MANUAL_CACHING: "2"
-      DOC_PATH: "docs/building-win.md"
+      DOC_PATH: "docs/building-msvc.md"
      AUTO_CACHING: "1"

    defaults:
@@ -99,7 +104,6 @@ jobs:
        shell: bash
        run: |
          curl -o $LibrariesPath/tg_owt-version.json https://api.github.com/repos/desktop-app/tg_owt/git/refs/heads/master
-          curl -o $LibrariesPath/tg_angle-version.json https://api.github.com/repos/desktop-app/tg_angle/git/refs/heads/master
          echo $MANUAL_CACHING >> CACHE_KEY.txt
          if [ "$AUTO_CACHING" == "1" ]; then
            thisFile=$REPO_NAME/.github/workflows/win.yml
@@ -110,11 +114,6 @@ jobs:
      - name: Choco installs.
        run: choco install --no-progress -y nasm yasm jom ninja

-      - name: NuGet sources.
-        run: |
-          nuget sources Disable -Name "Microsoft Visual Studio Offline Packages"
-          nuget sources Add -Source https://api.nuget.org/v3/index.json & exit 0
-
      - name: Patches.
        shell: bash
        run: |
@@ -280,17 +279,6 @@ jobs:
          msbuild -m opus.sln /property:Configuration=Debug /property:Platform="Win32"
          msbuild -m opus.sln /property:Configuration=Release /property:Platform="Win32"

-      - name: Rnnoise.
-        shell: cmd
-        run: |
-          %VC%
-
-          git clone %GIT%/desktop-app/rnnoise.git
-          mkdir rnnoise\out
-          cd rnnoise\out
-          cmake -A Win32 ..
-          cmake --build . --config Debug
-
      - name: FFmpeg cache.
        id: cache-ffmpeg
        uses: actions/cache@v2
@@ -305,40 +293,13 @@ jobs:

          git clone %GIT%/FFmpeg/FFmpeg.git ffmpeg
          cd ffmpeg
-          git checkout release/4.4
+          git checkout release/4.2
          set CHERE_INVOKING=enabled_from_arguments
          set MSYS2_PATH_TYPE=inherit
          call c:\tools\msys64\usr\bin\bash --login ../patches/build_ffmpeg_win.sh

          rmdir /S /Q .git

-      - name: Angle cache.
-        id: cache-angle
-        uses: actions/cache@v2
-        with:
-          path: ${{ env.LibrariesPath }}/tg_angle
-          key: ${{ runner.OS }}-angle-${{ env.CACHE_KEY }}-${{ hashFiles('**/tg_angle-version.json') }}
-      - name: Angle.
-        if: steps.cache-angle.outputs.cache-hit != 'true'
-        run: |
-          %VC%
-
-          git clone --recursive %GIT%/desktop-app/tg_angle.git
-          mkdir tg_angle\out\Debug
-          cd tg_angle\out\Debug
-          cmake -G Ninja ^
-          -DCMAKE_BUILD_TYPE=Debug ^
-          -DTG_ANGLE_SPECIAL_TARGET=win64 ^
-          -DTG_ANGLE_ZLIB_INCLUDE_PATH=%cd%/../../../zlib ../..
-          ninja
-
-          :: Cleanup.
-          cd %LibrariesPath%\tg_angle
-          move out\Debug\tg_angle.lib tg_angle.lib
-          rmdir /S /Q out
-          mkdir out\Debug
-          move tg_angle.lib out\Debug\tg_angle.lib
-
      - name: Qt 5.15.2 cache.
        id: cache-qt
        uses: actions/cache@v2
@@ -361,12 +322,7 @@ jobs:
          cd ..

          SET SSL=%LibrariesPath%\openssl_%OPENSSL_VER%
-          SET SSL_LIBS=libcrypto.lib Ws2_32.lib Gdi32.lib Advapi32.lib Crypt32.lib User32.lib
-
-          SET ANGLE=%LibrariesPath%\tg_angle
-          SET ANGLE_LIBS=d3d9.lib dxgi.lib dxguid.lib
-
-          SET ZLIB=%LibrariesPath%\zlib\contrib\vstudio\vc14\x86
+          SET LIBS=libcrypto.lib Ws2_32.lib Gdi32.lib Advapi32.lib Crypt32.lib User32.lib

          configure ^
          -prefix "%LibrariesPath%\Qt-%QT_VER%" ^
@@ -375,29 +331,18 @@ jobs:
          -opensource ^
          -confirm-license ^
          -static ^
-          -static-runtime ^
-          -opengl es2 -no-angle ^
-          -I "%ANGLE%\include" ^
-          -D "GL_APICALL=" ^
-          QMAKE_LIBS_OPENGL_ES2_DEBUG="%ANGLE%\out\Debug\tg_angle.lib %ZLIB%\ZlibStatDebug\zlibstat.lib %ANGLE_LIBS%" ^
-          QMAKE_LIBS_OPENGL_ES2_RELEASE="%ANGLE%\out\Release\tg_angle.lib %ZLIB%\ZlibStatReleaseWithoutAsm\zlibstat.lib %ANGLE_LIBS%" ^
-          -egl ^
-          -D "EGLAPI=" ^
-          -D "DESKTOP_APP_QT_STATIC_ANGLE=" ^
-          QMAKE_LIBS_EGL_DEBUG="%ANGLE%\out\Debug\tg_angle.lib %ZLIB%\ZlibStatDebug\zlibstat.lib %ANGLE_LIBS% Gdi32.lib User32.lib" ^
-          QMAKE_LIBS_EGL_RELEASE="%ANGLE%\out\Release\tg_angle.lib %ZLIB%\ZlibStatReleaseWithoutAsm\zlibstat.lib %ANGLE_LIBS% Gdi32.lib User32.lib" ^
+          -static-runtime -I "%SSL%\include" ^
+          -no-opengl ^
          -openssl-linked ^
-          -I "%SSL%\include" ^
-          OPENSSL_LIBS_DEBUG="%SSL%\out32.dbg\libssl.lib %SSL%\out32.dbg\%SSL_LIBS%" ^
-          OPENSSL_LIBS_RELEASE="%SSL%\out32\libssl.lib %SSL%\out32\%SSL_LIBS%" ^
-          -I "%LibrariesPath%\mozjpeg" ^
-          LIBJPEG_LIBS_DEBUG="%LibrariesPath%\mozjpeg\Debug\jpeg-static.lib" ^
-          LIBJPEG_LIBS_RELEASE="%LibrariesPath%\mozjpeg\Release\jpeg-static.lib" ^
+          OPENSSL_LIBS_DEBUG="%SSL%\out32.dbg\libssl.lib %SSL%\out32.dbg\%LIBS%" ^
+          OPENSSL_LIBS_RELEASE="%SSL%\out32\libssl.lib %SSL%\out32\%LIBS%" ^
          -mp ^
          -nomake examples ^
          -nomake tests ^
-          -platform win32-msvc
-
+          -platform win32-msvc ^
+          -I "%LibrariesPath%\mozjpeg" ^
+          LIBJPEG_LIBS_DEBUG="%LibrariesPath%\mozjpeg\Debug\jpeg-static.lib" ^
+          LIBJPEG_LIBS_RELEASE="%LibrariesPath%\mozjpeg\Release\jpeg-static.lib"
      - name: Qt 5.15.2 build.
        if: steps.cache-qt.outputs.cache-hit != 'true'
        run: |
@@ -427,7 +372,6 @@ jobs:
          cmake -G Ninja ^
          -DCMAKE_BUILD_TYPE=Debug ^
          -DTG_OWT_SPECIAL_TARGET=win ^
-          -DTG_OWT_BUILD_AUDIO_BACKENDS=OFF ^
          -DTG_OWT_LIBJPEG_INCLUDE_PATH=%cd%/../../../mozjpeg ^
          -DTG_OWT_OPENSSL_INCLUDE_PATH=%cd%/../../../openssl_%OPENSSL_VER%/include ^
          -DTG_OWT_OPUS_INCLUDE_PATH=%cd%/../../../opus/include ^
@@ -456,9 +400,6 @@ jobs:
          fi
          echo "TDESKTOP_BUILD_DEFINE=$DEFINE" >> $GITHUB_ENV

-      - name: Free up some disk space.
-        run: del /S *.pdb
-
      - name: Telegram Desktop build.
        if: env.ONLY_CACHE == 'false'
        run: |
--- a/.gitignore
+++ b/.gitignore
@@ -48,5 +48,3 @@ stage
 /Linux/
 /Telegram/Makefile
 *.*~
-.idea/
-cmake-build-debug/
--- a/.gitmodules
+++ b/.gitmodules
@@ -76,6 +76,9 @@
 [submodule "Telegram/ThirdParty/hime"]
 	path = Telegram/ThirdParty/hime
 	url = https://github.com/hime-ime/hime.git
+[submodule "Telegram/ThirdParty/qt5ct"]
+	path = Telegram/ThirdParty/qt5ct
+	url = https://github.com/desktop-app/qt5ct.git
 [submodule "Telegram/ThirdParty/fcitx5-qt"]
 	path = Telegram/ThirdParty/fcitx5-qt
 	url = https://github.com/fcitx/fcitx5-qt.git
@@ -88,9 +91,3 @@
 [submodule "Telegram/lib_webview"]
 	path = Telegram/lib_webview
 	url = https://github.com/desktop-app/lib_webview.git
-[submodule "Telegram/lib_waylandshells"]
-	path = Telegram/lib_waylandshells
-	url = https://github.com/desktop-app/lib_waylandshells.git
-[submodule "Telegram/ThirdParty/jemalloc"]
-	path = Telegram/ThirdParty/jemalloc
-	url = https://github.com/jemalloc/jemalloc
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -14,13 +14,8 @@ include(cmake/validate_special_target.cmake)
 include(cmake/version.cmake)
 desktop_app_parse_version(Telegram/build/version)

-set(project_langs C CXX)
-if (APPLE)
-    set(project_langs C CXX OBJC OBJCXX)
-endif()
-
 project(Telegram
-    LANGUAGES ${project_langs}
+    LANGUAGES C CXX
    VERSION ${desktop_app_version_cmake}
    DESCRIPTION "Official Telegram Desktop messenger"
    HOMEPAGE_URL "https://desktop.telegram.org"
@@ -29,7 +24,6 @@ set_property(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY VS_STARTUP_PROJECT T

 get_filename_component(third_party_loc "Telegram/ThirdParty" REALPATH)
 get_filename_component(submodules_loc "Telegram" REALPATH)
-get_filename_component(cmake_helpers_loc "cmake" REALPATH)

 include(cmake/variables.cmake)
 include(cmake/nice_target_sources.cmake)
@@ -37,8 +31,6 @@ include(cmake/target_link_static_libraries.cmake)
 include(cmake/target_link_frameworks.cmake)
 include(cmake/init_target.cmake)
 include(cmake/generate_target.cmake)
-include(cmake/nuget.cmake)
-include(cmake/validate_d3d_compiler.cmake)

 include(cmake/options.cmake)

--- a/README.md
+++ b/README.md
@@ -15,8 +15,7 @@ The source code is published under GPLv3 with OpenSSL exception, the license is

 The latest version is available for

-* [Windows 7 and above (64 bit)](https://telegram.org/dl/desktop/win64) ([portable](https://telegram.org/dl/desktop/win64_portable))
-* [Windows 7 and above (32 bit)](https://telegram.org/dl/desktop/win) ([portable](https://telegram.org/dl/desktop/win_portable))
+* [Windows 7 and above](https://telegram.org/dl/desktop/win) ([portable](https://telegram.org/dl/desktop/win_portable))
 * [macOS 10.12 and above](https://telegram.org/dl/desktop/mac)
 * [Linux static build for 64 bit](https://telegram.org/dl/desktop/linux)
 * [Snap](https://snapcraft.io/telegram-desktop)
@@ -53,19 +52,19 @@ Version **1.8.15** was the last that supports older systems
 * Guideline Support Library ([MIT License](https://github.com/Microsoft/GSL/blob/master/LICENSE))
 * Range-v3 ([Boost License](https://github.com/ericniebler/range-v3/blob/master/LICENSE.txt))
 * Open Sans font ([Apache License 2.0](http://www.apache.org/licenses/LICENSE-2.0.html))
-* Vazir font ([SIL Open Font License 1.1](https://github.com/rastikerdar/vazir-font/blob/master/OFL.txt))
+* Vazir font ([License](https://github.com/rastikerdar/vazir-font/blob/master/LICENSE))
 * Emoji alpha codes ([MIT License](https://github.com/emojione/emojione/blob/master/extras/alpha-codes/LICENSE.md))
 * Catch test framework ([Boost License](https://github.com/philsquared/Catch/blob/master/LICENSE.txt))
 * xxHash ([BSD License](https://github.com/Cyan4973/xxHash/blob/dev/LICENSE))
 * QR Code generator ([MIT License](https://github.com/nayuki/QR-Code-generator#license))
 * CMake ([New BSD License](https://github.com/Kitware/CMake/blob/master/Copyright.txt))
-* Hunspell ([LGPL](https://github.com/hunspell/hunspell/blob/master/COPYING.LESSER))
+* Hunspell ([GPL](https://github.com/hunspell/hunspell/blob/master/COPYING))

 ## Build instructions

-* Windows [(32-bit)][win32] [(64-bit)][win64]
-* [macOS][mac]
-* [GNU/Linux using Docker][linux]
+* [Visual Studio 2019][msvc]
+* [Xcode 12][xcode]
+* [CMake on GNU/Linux][cmake]

 [//]: # (LINKS)
 [telegram]: https://telegram.org
@@ -73,9 +72,9 @@ Version **1.8.15** was the last that supports older systems
 [telegram_api]: https://core.telegram.org
 [telegram_proto]: https://core.telegram.org/mtproto
 [license]: LICENSE
-[win32]: docs/building-win.md
-[win64]: docs/building-win-x64.md
-[mac]: docs/building-mac.md
-[linux]: docs/building-linux.md
+[msvc]: docs/building-msvc.md
+[xcode]: docs/building-xcode.md
+[xcode_old]: docs/building-xcode-old.md
+[cmake]: docs/building-cmake.md
 [preview_image]: https://github.com/telegramdesktop/tdesktop/blob/dev/docs/assets/preview.png "Preview of Telegram Desktop"
 [preview_image_url]: https://raw.githubusercontent.com/telegramdesktop/tdesktop/dev/docs/assets/preview.png
--- a/Telegram/CMakeLists.txt
+++ b/Telegram/CMakeLists.txt
@@ -18,9 +18,6 @@ endif()
 add_subdirectory(lib_storage)
 add_subdirectory(lib_lottie)
 add_subdirectory(lib_qr)
-if (LINUX AND NOT DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION)
-    add_subdirectory(lib_waylandshells)
-endif()
 add_subdirectory(lib_webrtc)
 add_subdirectory(lib_webview)
 add_subdirectory(codegen)
@@ -40,11 +37,6 @@ include(cmake/td_scheme.cmake)
 include(cmake/td_ui.cmake)
 include(cmake/generate_appdata_changelog.cmake)

-if (WIN32)
-    include(cmake/generate_midl.cmake)
-    generate_midl(Telegram ${src_loc}/platform/win/windows_quiethours.idl)
-endif()
-
 set_target_properties(Telegram PROPERTIES AUTOMOC ON AUTORCC ON)

 target_link_libraries(Telegram
@@ -82,6 +74,62 @@ PRIVATE
    desktop-app::external_xxhash
 )

+if (WIN32)
+    target_link_libraries(Telegram
+    PRIVATE
+        desktop-app::lib_webview_winrt
+    )
+elseif (LINUX)
+    target_link_libraries(Telegram
+    PRIVATE
+        desktop-app::external_glibmm
+        desktop-app::external_glib
+    )
+
+    if (NOT DESKTOP_APP_DISABLE_DBUS_INTEGRATION)
+        target_link_libraries(Telegram
+        PRIVATE
+            desktop-app::external_statusnotifieritem
+            desktop-app::external_dbusmenu_qt
+        )
+    endif()
+
+    if (NOT DESKTOP_APP_DISABLE_X11_INTEGRATION)
+        target_link_libraries(Telegram
+        PRIVATE
+            desktop-app::external_xcb
+        )
+    endif()
+
+    if (NOT DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION)
+        target_link_libraries(Telegram
+        PRIVATE
+            desktop-app::external_kwayland
+        )
+    endif()
+
+    if (NOT DESKTOP_APP_DISABLE_GTK_INTEGRATION)
+        find_package(PkgConfig REQUIRED)
+
+        if (DESKTOP_APP_USE_PACKAGED AND NOT DESKTOP_APP_USE_PACKAGED_LAZY)
+            pkg_check_modules(GTK3 REQUIRED IMPORTED_TARGET gtk+-3.0)
+            target_link_libraries(Telegram PRIVATE PkgConfig::GTK3)
+
+            if (NOT DESKTOP_APP_DISABLE_X11_INTEGRATION)
+                pkg_check_modules(X11 REQUIRED IMPORTED_TARGET x11)
+                target_link_libraries(Telegram PRIVATE PkgConfig::X11)
+            endif()
+        else()
+            pkg_search_module(GTK REQUIRED gtk+-3.0 gtk+-2.0)
+            target_include_directories(Telegram PRIVATE ${GTK_INCLUDE_DIRS})
+
+            if (NOT DESKTOP_APP_DISABLE_X11_INTEGRATION)
+                target_link_libraries(Telegram PRIVATE X11)
+            endif()
+        endif()
+    endif()
+endif()
+
 target_precompile_headers(Telegram PRIVATE ${src_loc}/stdafx.h)
 nice_target_sources(Telegram ${src_loc}
 PRIVATE
@@ -198,6 +246,8 @@ PRIVATE
    boxes/peer_lists_box.h
    boxes/passcode_box.cpp
    boxes/passcode_box.h
+    boxes/photo_crop_box.cpp
+    boxes/photo_crop_box.h
    boxes/rate_call_box.cpp
    boxes/rate_call_box.h
    boxes/self_destruction_box.cpp
@@ -216,40 +266,23 @@ PRIVATE
    boxes/url_auth_box.h
    boxes/username_box.cpp
    boxes/username_box.h
-    calls/group/calls_choose_join_as.cpp
-    calls/group/calls_choose_join_as.h
-    calls/group/calls_group_call.cpp
-    calls/group/calls_group_call.h
-    calls/group/calls_group_common.cpp
-    calls/group/calls_group_common.h
-    calls/group/calls_group_invite_controller.cpp
-    calls/group/calls_group_invite_controller.h
-    calls/group/calls_group_members.cpp
-    calls/group/calls_group_members.h
-    calls/group/calls_group_members_row.cpp
-    calls/group/calls_group_members_row.h
-    calls/group/calls_group_menu.cpp
-    calls/group/calls_group_menu.h
-    calls/group/calls_group_panel.cpp
-    calls/group/calls_group_panel.h
-    calls/group/calls_group_settings.cpp
-    calls/group/calls_group_settings.h
-    calls/group/calls_group_toasts.cpp
-    calls/group/calls_group_toasts.h
-    calls/group/calls_group_viewport.cpp
-    calls/group/calls_group_viewport.h
-    calls/group/calls_group_viewport_opengl.cpp
-    calls/group/calls_group_viewport_opengl.h
-    calls/group/calls_group_viewport_raster.cpp
-    calls/group/calls_group_viewport_raster.h
-    calls/group/calls_group_viewport_tile.cpp
-    calls/group/calls_group_viewport_tile.h
-    calls/group/calls_volume_item.cpp
-    calls/group/calls_volume_item.h
    calls/calls_box_controller.cpp
    calls/calls_box_controller.h
    calls/calls_call.cpp
    calls/calls_call.h
+    calls/calls_choose_join_as.cpp
+    calls/calls_choose_join_as.h
+    calls/calls_group_call.cpp
+    calls/calls_group_call.h
+    calls/calls_group_common.h
+    calls/calls_group_members.cpp
+    calls/calls_group_members.h
+    calls/calls_group_menu.cpp
+    calls/calls_group_menu.h
+    calls/calls_group_panel.cpp
+    calls/calls_group_panel.h
+    calls/calls_group_settings.cpp
+    calls/calls_group_settings.h
    calls/calls_emoji_fingerprint.cpp
    calls/calls_emoji_fingerprint.h
    calls/calls_instance.cpp
@@ -264,10 +297,8 @@ PRIVATE
    calls/calls_userpic.h
    calls/calls_video_bubble.cpp
    calls/calls_video_bubble.h
-    calls/calls_video_incoming.cpp
-    calls/calls_video_incoming.h
-    chat_helpers/bot_command.cpp
-    chat_helpers/bot_command.h
+    calls/calls_volume_item.cpp
+    calls/calls_volume_item.h
    chat_helpers/bot_keyboard.cpp
    chat_helpers/bot_keyboard.h
    chat_helpers/emoji_keywords.cpp
@@ -316,8 +347,6 @@ PRIVATE
    core/core_cloud_password.h
    core/core_settings.cpp
    core/core_settings.h
-    core/core_settings_proxy.cpp
-    core/core_settings_proxy.h
    core/crash_report_window.cpp
    core/crash_report_window.h
    core/crash_reports.cpp
@@ -343,7 +372,6 @@ PRIVATE
    data/stickers/data_stickers_set.h
    data/stickers/data_stickers.cpp
    data/stickers/data_stickers.h
-    data/data_abstract_sparse_ids.h
    data/data_abstract_structure.cpp
    data/data_abstract_structure.h
    data/data_auto_download.cpp
@@ -366,14 +394,10 @@ PRIVATE
    data/data_document.h
    data/data_document_media.cpp
    data/data_document_media.h
-    data/data_document_resolver.cpp
-    data/data_document_resolver.h
    data/data_drafts.cpp
    data/data_drafts.h
    data/data_folder.cpp
    data/data_folder.h
-    data/data_file_click_handler.cpp
-    data/data_file_click_handler.h
    data/data_file_origin.cpp
    data/data_file_origin.h
    data/data_flags.h
@@ -396,8 +420,6 @@ PRIVATE
    data/data_notify_settings.h
    data/data_peer.cpp
    data/data_peer.h
-    data/data_peer_id.cpp
-    data/data_peer_id.h
    data/data_peer_values.cpp
    data/data_peer_values.h
    data/data_photo.cpp
@@ -456,40 +478,6 @@ PRIVATE
    dialogs/dialogs_search_from_controllers.h
    dialogs/dialogs_widget.cpp
    dialogs/dialogs_widget.h
-    editor/color_picker.cpp
-    editor/color_picker.h
-    editor/controllers/controllers.h
-    editor/controllers/stickers_panel_controller.cpp
-    editor/controllers/stickers_panel_controller.h
-    editor/controllers/undo_controller.cpp
-    editor/controllers/undo_controller.h
-    editor/editor_crop.cpp
-    editor/editor_crop.h
-    editor/editor_paint.cpp
-    editor/editor_paint.h
-    editor/photo_editor.cpp
-    editor/photo_editor.h
-    editor/photo_editor_common.cpp
-    editor/photo_editor_common.h
-    editor/photo_editor_content.cpp
-    editor/photo_editor_content.h
-    editor/photo_editor_controls.cpp
-    editor/photo_editor_controls.h
-    editor/photo_editor_inner_common.h
-    editor/photo_editor_layer_widget.cpp
-    editor/photo_editor_layer_widget.h
-    editor/scene/scene.cpp
-    editor/scene/scene.h
-    editor/scene/scene_item_base.cpp
-    editor/scene/scene_item_base.h
-    editor/scene/scene_item_canvas.cpp
-    editor/scene/scene_item_canvas.h
-    editor/scene/scene_item_image.cpp
-    editor/scene/scene_item_image.h
-    editor/scene/scene_item_line.cpp
-    editor/scene/scene_item_line.h
-    editor/scene/scene_item_sticker.cpp
-    editor/scene/scene_item_sticker.h
    export/export_manager.cpp
    export/export_manager.h
    export/view/export_view_content.cpp
@@ -567,8 +555,6 @@ PRIVATE
    history/view/history_view_cursor_state.h
    history/view/history_view_element.cpp
    history/view/history_view_element.h
-    history/view/history_view_empty_list_bubble.cpp
-    history/view/history_view_empty_list_bubble.h
    history/view/history_view_group_call_tracker.cpp
    history/view/history_view_group_call_tracker.h
    history/view/history_view_list_widget.cpp
@@ -705,10 +691,6 @@ PRIVATE
    lang/lang_numbers_animation.h
    lang/lang_translator.cpp
    lang/lang_translator.h
-    layout/layout_document_generic_preview.cpp
-    layout/layout_document_generic_preview.h
-    layout/layout_item_base.cpp
-    layout/layout_item_base.h
    main/main_account.cpp
    main/main_account.h
    main/main_app_config.cpp
@@ -719,8 +701,6 @@ PRIVATE
    main/main_session.h
    main/main_session_settings.cpp
    main/main_session_settings.h
-    media/system_media_controls_manager.h
-    media/system_media_controls_manager.cpp
    media/audio/media_audio.cpp
    media/audio/media_audio.h
    media/audio/media_audio_capture.cpp
@@ -775,25 +755,14 @@ PRIVATE
    media/streaming/media_streaming_video_track.h
    media/view/media_view_group_thumbs.cpp
    media/view/media_view_group_thumbs.h
-    media/view/media_view_overlay_opengl.cpp
-    media/view/media_view_overlay_opengl.h
-    media/view/media_view_overlay_raster.cpp
-    media/view/media_view_overlay_raster.h
-    media/view/media_view_overlay_renderer.h
    media/view/media_view_overlay_widget.cpp
    media/view/media_view_overlay_widget.h
    media/view/media_view_pip.cpp
    media/view/media_view_pip.h
-    media/view/media_view_pip_opengl.cpp
-    media/view/media_view_pip_opengl.h
-    media/view/media_view_pip_raster.cpp
-    media/view/media_view_pip_raster.h
-    media/view/media_view_pip_renderer.h
    media/view/media_view_playback_controls.cpp
    media/view/media_view_playback_controls.h
    media/view/media_view_playback_progress.cpp
    media/view/media_view_playback_progress.h
-    media/view/media_view_open_common.h
    mtproto/config_loader.cpp
    mtproto/config_loader.h
    mtproto/connection_abstract.cpp
@@ -850,13 +819,19 @@ PRIVATE
    platform/linux/linux_desktop_environment.h
    platform/linux/linux_gdk_helper.cpp
    platform/linux/linux_gdk_helper.h
-    platform/linux/linux_gtk_integration_dummy.cpp
+    platform/linux/linux_gsd_media_keys.cpp
+    platform/linux/linux_gsd_media_keys.h
+    platform/linux/linux_gtk_file_dialog.cpp
+    platform/linux/linux_gtk_file_dialog.h
    platform/linux/linux_gtk_integration_p.h
    platform/linux/linux_gtk_integration.cpp
    platform/linux/linux_gtk_integration.h
    platform/linux/linux_gtk_open_with_dialog.cpp
    platform/linux/linux_gtk_open_with_dialog.h
-    platform/linux/linux_wayland_integration_dummy.cpp
+    platform/linux/linux_mpris_support.cpp
+    platform/linux/linux_mpris_support.h
+    platform/linux/linux_notification_service_watcher.cpp
+    platform/linux/linux_notification_service_watcher.h
    platform/linux/linux_wayland_integration.cpp
    platform/linux/linux_wayland_integration.h
    platform/linux/linux_xdp_file_dialog.cpp
@@ -869,16 +844,15 @@ PRIVATE
    platform/linux/launcher_linux.h
    platform/linux/main_window_linux.cpp
    platform/linux/main_window_linux.h
-    platform/linux/notifications_manager_linux_dummy.cpp
    platform/linux/notifications_manager_linux.cpp
    platform/linux/notifications_manager_linux.h
    platform/linux/specific_linux.cpp
    platform/linux/specific_linux.h
+    platform/linux/window_title_linux.h
    platform/mac/file_utilities_mac.mm
    platform/mac/file_utilities_mac.h
    platform/mac/launcher_mac.mm
    platform/mac/launcher_mac.h
-    platform/mac/mac_iconv_helper.c
    platform/mac/main_window_mac.mm
    platform/mac/main_window_mac.h
    platform/mac/notifications_manager_mac.mm
@@ -888,6 +862,7 @@ PRIVATE
    platform/mac/specific_mac_p.mm
    platform/mac/specific_mac_p.h
    platform/mac/window_title_mac.mm
+    platform/mac/window_title_mac.h
    platform/mac/touchbar/items/mac_formatter_item.h
    platform/mac/touchbar/items/mac_formatter_item.mm
    platform/mac/touchbar/items/mac_pinned_chats_item.h
@@ -918,6 +893,8 @@ PRIVATE
    platform/win/notifications_manager_win.h
    platform/win/specific_win.cpp
    platform/win/specific_win.h
+    platform/win/window_title_win.cpp
+    platform/win/window_title_win.h
    platform/win/windows_app_user_model_id.cpp
    platform/win/windows_app_user_model_id.h
    platform/win/windows_dlls.cpp
@@ -1017,10 +994,6 @@ PRIVATE
    support/support_helper.h
    support/support_templates.cpp
    support/support_templates.h
-    ui/chat/attach/attach_item_single_file_preview.cpp
-    ui/chat/attach/attach_item_single_file_preview.h
-    ui/chat/attach/attach_item_single_media_preview.cpp
-    ui/chat/attach/attach_item_single_media_preview.h
    ui/effects/fireworks_animation.cpp
    ui/effects/fireworks_animation.h
    ui/effects/round_checkbox.cpp
@@ -1056,8 +1029,6 @@ PRIVATE
    ui/search_field_controller.h
    ui/special_buttons.cpp
    ui/special_buttons.h
-    ui/text/format_song_document_name.cpp
-    ui/text/format_song_document_name.h
    ui/unread_badge.cpp
    ui/unread_badge.h
    window/main_window.cpp
@@ -1071,8 +1042,6 @@ PRIVATE
    window/section_memento.h
    window/section_widget.cpp
    window/section_widget.h
-    window/window_adaptive.cpp
-    window/window_adaptive.h
    window/window_connecting_widget.cpp
    window/window_connecting_widget.h
    window/window_controller.cpp
@@ -1091,11 +1060,13 @@ PRIVATE
    window/window_outdated_bar.h
    window/window_peer_menu.cpp
    window/window_peer_menu.h
-    window/window_section_common.h
    window/window_session_controller.cpp
    window/window_session_controller.h
    window/window_slide_animation.cpp
    window/window_slide_animation.h
+    window/window_title_qt.cpp
+    window/window_title_qt.h
+    window/window_title.h
    window/window_top_bar_wrap.h
    window/themes/window_theme.cpp
    window/themes/window_theme.h
@@ -1122,6 +1093,8 @@ PRIVATE
    config.h
    facades.cpp
    facades.h
+    layout.cpp
+    layout.h
    logs.cpp
    logs.h
    main.cpp
@@ -1134,49 +1107,59 @@ PRIVATE
    stdafx.h
 )

+if (NOT LINUX)
+    remove_target_sources(Telegram ${src_loc}
+        window/window_title_qt.cpp
+        window/window_title_qt.h
+    )
+endif()
+
 if (DESKTOP_APP_DISABLE_DBUS_INTEGRATION)
    remove_target_sources(Telegram ${src_loc}
+        platform/linux/linux_gsd_media_keys.cpp
+        platform/linux/linux_gsd_media_keys.h
+        platform/linux/linux_mpris_support.cpp
+        platform/linux/linux_mpris_support.h
+        platform/linux/linux_notification_service_watcher.cpp
+        platform/linux/linux_notification_service_watcher.h
        platform/linux/linux_xdp_file_dialog.cpp
        platform/linux/linux_xdp_file_dialog.h
        platform/linux/linux_xdp_open_with_dialog.cpp
        platform/linux/linux_xdp_open_with_dialog.h
        platform/linux/notifications_manager_linux.cpp
    )
-else()
-    remove_target_sources(Telegram ${src_loc}
+
+    nice_target_sources(Telegram ${src_loc}
+    PRIVATE
        platform/linux/notifications_manager_linux_dummy.cpp
    )
 endif()

 if (DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION)
-    remove_target_sources(Telegram ${src_loc}
-        platform/linux/linux_wayland_integration.cpp
-    )
-else()
-    remove_target_sources(Telegram ${src_loc}
-        platform/linux/linux_wayland_integration_dummy.cpp
-    )
+    remove_target_sources(Telegram ${src_loc} platform/linux/linux_wayland_integration.cpp)
+    nice_target_sources(Telegram ${src_loc} PRIVATE platform/linux/linux_wayland_integration_dummy.cpp)
 endif()

 if (DESKTOP_APP_DISABLE_GTK_INTEGRATION)
    remove_target_sources(Telegram ${src_loc}
        platform/linux/linux_gdk_helper.cpp
        platform/linux/linux_gdk_helper.h
+        platform/linux/linux_gtk_file_dialog.cpp
+        platform/linux/linux_gtk_file_dialog.h
        platform/linux/linux_gtk_integration_p.h
        platform/linux/linux_gtk_integration.cpp
        platform/linux/linux_gtk_open_with_dialog.cpp
        platform/linux/linux_gtk_open_with_dialog.h
    )
-else()
-    remove_target_sources(Telegram ${src_loc}
+
+    nice_target_sources(Telegram ${src_loc}
+    PRIVATE
        platform/linux/linux_gtk_integration_dummy.cpp
    )
 endif()

-if (DESKTOP_APP_USE_PACKAGED)
-    remove_target_sources(Telegram ${src_loc}
-        platform/mac/mac_iconv_helper.c
-    )
+if (NOT DESKTOP_APP_USE_PACKAGED)
+    nice_target_sources(Telegram ${src_loc} PRIVATE platform/mac/mac_iconv_helper.c)
 endif()

 nice_target_sources(Telegram ${res_loc}
@@ -1212,6 +1195,8 @@ if (WIN32)
    #     $<IF:${release},"Appending compatibility manifest.","Finalizing build.">
    # )
 elseif (APPLE)
+    target_link_libraries(Telegram PRIVATE desktop-app::external_sp_media_key_tap)
+
    if (NOT DESKTOP_APP_USE_PACKAGED)
        target_link_libraries(Telegram PRIVATE desktop-app::external_iconv)
    endif()
@@ -1253,48 +1238,6 @@ elseif (APPLE)
            )
        endif()
    endif()
-else()
-    target_link_libraries(Telegram
-    PRIVATE
-        desktop-app::external_glibmm
-        desktop-app::external_glib
-    )
-
-    if (NOT DESKTOP_APP_DISABLE_DBUS_INTEGRATION)
-        target_link_libraries(Telegram
-        PRIVATE
-            desktop-app::external_statusnotifieritem
-            desktop-app::external_dbusmenu_qt
-        )
-    endif()
-
-    if (NOT DESKTOP_APP_DISABLE_X11_INTEGRATION)
-        target_link_libraries(Telegram
-        PRIVATE
-            desktop-app::external_xcb
-        )
-    endif()
-
-    if (NOT DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION)
-        target_link_libraries(Telegram
-        PRIVATE
-            desktop-app::lib_waylandshells
-            desktop-app::external_kwayland
-        )
-    endif()
-
-    if (NOT DESKTOP_APP_DISABLE_GTK_INTEGRATION)
-        find_package(PkgConfig REQUIRED)
-
-        pkg_check_modules(GTK REQUIRED gtk+-3.0)
-        target_include_directories(Telegram SYSTEM PRIVATE ${GTK_INCLUDE_DIRS})
-
-        if (NOT DESKTOP_APP_DISABLE_X11_INTEGRATION)
-            target_link_libraries(Telegram PRIVATE X11)
-        endif()
-
-        target_link_libraries(Telegram PRIVATE rt)
-    endif()
 endif()

 if (build_macstore)
@@ -1368,32 +1311,6 @@ endif()

 set_target_properties(Telegram PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${output_folder})

-if (WIN32)
-    target_link_options(Telegram
-    PRIVATE
-        /DELAYLOAD:secur32.dll
-        /DELAYLOAD:winmm.dll
-        /DELAYLOAD:ws2_32.dll
-        /DELAYLOAD:user32.dll
-        /DELAYLOAD:gdi32.dll
-        /DELAYLOAD:advapi32.dll
-        /DELAYLOAD:shell32.dll
-        /DELAYLOAD:ole32.dll
-        /DELAYLOAD:oleaut32.dll
-        /DELAYLOAD:shlwapi.dll
-        /DELAYLOAD:iphlpapi.dll
-        /DELAYLOAD:gdiplus.dll
-        /DELAYLOAD:version.dll
-        /DELAYLOAD:dwmapi.dll
-        /DELAYLOAD:crypt32.dll
-        /DELAYLOAD:bcrypt.dll
-        /DELAYLOAD:imm32.dll
-        /DELAYLOAD:netapi32.dll
-        /DELAYLOAD:userenv.dll
-        /DELAYLOAD:wtsapi32.dll
-    )
-endif()
-
 if ((NOT DESKTOP_APP_DISABLE_AUTOUPDATE OR APPLE) AND NOT build_macstore AND NOT build_winstore)
    add_executable(Updater WIN32)
    init_target(Updater)
@@ -1410,26 +1327,8 @@ if ((NOT DESKTOP_APP_DISABLE_AUTOUPDATE OR APPLE) AND NOT build_macstore AND NOT

    set_target_properties(Updater PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${output_folder})

-    if (WIN32)
-        get_filename_component(lib_base_loc lib_base REALPATH)
-        nice_target_sources(Updater ${lib_base_loc}
-        PRIVATE
-            base/platform/win/base_windows_safe_library.cpp
-            base/platform/win/base_windows_safe_library.h
-        )
-        target_include_directories(Updater PRIVATE ${lib_base_loc})
-        if (CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
-            target_link_options(Updater
-            PRIVATE
-                /DELAYLOAD:user32.dll
-                /DELAYLOAD:advapi32.dll
-                /DELAYLOAD:shell32.dll
-                /DELAYLOAD:ole32.dll
-                /DELAYLOAD:shlwapi.dll
-            )
-        else()
-            target_link_options(Updater PRIVATE -municode)
-        endif()
+    if (WIN32 AND NOT CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
+        target_link_options(Updater PRIVATE -municode)
    endif()

    if (LINUX)
@@ -1437,7 +1336,7 @@ if ((NOT DESKTOP_APP_DISABLE_AUTOUPDATE OR APPLE) AND NOT build_macstore AND NOT
    endif()

    if (DESKTOP_APP_SPECIAL_TARGET)
-        add_executable(Packer)
+        add_executable(Packer WIN32)
        init_target(Packer)

        add_dependencies(Telegram Packer)
--- a/Telegram/Patches/breakpad.diff
+++ b/Telegram/Patches/breakpad.diff
@@ -0,0 +1,651 @@
+diff --git a/src/build/common.gypi b/src/build/common.gypi
+index 29990c65..53e99d44 100644
+--- a/src/build/common.gypi
+++ b/src/build/common.gypi
+@@ -330,6 +330,7 @@
+           'VCCLCompilerTool': {
+             'WarnAsError': 'true',
+             'Detect64BitPortabilityProblems': 'false',
+            'TreatWChar_tAsBuiltInType': 'false',
+           },
+         },
+       }],
+diff --git a/src/client/mac/Breakpad.xcodeproj/project.pbxproj b/src/client/mac/Breakpad.xcodeproj/project.pbxproj
+index 1a93ce6d..b5986e33 100644
+--- a/src/client/mac/Breakpad.xcodeproj/project.pbxproj
+++ b/src/client/mac/Breakpad.xcodeproj/project.pbxproj
+@@ -35,6 +35,19 @@
+ /* End PBXAggregateTarget section */
+ 
+ /* Begin PBXBuildFile section */
+		0748C0431C63C409004489BF /* MachIPC.mm in Sources */ = {isa = PBXBuildFile; fileRef = F92C53790ECCE635009BE4BA /* MachIPC.mm */; };
+		0748C0441C63C43C004489BF /* minidump_generator.cc in Sources */ = {isa = PBXBuildFile; fileRef = F92C536F0ECCE3FD009BE4BA /* minidump_generator.cc */; };
+		0748C0451C63C46C004489BF /* string_utilities.cc in Sources */ = {isa = PBXBuildFile; fileRef = F92C53820ECCE635009BE4BA /* string_utilities.cc */; };
+		0748C0461C63C484004489BF /* minidump_file_writer.cc in Sources */ = {isa = PBXBuildFile; fileRef = F92C538F0ECCE70A009BE4BA /* minidump_file_writer.cc */; };
+		0748C0471C63C4A1004489BF /* dynamic_images.cc in Sources */ = {isa = PBXBuildFile; fileRef = F92C536B0ECCE3FD009BE4BA /* dynamic_images.cc */; };
+		0748C0491C63C4CF004489BF /* macho_id.cc in Sources */ = {isa = PBXBuildFile; fileRef = F92C537A0ECCE635009BE4BA /* macho_id.cc */; };
+		0748C04A1C63C4D4004489BF /* string_conversion.cc in Sources */ = {isa = PBXBuildFile; fileRef = F92C53850ECCE6AD009BE4BA /* string_conversion.cc */; };
+		0748C04B1C63C4DB004489BF /* convert_UTF.c in Sources */ = {isa = PBXBuildFile; fileRef = F92C53870ECCE6C0009BE4BA /* convert_UTF.c */; };
+		0748C04C1C63C4EA004489BF /* macho_utilities.cc in Sources */ = {isa = PBXBuildFile; fileRef = F92C537C0ECCE635009BE4BA /* macho_utilities.cc */; };
+		0748C04D1C63C50F004489BF /* file_id.cc in Sources */ = {isa = PBXBuildFile; fileRef = F92C53740ECCE635009BE4BA /* file_id.cc */; };
+		0748C04E1C63C51C004489BF /* md5.cc in Sources */ = {isa = PBXBuildFile; fileRef = 4D72CA0D13DFAD5C006CABE3 /* md5.cc */; };
+		0748C04F1C63C523004489BF /* macho_walker.cc in Sources */ = {isa = PBXBuildFile; fileRef = F92C537E0ECCE635009BE4BA /* macho_walker.cc */; };
+		0748C0501C63C52D004489BF /* bootstrap_compat.cc in Sources */ = {isa = PBXBuildFile; fileRef = 4D61A25D14F43CFC002D5862 /* bootstrap_compat.cc */; };
+ 		162F64F2161C577500CD68D5 /* arch_utilities.cc in Sources */ = {isa = PBXBuildFile; fileRef = 162F64F0161C577500CD68D5 /* arch_utilities.cc */; };
+ 		162F64F3161C577500CD68D5 /* arch_utilities.h in Headers */ = {isa = PBXBuildFile; fileRef = 162F64F1161C577500CD68D5 /* arch_utilities.h */; };
+ 		162F64F4161C579B00CD68D5 /* arch_utilities.cc in Sources */ = {isa = PBXBuildFile; fileRef = 162F64F0161C577500CD68D5 /* arch_utilities.cc */; };
+@@ -67,6 +80,7 @@
+ 		4DBE49A7134A4F280072546A /* CoreServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4DBE4769134A4F080072546A /* CoreServices.framework */; };
+ 		4DBE49A8134A4F380072546A /* CoreServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4DBE4769134A4F080072546A /* CoreServices.framework */; };
+ 		4DBE49A9134A4F460072546A /* CoreServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4DBE4769134A4F080072546A /* CoreServices.framework */; };
+		5A8B220921E0C5740045F83C /* breakpad_nlist_64.cc in Sources */ = {isa = PBXBuildFile; fileRef = F92C53690ECCE3FD009BE4BA /* breakpad_nlist_64.cc */; };
+ 		8B3101C611F0CD9F00FCF3E4 /* AppKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0867D6A5FE840307C02AAC07 /* AppKit.framework */; };
+ 		8B3101C711F0CD9F00FCF3E4 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0867D69BFE84028FC02AAC07 /* Foundation.framework */; };
+ 		8B3101CA11F0CDB000FCF3E4 /* AppKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0867D6A5FE840307C02AAC07 /* AppKit.framework */; };
+@@ -170,11 +184,8 @@
+ 		F92C564A0ECD10CA009BE4BA /* string_conversion.cc in Sources */ = {isa = PBXBuildFile; fileRef = F92C53850ECCE6AD009BE4BA /* string_conversion.cc */; };
+ 		F92C564C0ECD10DD009BE4BA /* breakpadUtilities.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = F92C563C0ECD10B3009BE4BA /* breakpadUtilities.dylib */; };
+ 		F92C56570ECD113E009BE4BA /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F92C554A0ECCF530009BE4BA /* Carbon.framework */; };
+-		F92C565C0ECD1158009BE4BA /* breakpadUtilities.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = F92C563C0ECD10B3009BE4BA /* breakpadUtilities.dylib */; };
+ 		F92C565F0ECD116B009BE4BA /* protected_memory_allocator.cc in Sources */ = {isa = PBXBuildFile; fileRef = F92C53720ECCE3FD009BE4BA /* protected_memory_allocator.cc */; };
+ 		F92C56630ECD1179009BE4BA /* exception_handler.cc in Sources */ = {isa = PBXBuildFile; fileRef = F92C536D0ECCE3FD009BE4BA /* exception_handler.cc */; };
+-		F92C56650ECD1185009BE4BA /* breakpadUtilities.dylib in Resources */ = {isa = PBXBuildFile; fileRef = F92C563C0ECD10B3009BE4BA /* breakpadUtilities.dylib */; };
+-		F92C568A0ECD15F9009BE4BA /* Inspector in Resources */ = {isa = PBXBuildFile; fileRef = F92C53540ECCE349009BE4BA /* Inspector */; };
+ 		F92C56A90ECE04C5009BE4BA /* crash_report_sender.m in Sources */ = {isa = PBXBuildFile; fileRef = F92C56A80ECE04C5009BE4BA /* crash_report_sender.m */; };
+ 		F93803CD0F8083B7004D428B /* dynamic_images.cc in Sources */ = {isa = PBXBuildFile; fileRef = F92C536B0ECCE3FD009BE4BA /* dynamic_images.cc */; };
+ 		F93803CE0F8083B7004D428B /* exception_handler.cc in Sources */ = {isa = PBXBuildFile; fileRef = F92C536D0ECCE3FD009BE4BA /* exception_handler.cc */; };
+@@ -213,7 +224,6 @@
+ 		F9C44DBD0EF072A0003AEBAA /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = F9C44DBA0EF072A0003AEBAA /* MainMenu.xib */; };
+ 		F9C44E000EF077CD003AEBAA /* Breakpad.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8DC2EF5B0486A6940098B216 /* Breakpad.framework */; };
+ 		F9C44E3C0EF08B12003AEBAA /* Breakpad.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 8DC2EF5B0486A6940098B216 /* Breakpad.framework */; };
+-		F9C44E980EF09F56003AEBAA /* crash_report_sender.app in Resources */ = {isa = PBXBuildFile; fileRef = F92C56A00ECE04A7009BE4BA /* crash_report_sender.app */; };
+ 		F9C44EA20EF09F93003AEBAA /* HTTPMultipartUpload.m in Sources */ = {isa = PBXBuildFile; fileRef = F92C53770ECCE635009BE4BA /* HTTPMultipartUpload.m */; };
+ 		F9C44EE50EF0A006003AEBAA /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F9C44EE40EF0A006003AEBAA /* SystemConfiguration.framework */; };
+ 		F9C44EE90EF0A3C1003AEBAA /* GTMLogger.m in Sources */ = {isa = PBXBuildFile; fileRef = F9C44EE80EF0A3C1003AEBAA /* GTMLogger.m */; };
+@@ -410,20 +420,6 @@
+ 			remoteGlobalIDString = F92C563B0ECD10B3009BE4BA;
+ 			remoteInfo = breakpadUtilities;
+ 		};
+-		F92C56850ECD15EF009BE4BA /* PBXContainerItemProxy */ = {
+-			isa = PBXContainerItemProxy;
+-			containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
+-			proxyType = 1;
+-			remoteGlobalIDString = F92C563B0ECD10B3009BE4BA;
+-			remoteInfo = breakpadUtilities;
+-		};
+-		F92C56870ECD15F1009BE4BA /* PBXContainerItemProxy */ = {
+-			isa = PBXContainerItemProxy;
+-			containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
+-			proxyType = 1;
+-			remoteGlobalIDString = F92C53530ECCE349009BE4BA;
+-			remoteInfo = Inspector;
+-		};
+ 		F93DE2FB0F82C3C600608B94 /* PBXContainerItemProxy */ = {
+ 			isa = PBXContainerItemProxy;
+ 			containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
+@@ -536,13 +532,6 @@
+ 			remoteGlobalIDString = 8DC2EF4F0486A6940098B216;
+ 			remoteInfo = Breakpad;
+ 		};
+-		F9C44E960EF09F4B003AEBAA /* PBXContainerItemProxy */ = {
+-			isa = PBXContainerItemProxy;
+-			containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
+-			proxyType = 1;
+-			remoteGlobalIDString = F92C569F0ECE04A7009BE4BA;
+-			remoteInfo = crash_report_sender;
+-		};
+ /* End PBXContainerItemProxy section */
+ 
+ /* Begin PBXCopyFilesBuildPhase section */
+@@ -714,7 +703,6 @@
+ 			isa = PBXFrameworksBuildPhase;
+ 			buildActionMask = 2147483647;
+ 			files = (
+-				F92C565C0ECD1158009BE4BA /* breakpadUtilities.dylib in Frameworks */,
+ 				8DC2EF570486A6940098B216 /* Cocoa.framework in Frameworks */,
+ 			);
+ 			runOnlyForDeploymentPostprocessing = 0;
+@@ -1181,18 +1169,13 @@
+ 			isa = PBXNativeTarget;
+ 			buildConfigurationList = 1DEB91AD08733DA50010E9CD /* Build configuration list for PBXNativeTarget "Breakpad" */;
+ 			buildPhases = (
+-				F97A0E850ED4EC15008784D3 /* Change install name of breakpadUtilities */,
+ 				8DC2EF500486A6940098B216 /* Headers */,
+-				8DC2EF520486A6940098B216 /* Resources */,
+ 				8DC2EF540486A6940098B216 /* Sources */,
+ 				8DC2EF560486A6940098B216 /* Frameworks */,
+ 			);
+ 			buildRules = (
+ 			);
+ 			dependencies = (
+-				F92C56860ECD15EF009BE4BA /* PBXTargetDependency */,
+-				F92C56880ECD15F1009BE4BA /* PBXTargetDependency */,
+-				F9C44E970EF09F4B003AEBAA /* PBXTargetDependency */,
+ 			);
+ 			name = Breakpad;
+ 			productInstallPath = "$(HOME)/Library/Frameworks";
+@@ -1399,6 +1382,8 @@
+ /* Begin PBXProject section */
+ 		0867D690FE84028FC02AAC07 /* Project object */ = {
+ 			isa = PBXProject;
+			attributes = {
+			};
+ 			buildConfigurationList = 1DEB91B108733DA50010E9CD /* Build configuration list for PBXProject "Breakpad" */;
+ 			compatibilityVersion = "Xcode 3.1";
+ 			developmentRegion = English;
+@@ -1583,16 +1568,6 @@
+ /* End PBXReferenceProxy section */
+ 
+ /* Begin PBXResourcesBuildPhase section */
+-		8DC2EF520486A6940098B216 /* Resources */ = {
+-			isa = PBXResourcesBuildPhase;
+-			buildActionMask = 2147483647;
+-			files = (
+-				F9C44E980EF09F56003AEBAA /* crash_report_sender.app in Resources */,
+-				F92C568A0ECD15F9009BE4BA /* Inspector in Resources */,
+-				F92C56650ECD1185009BE4BA /* breakpadUtilities.dylib in Resources */,
+-			);
+-			runOnlyForDeploymentPostprocessing = 0;
+-		};
+ 		F92C569C0ECE04A7009BE4BA /* Resources */ = {
+ 			isa = PBXResourcesBuildPhase;
+ 			buildActionMask = 2147483647;
+@@ -1640,20 +1615,6 @@
+ 			shellPath = /bin/sh;
+ 			shellScript = "install_name_tool -id \"@executable_path/../Resources/breakpadUtilities.dylib\" \"${BUILT_PRODUCTS_DIR}/breakpadUtilities.dylib\"\n";
+ 		};
+-		F97A0E850ED4EC15008784D3 /* Change install name of breakpadUtilities */ = {
+-			isa = PBXShellScriptBuildPhase;
+-			buildActionMask = 2147483647;
+-			files = (
+-			);
+-			inputPaths = (
+-			);
+-			name = "Change install name of breakpadUtilities";
+-			outputPaths = (
+-			);
+-			runOnlyForDeploymentPostprocessing = 0;
+-			shellPath = /bin/sh;
+-			shellScript = "#!/bin/bash\ninstall_name_tool -id \"@executable_path/../Frameworks/Breakpad.framework/Resources/breakpadUtilities.dylib\" \"${BUILT_PRODUCTS_DIR}/breakpadUtilities.dylib\"\n";
+-		};
+ 		F9C77DD80F7DD5CF0045F7DB /* ShellScript */ = {
+ 			isa = PBXShellScriptBuildPhase;
+ 			buildActionMask = 2147483647;
+@@ -1674,6 +1635,20 @@
+ 			isa = PBXSourcesBuildPhase;
+ 			buildActionMask = 2147483647;
+ 			files = (
+				5A8B220921E0C5740045F83C /* breakpad_nlist_64.cc in Sources */,
+				0748C0501C63C52D004489BF /* bootstrap_compat.cc in Sources */,
+				0748C04F1C63C523004489BF /* macho_walker.cc in Sources */,
+				0748C04E1C63C51C004489BF /* md5.cc in Sources */,
+				0748C04D1C63C50F004489BF /* file_id.cc in Sources */,
+				0748C04C1C63C4EA004489BF /* macho_utilities.cc in Sources */,
+				0748C04B1C63C4DB004489BF /* convert_UTF.c in Sources */,
+				0748C04A1C63C4D4004489BF /* string_conversion.cc in Sources */,
+				0748C0491C63C4CF004489BF /* macho_id.cc in Sources */,
+				0748C0471C63C4A1004489BF /* dynamic_images.cc in Sources */,
+				0748C0461C63C484004489BF /* minidump_file_writer.cc in Sources */,
+				0748C0451C63C46C004489BF /* string_utilities.cc in Sources */,
+				0748C0441C63C43C004489BF /* minidump_generator.cc in Sources */,
+				0748C0431C63C409004489BF /* MachIPC.mm in Sources */,
+ 				F92C565F0ECD116B009BE4BA /* protected_memory_allocator.cc in Sources */,
+ 				F92C56630ECD1179009BE4BA /* exception_handler.cc in Sources */,
+ 				F92C55D10ECD0064009BE4BA /* Breakpad.mm in Sources */,
+@@ -1955,16 +1930,6 @@
+ 			target = F92C563B0ECD10B3009BE4BA /* breakpadUtilities */;
+ 			targetProxy = F92C564D0ECD10E5009BE4BA /* PBXContainerItemProxy */;
+ 		};
+-		F92C56860ECD15EF009BE4BA /* PBXTargetDependency */ = {
+-			isa = PBXTargetDependency;
+-			target = F92C563B0ECD10B3009BE4BA /* breakpadUtilities */;
+-			targetProxy = F92C56850ECD15EF009BE4BA /* PBXContainerItemProxy */;
+-		};
+-		F92C56880ECD15F1009BE4BA /* PBXTargetDependency */ = {
+-			isa = PBXTargetDependency;
+-			target = F92C53530ECCE349009BE4BA /* Inspector */;
+-			targetProxy = F92C56870ECD15F1009BE4BA /* PBXContainerItemProxy */;
+-		};
+ 		F93DE2FC0F82C3C600608B94 /* PBXTargetDependency */ = {
+ 			isa = PBXTargetDependency;
+ 			target = F93803BD0F80820F004D428B /* generator_test */;
+@@ -2025,11 +1990,6 @@
+ 			target = 8DC2EF4F0486A6940098B216 /* Breakpad */;
+ 			targetProxy = F9C44E190EF0790F003AEBAA /* PBXContainerItemProxy */;
+ 		};
+-		F9C44E970EF09F4B003AEBAA /* PBXTargetDependency */ = {
+-			isa = PBXTargetDependency;
+-			target = F92C569F0ECE04A7009BE4BA /* crash_report_sender */;
+-			targetProxy = F9C44E960EF09F4B003AEBAA /* PBXContainerItemProxy */;
+-		};
+ /* End PBXTargetDependency section */
+ 
+ /* Begin PBXVariantGroup section */
+@@ -2126,8 +2086,12 @@
+ 			isa = XCBuildConfiguration;
+ 			baseConfigurationReference = 8B31027711F0D3AF00FCF3E4 /* BreakpadDebug.xcconfig */;
+ 			buildSettings = {
+				CLANG_CXX_LANGUAGE_STANDARD = "c++0x";
+				CLANG_CXX_LIBRARY = "libc++";
+ 				GCC_TREAT_WARNINGS_AS_ERRORS = NO;
+-				SDKROOT = macosx10.5;
+				GCC_VERSION = "";
+				MACOSX_DEPLOYMENT_TARGET = 10.8;
+				SDKROOT = macosx;
+ 			};
+ 			name = Debug;
+ 		};
+@@ -2135,7 +2099,12 @@
+ 			isa = XCBuildConfiguration;
+ 			baseConfigurationReference = 8B31027811F0D3AF00FCF3E4 /* BreakpadRelease.xcconfig */;
+ 			buildSettings = {
+				CLANG_CXX_LANGUAGE_STANDARD = "c++0x";
+				CLANG_CXX_LIBRARY = "libc++";
+ 				GCC_TREAT_WARNINGS_AS_ERRORS = NO;
+				GCC_VERSION = "";
+				MACOSX_DEPLOYMENT_TARGET = 10.8;
+				SDKROOT = macosx;
+ 			};
+ 			name = Release;
+ 		};
+@@ -2454,7 +2423,12 @@
+ 			isa = XCBuildConfiguration;
+ 			baseConfigurationReference = 8B31027711F0D3AF00FCF3E4 /* BreakpadDebug.xcconfig */;
+ 			buildSettings = {
+				CLANG_CXX_LANGUAGE_STANDARD = "c++0x";
+				CLANG_CXX_LIBRARY = "libc++";
+ 				GCC_TREAT_WARNINGS_AS_ERRORS = NO;
+				GCC_VERSION = "";
+				MACOSX_DEPLOYMENT_TARGET = 10.8;
+				SDKROOT = macosx;
+ 			};
+ 			name = "Debug With Code Coverage";
+ 		};
+diff --git a/src/client/mac/Framework/Breakpad.mm b/src/client/mac/Framework/Breakpad.mm
+index 1d2e519b..943310fa 100644
+--- a/src/client/mac/Framework/Breakpad.mm
+++ b/src/client/mac/Framework/Breakpad.mm
+@@ -355,10 +355,10 @@ bool Breakpad::Initialize(NSDictionary *parameters) {
+     return false;
+   }
+ 
+-  if ([[parameters objectForKey:@BREAKPAD_IN_PROCESS] boolValue])
+//  if ([[parameters objectForKey:@BREAKPAD_IN_PROCESS] boolValue])
+     return InitializeInProcess(parameters);
+-  else
+-    return InitializeOutOfProcess(parameters);
+//  else
+//    return InitializeOutOfProcess(parameters);
+ }
+ 
+ //=============================================================================
+@@ -373,52 +373,52 @@ bool Breakpad::InitializeInProcess(NSDictionary* parameters) {
+ }
+ 
+ //=============================================================================
+-bool Breakpad::InitializeOutOfProcess(NSDictionary* parameters) {
+-  // Get path to Inspector executable.
+-  NSString *inspectorPathString = KeyValue(@BREAKPAD_INSPECTOR_LOCATION);
+-
+-  // Standardize path (resolve symlinkes, etc.)  and escape spaces
+-  inspectorPathString = [inspectorPathString stringByStandardizingPath];
+-  inspectorPathString = [[inspectorPathString componentsSeparatedByString:@" "]
+-                                              componentsJoinedByString:@"\\ "];
+-
+-  // Create an on-demand server object representing the Inspector.
+-  // In case of a crash, we simply need to call the LaunchOnDemand()
+-  // method on it, then send a mach message to its service port.
+-  // It will then launch and perform a process inspection of our crashed state.
+-  // See the HandleException() method for the details.
+-#define RECEIVE_PORT_NAME "com.Breakpad.Inspector"
+-
+-  name_t portName;
+-  snprintf(portName, sizeof(name_t),  "%s%d", RECEIVE_PORT_NAME, getpid());
+-
+-  // Save the location of the Inspector
+-  strlcpy(inspector_path_, [inspectorPathString fileSystemRepresentation],
+-          sizeof(inspector_path_));
+-
+-  // Append a single command-line argument to the Inspector path
+-  // representing the bootstrap name of the launch-on-demand receive port.
+-  // When the Inspector is launched, it can use this to lookup the port
+-  // by calling bootstrap_check_in().
+-  strlcat(inspector_path_, " ", sizeof(inspector_path_));
+-  strlcat(inspector_path_, portName, sizeof(inspector_path_));
+-
+-  kern_return_t kr = inspector_.Initialize(inspector_path_,
+-                                           portName,
+-                                           true);        // shutdown on exit
+-
+-  if (kr != KERN_SUCCESS) {
+-    return false;
+-  }
+-
+-  // Create the handler (allocating it in our special protected pool)
+-  handler_ =
+-      new (gBreakpadAllocator->Allocate(
+-          sizeof(google_breakpad::ExceptionHandler)))
+-          google_breakpad::ExceptionHandler(
+-              Breakpad::ExceptionHandlerDirectCallback, this, true);
+-  return true;
+-}
+//bool Breakpad::InitializeOutOfProcess(NSDictionary* parameters) {
+//  // Get path to Inspector executable.
+//  NSString *inspectorPathString = KeyValue(@BREAKPAD_INSPECTOR_LOCATION);
+//
+//  // Standardize path (resolve symlinkes, etc.)  and escape spaces
+//  inspectorPathString = [inspectorPathString stringByStandardizingPath];
+//  inspectorPathString = [[inspectorPathString componentsSeparatedByString:@" "]
+//                                              componentsJoinedByString:@"\\ "];
+//
+//  // Create an on-demand server object representing the Inspector.
+//  // In case of a crash, we simply need to call the LaunchOnDemand()
+//  // method on it, then send a mach message to its service port.
+//  // It will then launch and perform a process inspection of our crashed state.
+//  // See the HandleException() method for the details.
+//#define RECEIVE_PORT_NAME "com.Breakpad.Inspector"
+//
+//  name_t portName;
+//  snprintf(portName, sizeof(name_t),  "%s%d", RECEIVE_PORT_NAME, getpid());
+//
+//  // Save the location of the Inspector
+//  strlcpy(inspector_path_, [inspectorPathString fileSystemRepresentation],
+//          sizeof(inspector_path_));
+//
+//  // Append a single command-line argument to the Inspector path
+//  // representing the bootstrap name of the launch-on-demand receive port.
+//  // When the Inspector is launched, it can use this to lookup the port
+//  // by calling bootstrap_check_in().
+//  strlcat(inspector_path_, " ", sizeof(inspector_path_));
+//  strlcat(inspector_path_, portName, sizeof(inspector_path_));
+//
+//  kern_return_t kr = inspector_.Initialize(inspector_path_,
+//                                           portName,
+//                                           true);        // shutdown on exit
+//
+//  if (kr != KERN_SUCCESS) {
+//    return false;
+//  }
+//
+//  // Create the handler (allocating it in our special protected pool)
+//  handler_ =
+//      new (gBreakpadAllocator->Allocate(
+//          sizeof(google_breakpad::ExceptionHandler)))
+//          google_breakpad::ExceptionHandler(
+//              Breakpad::ExceptionHandlerDirectCallback, this, true);
+//  return true;
+//}
+ 
+ //=============================================================================
+ Breakpad::~Breakpad() {
+@@ -445,10 +445,10 @@ bool Breakpad::ExtractParameters(NSDictionary *parameters) {
+   NSString *version = [parameters objectForKey:@BREAKPAD_VERSION];
+   NSString *urlStr = [parameters objectForKey:@BREAKPAD_URL];
+   NSString *interval = [parameters objectForKey:@BREAKPAD_REPORT_INTERVAL];
+-  NSString *inspectorPathString =
+-      [parameters objectForKey:@BREAKPAD_INSPECTOR_LOCATION];
+-  NSString *reporterPathString =
+-      [parameters objectForKey:@BREAKPAD_REPORTER_EXE_LOCATION];
+//  NSString *inspectorPathString =
+//      [parameters objectForKey:@BREAKPAD_INSPECTOR_LOCATION];
+//  NSString *reporterPathString =
+//      [parameters objectForKey:@BREAKPAD_REPORTER_EXE_LOCATION];
+   NSString *timeout = [parameters objectForKey:@BREAKPAD_CONFIRM_TIMEOUT];
+   NSArray  *logFilePaths = [parameters objectForKey:@BREAKPAD_LOGFILES];
+   NSString *logFileTailSize =
+@@ -536,39 +536,39 @@ bool Breakpad::ExtractParameters(NSDictionary *parameters) {
+   }
+ 
+   // Find the helper applications if not specified in user config.
+-  NSString *resourcePath = nil;
+-  if (!inspectorPathString || !reporterPathString) {
+-    resourcePath = GetResourcePath();
+-    if (!resourcePath) {
+-      return false;
+-    }
+-  }
+//  NSString *resourcePath = nil;
+//  if (!inspectorPathString || !reporterPathString) {
+//    resourcePath = GetResourcePath();
+//    if (!resourcePath) {
+//      return false;
+//    }
+//  }
+ 
+   // Find Inspector.
+-  if (!inspectorPathString) {
+-    inspectorPathString =
+-        [resourcePath stringByAppendingPathComponent:@"Inspector"];
+-  }
+-
+-  // Verify that there is an Inspector tool.
+-  if (![[NSFileManager defaultManager] fileExistsAtPath:inspectorPathString]) {
+-    return false;
+-  }
+//  if (!inspectorPathString) {
+//    inspectorPathString =
+//        [resourcePath stringByAppendingPathComponent:@"Inspector"];
+//  }
+//
+//  // Verify that there is an Inspector tool.
+//  if (![[NSFileManager defaultManager] fileExistsAtPath:inspectorPathString]) {
+//    return false;
+//  }
+ 
+   // Find Reporter.
+-  if (!reporterPathString) {
+-    reporterPathString =
+-        [resourcePath
+-         stringByAppendingPathComponent:@"crash_report_sender.app"];
+-    reporterPathString =
+-        [[NSBundle bundleWithPath:reporterPathString] executablePath];
+-  }
+//  if (!reporterPathString) {
+//    reporterPathString =
+//        [resourcePath
+//         stringByAppendingPathComponent:@"crash_report_sender.app"];
+//    reporterPathString =
+//        [[NSBundle bundleWithPath:reporterPathString] executablePath];
+//  }
+ 
+   // Verify that there is a Reporter application.
+-  if (![[NSFileManager defaultManager]
+-             fileExistsAtPath:reporterPathString]) {
+-    return false;
+-  }
+//  if (![[NSFileManager defaultManager]
+//             fileExistsAtPath:reporterPathString]) {
+//    return false;
+//  }
+ 
+   if (!dumpSubdirectory) {
+     dumpSubdirectory = @"";
+@@ -601,10 +601,10 @@ bool Breakpad::ExtractParameters(NSDictionary *parameters) {
+   dictionary.SetKeyValue(BREAKPAD_REPORT_INTERVAL, [interval UTF8String]);
+   dictionary.SetKeyValue(BREAKPAD_SKIP_CONFIRM,    [skipConfirm UTF8String]);
+   dictionary.SetKeyValue(BREAKPAD_CONFIRM_TIMEOUT, [timeout UTF8String]);
+-  dictionary.SetKeyValue(BREAKPAD_INSPECTOR_LOCATION,
+-                         [inspectorPathString fileSystemRepresentation]);
+-  dictionary.SetKeyValue(BREAKPAD_REPORTER_EXE_LOCATION,
+-                         [reporterPathString fileSystemRepresentation]);
+//  dictionary.SetKeyValue(BREAKPAD_INSPECTOR_LOCATION,
+//                         [inspectorPathString fileSystemRepresentation]);
+//  dictionary.SetKeyValue(BREAKPAD_REPORTER_EXE_LOCATION,
+//                         [reporterPathString fileSystemRepresentation]);
+   dictionary.SetKeyValue(BREAKPAD_LOGFILE_UPLOAD_SIZE,
+                          [logFileTailSize UTF8String]);
+   dictionary.SetKeyValue(BREAKPAD_REQUEST_COMMENTS,
+@@ -762,9 +762,9 @@ bool Breakpad::HandleException(int exception_type,
+ bool Breakpad::HandleMinidump(const char *dump_dir, const char *minidump_id) {
+   google_breakpad::ConfigFile config_file;
+   config_file.WriteFile(dump_dir, config_params_, dump_dir, minidump_id);
+-  google_breakpad::LaunchReporter(
+-      config_params_->GetValueForKey(BREAKPAD_REPORTER_EXE_LOCATION),
+-      config_file.GetFilePath());
+//  google_breakpad::LaunchReporter(
+//      config_params_->GetValueForKey(BREAKPAD_REPORTER_EXE_LOCATION),
+//      config_file.GetFilePath());
+   return true;
+ }
+ 
+diff --git a/src/common/language.cc b/src/common/language.cc
+index 978fb855..a95ae5f7 100644
+--- a/src/common/language.cc
+++ b/src/common/language.cc
+@@ -46,8 +46,27 @@
+ 
+ #include <limits>
+ 
+#include <cstdio>
+#include <iostream>
+#include <memory>
+#include <stdexcept>
+#include <string>
+#include <array>
+
+ namespace {
+ 
+std::string exec(std::string cmd) {
+    std::array<char, 128> buffer;
+    std::string result;
+    std::shared_ptr<FILE> pipe(popen(cmd.c_str(), "r"), pclose);
+    if (!pipe) throw std::runtime_error("popen() failed!");
+    while (!feof(pipe.get())) {
+        if (fgets(buffer.data(), 128, pipe.get()) != nullptr)
+            result += buffer.data();
+    }
+    return result;
+}
+
+ string MakeQualifiedNameWithSeparator(const string& parent_name,
+                                       const char* separator,
+                                       const string& name) {
+@@ -79,11 +98,29 @@ class CPPLanguage: public Language {
+     demangled->clear();
+     return kDontDemangle;
+ #else
+    DemangleResult result;
+    if (mangled.find("type_erased_handlers") != std::string::npos
+            && mangled.find("vtable_once_impl") != std::string::npos) {
+
+        auto demangled_str = exec("c++filt " + mangled);
+        if (!demangled_str.empty() && demangled_str.back() == '\n') {
+            demangled_str.pop_back();
+        }
+        if (demangled_str != mangled) {
+            result = kDemangleSuccess;
+            demangled->assign(demangled_str.c_str());
+        } else {
+            result = kDemangleFailure;
+            demangled->clear();
+        }
+
+    } else {
+
+     int status;
+     char* demangled_c =
+         abi::__cxa_demangle(mangled.c_str(), NULL, NULL, &status);
+ 
+-    DemangleResult result;
+//    DemangleResult result;
+     if (status == 0) {
+       result = kDemangleSuccess;
+       demangled->assign(demangled_c);
+@@ -96,6 +133,8 @@ class CPPLanguage: public Language {
+       free(reinterpret_cast<void*>(demangled_c));
+     }
+ 
+    }
+
+     return result;
+ #endif
+   }
+diff --git a/src/common/linux/elf_symbols_to_module.cc b/src/common/linux/elf_symbols_to_module.cc
+index 562875e1..43678510 100644
+--- a/src/common/linux/elf_symbols_to_module.cc
+++ b/src/common/linux/elf_symbols_to_module.cc
+@@ -39,6 +39,29 @@
+ #include "common/byte_cursor.h"
+ #include "common/module.h"
+ 
+#include <cstdio>
+#include <iostream>
+#include <memory>
+#include <stdexcept>
+#include <string>
+#include <array>
+
+namespace {
+
+std::string exec(std::string cmd) {
+    std::array<char, 128> buffer;
+    std::string result;
+    std::shared_ptr<FILE> pipe(popen(cmd.c_str(), "r"), pclose);
+    if (!pipe) throw std::runtime_error("popen() failed!");
+    while (!feof(pipe.get())) {
+        if (fgets(buffer.data(), 128, pipe.get()) != nullptr)
+            result += buffer.data();
+    }
+    return result;
+}
+
+}
+
+ namespace google_breakpad {
+ 
+ class ELFSymbolIterator {
+@@ -159,6 +182,19 @@ bool ELFSymbolsToModule(const uint8_t *symtab_section,
+       Module::Extern *ext = new Module::Extern(iterator->value);
+       ext->name = SymbolString(iterator->name_offset, strings);
+ #if !defined(__ANDROID__)  // Android NDK doesn't provide abi::__cxa_demangle.
+      if (ext->name.find("type_erased_handlers") != std::string::npos
+              && ext->name.find("vtable_once_impl") != std::string::npos) {
+
+          auto demangled_str = exec("c++filt " + ext->name);
+          if (!demangled_str.empty() && demangled_str.back() == '\n') {
+              demangled_str.pop_back();
+          }
+          if (demangled_str != ext->name) {
+              ext->name = demangled_str;
+          }
+
+      } else {
+
+       int status = 0;
+       char* demangled =
+           abi::__cxa_demangle(ext->name.c_str(), NULL, NULL, &status);
+@@ -167,6 +203,8 @@ bool ELFSymbolsToModule(const uint8_t *symtab_section,
+           ext->name = demangled;
+         free(demangled);
+       }
+
+      }
+ #endif
+       module->AddExtern(ext);
+     }
+diff --git a/src/tools/linux/tools_linux.gypi b/src/tools/linux/tools_linux.gypi
+index 1c15992e..020e4c1c 100644
+--- a/src/tools/linux/tools_linux.gypi
+++ b/src/tools/linux/tools_linux.gypi
+@@ -58,7 +58,7 @@
+       'target_name': 'minidump_upload',
+       'type': 'executable',
+       'sources': [
+-        'symupload/minidump_upload.m',
+        'symupload/minidump_upload.cc',
+       ],
+       'dependencies': [
+         '../common/common.gyp:common',
+diff --git a/src/tools/mac/dump_syms/macho_dump.cc b/src/tools/mac/dump_syms/macho_dump.cc
+index d882bbe8..3432bb45 100644
+--- a/src/tools/mac/dump_syms/macho_dump.cc
+++ b/src/tools/mac/dump_syms/macho_dump.cc
+@@ -140,7 +140,7 @@ void DumpFile(const char *filename) {
+   size_t object_files_size;
+   const SuperFatArch* super_fat_object_files =
+       fat_reader.object_files(&object_files_size);
+-  struct fat_arch *object_files;
+  struct fat_arch *object_files = 0;
+   if (!super_fat_object_files->ConvertToFatArch(object_files)) {
+     exit(1);
+   }
--- a/Telegram/Patches/build_ffmpeg_win.sh
+++ b/Telegram/Patches/build_ffmpeg_win.sh
@@ -0,0 +1,121 @@
+set -e
+FullExecPath=$PWD
+pushd `dirname $0` > /dev/null
+FullScriptPath=`pwd`
+popd > /dev/null
+
+pacman --noconfirm -Sy
+pacman --noconfirm -S msys/make
+pacman --noconfirm -S mingw64/mingw-w64-x86_64-opus
+pacman --noconfirm -S diffutils
+pacman --noconfirm -S pkg-config
+
+PKG_CONFIG_PATH="/mingw64/lib/pkgconfig:$PKG_CONFIG_PATH"
+
+./configure --toolchain=msvc \
+--extra-cflags="-DCONFIG_SAFE_BITSTREAM_READER=1" \
+--extra-cxxflags="-DCONFIG_SAFE_BITSTREAM_READER=1" \
+--extra-ldflags="-libpath:$FullExecPath/../opus/win32/VS2015/Win32/Release" \
+--disable-programs \
+--disable-doc \
+--disable-network \
+--disable-everything \
+--enable-hwaccel=h264_d3d11va \
+--enable-hwaccel=h264_d3d11va2 \
+--enable-hwaccel=h264_dxva2 \
+--enable-hwaccel=hevc_d3d11va \
+--enable-hwaccel=hevc_d3d11va2 \
+--enable-hwaccel=hevc_dxva2 \
+--enable-hwaccel=mpeg2_d3d11va \
+--enable-hwaccel=mpeg2_d3d11va2 \
+--enable-hwaccel=mpeg2_dxva2 \
+--enable-protocol=file --enable-libopus \
+--enable-decoder=aac \
+--enable-decoder=aac_at \
+--enable-decoder=aac_fixed \
+--enable-decoder=aac_latm \
+--enable-decoder=aasc \
+--enable-decoder=alac \
+--enable-decoder=alac_at \
+--enable-decoder=flac \
+--enable-decoder=gif \
+--enable-decoder=h264 \
+--enable-decoder=hevc \
+--enable-decoder=mp1 \
+--enable-decoder=mp1float \
+--enable-decoder=mp2 \
+--enable-decoder=mp2float \
+--enable-decoder=mp3 \
+--enable-decoder=mp3adu \
+--enable-decoder=mp3adufloat \
+--enable-decoder=mp3float \
+--enable-decoder=mp3on4 \
+--enable-decoder=mp3on4float \
+--enable-decoder=mpeg4 \
+--enable-decoder=msmpeg4v2 \
+--enable-decoder=msmpeg4v3 \
+--enable-decoder=opus \
+--enable-decoder=pcm_alaw \
+--enable-decoder=pcm_alaw_at \
+--enable-decoder=pcm_f32be \
+--enable-decoder=pcm_f32le \
+--enable-decoder=pcm_f64be \
+--enable-decoder=pcm_f64le \
+--enable-decoder=pcm_lxf \
+--enable-decoder=pcm_mulaw \
+--enable-decoder=pcm_mulaw_at \
+--enable-decoder=pcm_s16be \
+--enable-decoder=pcm_s16be_planar \
+--enable-decoder=pcm_s16le \
+--enable-decoder=pcm_s16le_planar \
+--enable-decoder=pcm_s24be \
+--enable-decoder=pcm_s24daud \
+--enable-decoder=pcm_s24le \
+--enable-decoder=pcm_s24le_planar \
+--enable-decoder=pcm_s32be \
+--enable-decoder=pcm_s32le \
+--enable-decoder=pcm_s32le_planar \
+--enable-decoder=pcm_s64be \
+--enable-decoder=pcm_s64le \
+--enable-decoder=pcm_s8 \
+--enable-decoder=pcm_s8_planar \
+--enable-decoder=pcm_u16be \
+--enable-decoder=pcm_u16le \
+--enable-decoder=pcm_u24be \
+--enable-decoder=pcm_u24le \
+--enable-decoder=pcm_u32be \
+--enable-decoder=pcm_u32le \
+--enable-decoder=pcm_u8 \
+--enable-decoder=pcm_zork \
+--enable-decoder=vorbis \
+--enable-decoder=wavpack \
+--enable-decoder=wmalossless \
+--enable-decoder=wmapro \
+--enable-decoder=wmav1 \
+--enable-decoder=wmav2 \
+--enable-decoder=wmavoice \
+--enable-encoder=libopus \
+--enable-parser=aac \
+--enable-parser=aac_latm \
+--enable-parser=flac \
+--enable-parser=h264 \
+--enable-parser=hevc \
+--enable-parser=mpeg4video \
+--enable-parser=mpegaudio \
+--enable-parser=opus \
+--enable-parser=vorbis \
+--enable-demuxer=aac \
+--enable-demuxer=flac \
+--enable-demuxer=gif \
+--enable-demuxer=h264 \
+--enable-demuxer=hevc \
+--enable-demuxer=m4v \
+--enable-demuxer=mov \
+--enable-demuxer=mp3 \
+--enable-demuxer=ogg \
+--enable-demuxer=wav \
+--enable-muxer=ogg \
+--enable-muxer=opus
+
+make -j4
+make -j4 install
--- a/Telegram/Patches/crashpad.diff
+++ b/Telegram/Patches/crashpad.diff
@@ -0,0 +1,107 @@
+diff --git a/client/capture_context_mac_test.cc b/client/capture_context_mac_test.cc
+index 436ac5ad..8e14fb9c 100644
+--- a/client/capture_context_mac_test.cc
+++ b/client/capture_context_mac_test.cc
+@@ -34,11 +34,11 @@ namespace {
+ // gtest assertions.
+ void SanityCheckContext(const NativeCPUContext& context) {
+ #if defined(ARCH_CPU_X86)
+-  ASSERT_EQ(x86_THREAD_STATE32, context.tsh.flavor);
+-  ASSERT_EQ(implicit_cast<int>(x86_THREAD_STATE32_COUNT), context.tsh.count);
+  ASSERT_EQ(implicit_cast<thread_state_flavor_t>(x86_THREAD_STATE32), implicit_cast<thread_state_flavor_t>(context.tsh.flavor));
+  ASSERT_EQ(implicit_cast<uint32_t>(x86_THREAD_STATE32_COUNT), implicit_cast<uint32_t>(context.tsh.count));
+ #elif defined(ARCH_CPU_X86_64)
+-  ASSERT_EQ(x86_THREAD_STATE64, context.tsh.flavor);
+-  ASSERT_EQ(implicit_cast<int>(x86_THREAD_STATE64_COUNT), context.tsh.count);
+  ASSERT_EQ(implicit_cast<thread_state_flavor_t>(x86_THREAD_STATE64), implicit_cast<thread_state_flavor_t>(context.tsh.flavor));
+  ASSERT_EQ(implicit_cast<uint32_t>(x86_THREAD_STATE64_COUNT), implicit_cast<uint32_t>(context.tsh.count));
+ #endif
+ 
+ #if defined(ARCH_CPU_X86_FAMILY)
+diff --git a/client/simulate_crash_mac.cc b/client/simulate_crash_mac.cc
+index 7e279015..27864388 100644
+--- a/client/simulate_crash_mac.cc
+++ b/client/simulate_crash_mac.cc
+@@ -177,12 +177,12 @@ bool DeliverException(thread_t thread,
+ 
+ void SimulateCrash(const NativeCPUContext& cpu_context) {
+ #if defined(ARCH_CPU_X86)
+-  DCHECK_EQ(cpu_context.tsh.flavor,
+  DCHECK_EQ(implicit_cast<thread_state_flavor_t>(cpu_context.tsh.flavor),
+             implicit_cast<thread_state_flavor_t>(x86_THREAD_STATE32));
+   DCHECK_EQ(implicit_cast<mach_msg_type_number_t>(cpu_context.tsh.count),
+             x86_THREAD_STATE32_COUNT);
+ #elif defined(ARCH_CPU_X86_64)
+-  DCHECK_EQ(cpu_context.tsh.flavor,
+  DCHECK_EQ(implicit_cast<thread_state_flavor_t>(cpu_context.tsh.flavor),
+             implicit_cast<thread_state_flavor_t>(x86_THREAD_STATE64));
+   DCHECK_EQ(implicit_cast<mach_msg_type_number_t>(cpu_context.tsh.count),
+             x86_THREAD_STATE64_COUNT);
+diff --git a/client/simulate_crash_mac_test.cc b/client/simulate_crash_mac_test.cc
+index 87c5f845..ca813e4c 100644
+--- a/client/simulate_crash_mac_test.cc
+++ b/client/simulate_crash_mac_test.cc
+@@ -130,12 +130,12 @@ class TestSimulateCrashMac final : public MachMultiprocess,
+               reinterpret_cast<const x86_thread_state*>(old_state);
+           switch (state->tsh.flavor) {
+             case x86_THREAD_STATE32:
+-              EXPECT_EQ(implicit_cast<int>(x86_THREAD_STATE32_COUNT),
+-                        state->tsh.count);
+              EXPECT_EQ(implicit_cast<uint32_t>(x86_THREAD_STATE32_COUNT),
+                        implicit_cast<uint32_t>(state->tsh.count));
+               break;
+             case x86_THREAD_STATE64:
+-              EXPECT_EQ(implicit_cast<int>(x86_THREAD_STATE64_COUNT),
+-                        state->tsh.count);
+              EXPECT_EQ(implicit_cast<uint32_t>(x86_THREAD_STATE64_COUNT),
+                        implicit_cast<uint32_t>(state->tsh.count));
+               break;
+             default:
+               ADD_FAILURE() << "unexpected tsh.flavor " << state->tsh.flavor;
+@@ -149,12 +149,12 @@ class TestSimulateCrashMac final : public MachMultiprocess,
+               reinterpret_cast<const x86_float_state*>(old_state);
+           switch (state->fsh.flavor) {
+             case x86_FLOAT_STATE32:
+-              EXPECT_EQ(implicit_cast<int>(x86_FLOAT_STATE32_COUNT),
+-                        state->fsh.count);
+              EXPECT_EQ(implicit_cast<uint32_t>(x86_FLOAT_STATE32_COUNT),
+                        implicit_cast<uint32_t>(state->fsh.count));
+               break;
+             case x86_FLOAT_STATE64:
+-              EXPECT_EQ(implicit_cast<int>(x86_FLOAT_STATE64_COUNT),
+-                        state->fsh.count);
+              EXPECT_EQ(implicit_cast<uint32_t>(x86_FLOAT_STATE64_COUNT),
+                        implicit_cast<uint32_t>(state->fsh.count));
+               break;
+             default:
+               ADD_FAILURE() << "unexpected fsh.flavor " << state->fsh.flavor;
+@@ -168,12 +168,12 @@ class TestSimulateCrashMac final : public MachMultiprocess,
+               reinterpret_cast<const x86_debug_state*>(old_state);
+           switch (state->dsh.flavor) {
+             case x86_DEBUG_STATE32:
+-              EXPECT_EQ(implicit_cast<int>(x86_DEBUG_STATE32_COUNT),
+-                        state->dsh.count);
+              EXPECT_EQ(implicit_cast<uint32_t>(x86_DEBUG_STATE32_COUNT),
+                        implicit_cast<uint32_t>(state->dsh.count));
+               break;
+             case x86_DEBUG_STATE64:
+-              EXPECT_EQ(implicit_cast<int>(x86_DEBUG_STATE64_COUNT),
+-                        state->dsh.count);
+              EXPECT_EQ(implicit_cast<uint32_t>(x86_DEBUG_STATE64_COUNT),
+                        implicit_cast<uint32_t>(state->dsh.count));
+               break;
+             default:
+               ADD_FAILURE() << "unexpected dsh.flavor " << state->dsh.flavor;
+diff --git a/crashpad.gyp b/crashpad.gyp
+index 42fe0a26..d8af1bf1 100644
+--- a/crashpad.gyp
+++ b/crashpad.gyp
+@@ -25,7 +25,7 @@
+         'minidump/minidump.gyp:*',
+         'minidump/minidump_test.gyp:*',
+         'snapshot/snapshot.gyp:*',
+-        'snapshot/snapshot_test.gyp:*',
+#        'snapshot/snapshot_test.gyp:*',
+         'test/test.gyp:*',
+         'test/test_test.gyp:*',
+         'tools/tools.gyp:*',
--- a/Telegram/Patches/gyp.diff
+++ b/Telegram/Patches/gyp.diff
@@ -0,0 +1,132 @@
+diff --git a/pylib/gyp/generator/cmake.py b/pylib/gyp/generator/cmake.py
+index 4a2041cf..e5333926 100644
+--- a/pylib/gyp/generator/cmake.py
+++ b/pylib/gyp/generator/cmake.py
+@@ -1078,6 +1078,23 @@ def WriteTarget(namer, qualified_target, target_dicts, build_dir, config_to_use,
+ 
+       output.write(')\n')
+ 
+  # Precompile header
+  precompiled_header = config.get('cmake_precompiled_header', '')
+  if precompiled_header:
+    precompiled_header_script = config.get('cmake_precompiled_header_script', '')
+    if not precompiled_header_script:
+      print ('ERROR: cmake_precompiled_header requires cmake_precompiled_header_script')
+    cmake_precompiled_header = NormjoinPath(path_from_cmakelists_to_gyp, precompiled_header)
+    cmake_precompiled_header_script = NormjoinPathForceCMakeSource(path_from_cmakelists_to_gyp, precompiled_header_script)
+    output.write('include(')
+    output.write(cmake_precompiled_header_script)
+    output.write(')\n')
+    output.write('add_precompiled_header(')
+    output.write(cmake_target_name)
+    output.write(' ')
+    output.write(cmake_precompiled_header)
+    output.write(')\n')
+
+   UnsetVariable(output, 'TOOLSET')
+   UnsetVariable(output, 'TARGET')
+ 
+@@ -1120,6 +1137,8 @@ def GenerateOutputForConfig(target_list, target_dicts, data,
+   SetVariable(output, 'configuration', config_to_use)
+ 
+   ar = None
+  ranlib = None
+  nm = None
+   cc = None
+   cxx = None
+ 
+@@ -1129,17 +1148,27 @@ def GenerateOutputForConfig(target_list, target_dicts, data,
+   for key, value in make_global_settings:
+     if key == 'AR':
+       ar = os.path.join(build_to_top, value)
+    if key == 'RANLIB':
+      ranlib = os.path.join(build_to_top, value)
+    if key == 'NM':
+      nm = os.path.join(build_to_top, value)
+     if key == 'CC':
+       cc = os.path.join(build_to_top, value)
+     if key == 'CXX':
+       cxx = os.path.join(build_to_top, value)
+ 
+   ar = gyp.common.GetEnvironFallback(['AR_target', 'AR'], ar)
+  ranlib = gyp.common.GetEnvironFallback(['RANLIB_target', 'RANLIB'], ranlib)
+  nm = gyp.common.GetEnvironFallback(['NM_target', 'NM'], nm)
+   cc = gyp.common.GetEnvironFallback(['CC_target', 'CC'], cc)
+   cxx = gyp.common.GetEnvironFallback(['CXX_target', 'CXX'], cxx)
+ 
+   if ar:
+     SetVariable(output, 'CMAKE_AR', ar)
+  if ranlib:
+    SetVariable(output, 'CMAKE_RANLIB', ranlib)
+  if nm:
+    SetVariable(output, 'CMAKE_NM', nm)
+   if cc:
+     SetVariable(output, 'CMAKE_C_COMPILER', cc)
+   if cxx:
+diff --git a/pylib/gyp/generator/xcode.py b/pylib/gyp/generator/xcode.py
+index 8bc22bed..24bee427 100644
+--- a/pylib/gyp/generator/xcode.py
+++ b/pylib/gyp/generator/xcode.py
+@@ -74,6 +74,12 @@ generator_additional_non_configuration_keys = [
+   'ios_app_extension',
+   'ios_watch_app',
+   'ios_watchkit_extension',
+
+  'mac_sandbox', # sandbox support
+  'mac_sandbox_development_team',
+
+  'mac_hardened_runtime', # hardened runtime support
+
+   'mac_bundle',
+   'mac_bundle_resources',
+   'mac_framework_headers',
+@@ -774,6 +780,39 @@ def GenerateOutput(target_list, target_dicts, data, params):
+     xcode_targets[qualified_target] = xct
+     xcode_target_to_target_dict[xct] = spec
+ 
+    # sandbox and hardened runtime support
+    is_sandbox = int(spec.get('mac_sandbox', 0))
+    is_hardened_runtime = int(spec.get('mac_hardened_runtime', 0))
+    if is_sandbox or is_hardened_runtime:
+      try:
+        tmp = pbxp._properties['attributes']['TargetAttributes']
+      except KeyError:
+        pbxp._properties['attributes']['TargetAttributes'] = {}
+      try:
+        tmp = pbxp._properties['attributes']['TargetAttributes'][xct]
+      except KeyError:
+        pbxp._properties['attributes']['TargetAttributes'][xct] = {}
+      try:
+        tmp = pbxp._properties['attributes']['TargetAttributes'][xct]['SystemCapabilities']
+      except KeyError:
+        pbxp._properties['attributes']['TargetAttributes'][xct]['SystemCapabilities'] = {}
+
+    if is_sandbox:
+      dev_team = spec.get('mac_sandbox_development_team', '%%ERROR%%')
+      assert dev_team != '%%ERROR%%', (
+          'mac_sandbox must be accompanied by mac_sandbox_development_team (target "%s")' %
+          target_name)
+      pbxp._properties['attributes']['TargetAttributes'][xct]['DevelopmentTeam'] = dev_team
+      pbxp._properties['attributes']['TargetAttributes'][xct]['SystemCapabilities']['com.apple.Sandbox'] = {
+        'enabled': 1,
+      }
+
+    # hardened runtime support
+    if is_hardened_runtime:
+      pbxp._properties['attributes']['TargetAttributes'][xct]['SystemCapabilities']['com.apple.HardenedRuntime'] = {
+        'enabled': 1,
+      }
+
+     spec_actions = spec.get('actions', [])
+     spec_rules = spec.get('rules', [])
+ 
+@@ -1132,7 +1171,8 @@ exit 1
+         groups = [x for x in groups if not x.endswith('_excluded')]
+       for group in groups:
+         for item in rule.get(group, []):
+-          pbxp.AddOrGetFileInRootGroup(item)
+          concrete_item = ExpandXcodeVariables(item, rule_input_dict)
+          pbxp.AddOrGetFileInRootGroup(concrete_item)
+ 
+     # Add "sources".
+     for source in spec.get('sources', []):
--- a/Telegram/Patches/macold/crashpad.diff
+++ b/Telegram/Patches/macold/crashpad.diff
@@ -0,0 +1,127 @@
+diff --git a/build/crashpad.gypi b/build/crashpad.gypi
+index 027c7b68..4bfdfb5a 100644
+--- a/build/crashpad.gypi
+++ b/build/crashpad.gypi
+@@ -25,5 +25,15 @@
+       4201,  # nonstandard extension used : nameless struct/union.
+       4324,  # structure was padded due to __declspec(align()).
+     ],
+    'xcode_settings': {
+      'OTHER_CPLUSPLUSFLAGS': [ '-nostdinc++' ],
+      'OTHER_LDFLAGS': [
+        '/usr/local/macold/lib/libc++.a',
+        '/usr/local/macold/lib/libc++abi.a',
+      ],
+    },
+    'include_dirs': [
+      '/usr/local/macold/include/c++/v1',
+    ],
+   },
+ }
+diff --git a/client/capture_context_mac_test.cc b/client/capture_context_mac_test.cc
+index 436ac5ad..8e14fb9c 100644
+--- a/client/capture_context_mac_test.cc
+++ b/client/capture_context_mac_test.cc
+@@ -34,11 +34,11 @@ namespace {
+ // gtest assertions.
+ void SanityCheckContext(const NativeCPUContext& context) {
+ #if defined(ARCH_CPU_X86)
+-  ASSERT_EQ(x86_THREAD_STATE32, context.tsh.flavor);
+-  ASSERT_EQ(implicit_cast<int>(x86_THREAD_STATE32_COUNT), context.tsh.count);
+  ASSERT_EQ(implicit_cast<thread_state_flavor_t>(x86_THREAD_STATE32), implicit_cast<thread_state_flavor_t>(context.tsh.flavor));
+  ASSERT_EQ(implicit_cast<uint32_t>(x86_THREAD_STATE32_COUNT), implicit_cast<uint32_t>(context.tsh.count));
+ #elif defined(ARCH_CPU_X86_64)
+-  ASSERT_EQ(x86_THREAD_STATE64, context.tsh.flavor);
+-  ASSERT_EQ(implicit_cast<int>(x86_THREAD_STATE64_COUNT), context.tsh.count);
+  ASSERT_EQ(implicit_cast<thread_state_flavor_t>(x86_THREAD_STATE64), implicit_cast<thread_state_flavor_t>(context.tsh.flavor));
+  ASSERT_EQ(implicit_cast<uint32_t>(x86_THREAD_STATE64_COUNT), implicit_cast<uint32_t>(context.tsh.count));
+ #endif
+ 
+ #if defined(ARCH_CPU_X86_FAMILY)
+diff --git a/client/simulate_crash_mac.cc b/client/simulate_crash_mac.cc
+index 7e279015..27864388 100644
+--- a/client/simulate_crash_mac.cc
+++ b/client/simulate_crash_mac.cc
+@@ -177,12 +177,12 @@ bool DeliverException(thread_t thread,
+ 
+ void SimulateCrash(const NativeCPUContext& cpu_context) {
+ #if defined(ARCH_CPU_X86)
+-  DCHECK_EQ(cpu_context.tsh.flavor,
+  DCHECK_EQ(implicit_cast<thread_state_flavor_t>(cpu_context.tsh.flavor),
+             implicit_cast<thread_state_flavor_t>(x86_THREAD_STATE32));
+   DCHECK_EQ(implicit_cast<mach_msg_type_number_t>(cpu_context.tsh.count),
+             x86_THREAD_STATE32_COUNT);
+ #elif defined(ARCH_CPU_X86_64)
+-  DCHECK_EQ(cpu_context.tsh.flavor,
+  DCHECK_EQ(implicit_cast<thread_state_flavor_t>(cpu_context.tsh.flavor),
+             implicit_cast<thread_state_flavor_t>(x86_THREAD_STATE64));
+   DCHECK_EQ(implicit_cast<mach_msg_type_number_t>(cpu_context.tsh.count),
+             x86_THREAD_STATE64_COUNT);
+diff --git a/client/simulate_crash_mac_test.cc b/client/simulate_crash_mac_test.cc
+index 87c5f845..ca813e4c 100644
+--- a/client/simulate_crash_mac_test.cc
+++ b/client/simulate_crash_mac_test.cc
+@@ -130,12 +130,12 @@ class TestSimulateCrashMac final : public MachMultiprocess,
+               reinterpret_cast<const x86_thread_state*>(old_state);
+           switch (state->tsh.flavor) {
+             case x86_THREAD_STATE32:
+-              EXPECT_EQ(implicit_cast<int>(x86_THREAD_STATE32_COUNT),
+-                        state->tsh.count);
+              EXPECT_EQ(implicit_cast<uint32_t>(x86_THREAD_STATE32_COUNT),
+                        implicit_cast<uint32_t>(state->tsh.count));
+               break;
+             case x86_THREAD_STATE64:
+-              EXPECT_EQ(implicit_cast<int>(x86_THREAD_STATE64_COUNT),
+-                        state->tsh.count);
+              EXPECT_EQ(implicit_cast<uint32_t>(x86_THREAD_STATE64_COUNT),
+                        implicit_cast<uint32_t>(state->tsh.count));
+               break;
+             default:
+               ADD_FAILURE() << "unexpected tsh.flavor " << state->tsh.flavor;
+@@ -149,12 +149,12 @@ class TestSimulateCrashMac final : public MachMultiprocess,
+               reinterpret_cast<const x86_float_state*>(old_state);
+           switch (state->fsh.flavor) {
+             case x86_FLOAT_STATE32:
+-              EXPECT_EQ(implicit_cast<int>(x86_FLOAT_STATE32_COUNT),
+-                        state->fsh.count);
+              EXPECT_EQ(implicit_cast<uint32_t>(x86_FLOAT_STATE32_COUNT),
+                        implicit_cast<uint32_t>(state->fsh.count));
+               break;
+             case x86_FLOAT_STATE64:
+-              EXPECT_EQ(implicit_cast<int>(x86_FLOAT_STATE64_COUNT),
+-                        state->fsh.count);
+              EXPECT_EQ(implicit_cast<uint32_t>(x86_FLOAT_STATE64_COUNT),
+                        implicit_cast<uint32_t>(state->fsh.count));
+               break;
+             default:
+               ADD_FAILURE() << "unexpected fsh.flavor " << state->fsh.flavor;
+@@ -168,12 +168,12 @@ class TestSimulateCrashMac final : public MachMultiprocess,
+               reinterpret_cast<const x86_debug_state*>(old_state);
+           switch (state->dsh.flavor) {
+             case x86_DEBUG_STATE32:
+-              EXPECT_EQ(implicit_cast<int>(x86_DEBUG_STATE32_COUNT),
+-                        state->dsh.count);
+              EXPECT_EQ(implicit_cast<uint32_t>(x86_DEBUG_STATE32_COUNT),
+                        implicit_cast<uint32_t>(state->dsh.count));
+               break;
+             case x86_DEBUG_STATE64:
+-              EXPECT_EQ(implicit_cast<int>(x86_DEBUG_STATE64_COUNT),
+-                        state->dsh.count);
+              EXPECT_EQ(implicit_cast<uint32_t>(x86_DEBUG_STATE64_COUNT),
+                        implicit_cast<uint32_t>(state->dsh.count));
+               break;
+             default:
+               ADD_FAILURE() << "unexpected dsh.flavor " << state->dsh.flavor;
+diff --git a/crashpad.gyp b/crashpad.gyp
+index 42fe0a26..d8af1bf1 100644
+--- a/crashpad.gyp
+++ b/crashpad.gyp
+@@ -25,7 +25,7 @@
+         'minidump/minidump.gyp:*',
+         'minidump/minidump_test.gyp:*',
+         'snapshot/snapshot.gyp:*',
+-        'snapshot/snapshot_test.gyp:*',
+#        'snapshot/snapshot_test.gyp:*',
+         'test/test.gyp:*',
+         'test/test_test.gyp:*',
+         'tools/tools.gyp:*',
--- a/Telegram/Patches/macold/mini_chromium.diff
+++ b/Telegram/Patches/macold/mini_chromium.diff
@@ -0,0 +1,28 @@
+diff --git a/build/common.gypi b/build/common.gypi
+index 1affc70..0677e4b 100644
+--- a/build/common.gypi
+++ b/build/common.gypi
+@@ -66,6 +66,13 @@
+           'conditions': [
+             ['clang!=0', {
+               'CLANG_CXX_LANGUAGE_STANDARD': 'c++11',  # -std=c++11
+              'OTHER_CPLUSPLUSFLAGS': [ '-nostdinc++' ],
+              'OTHER_LDFLAGS': [
+                '/usr/local/macold/lib/libc++.a',
+                '/usr/local/macold/lib/libc++abi.a',
+                '-isysroot/',
+                '-L/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/lib/',
+              ],
+ 
+               # Don't link in libarclite_macosx.a, see http://crbug.com/156530.
+               'CLANG_LINK_OBJC_RUNTIME': 'NO',      # -fno-objc-link-runtime
+@@ -116,6 +123,9 @@
+           ],
+ 
+         },
+        'include_dirs': [
+          '/usr/local/macold/include/c++/v1',
+        ],
+       }],
+ 
+       ['OS=="linux"', {
--- a/Telegram/Patches/macold/qtbase_5_3_2.diff
+++ b/Telegram/Patches/macold/qtbase_5_3_2.diff
@@ -0,0 +1,844 @@
+diff --git a/configure b/configure
+index cb8d78fd3c..cadb3f0a88 100755
+--- a/configure
+++ b/configure
+@@ -511,7 +511,8 @@ if [ "$BUILD_ON_MAC" = "yes" ]; then
+         exit 2
+     fi
+ 
+-    if ! /usr/bin/xcrun -find xcrun >/dev/null 2>&1; then
+    # Patch: Fix Qt for working with Xcode 8.
+    if ! /usr/bin/xcrun -find xcodebuild >/dev/null 2>&1; then
+         echo >&2
+         echo "   Xcode not set up properly. You may need to confirm the license" >&2
+         echo "   agreement by running /usr/bin/xcodebuild without arguments." >&2
+diff --git a/mkspecs/common/g++-macx.conf b/mkspecs/common/g++-macx.conf
+index 086510dd96..078a5ed1dd 100644
+--- a/mkspecs/common/g++-macx.conf
+++ b/mkspecs/common/g++-macx.conf
+@@ -14,7 +14,13 @@ QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += -gdwarf-2
+ QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += -gdwarf-2
+ QMAKE_LFLAGS_RELEASE_WITH_DEBUGINFO += -g -gdwarf-2
+ 
+-QMAKE_LFLAGS_STATIC_LIB += -all_load
+# Patch: Don't remember :(
+#QMAKE_LFLAGS_STATIC_LIB += -all_load
+
+# Patch: Use C++14 with custom libc++ build.
+QMAKE_CXXFLAGS_CXX11 = -std=c++1y
+QMAKE_CXXFLAGS += -nostdinc++ -I/usr/local/macold/include/c++/v1
+QMAKE_LFLAGS += /usr/local/macold/lib/libc++.a /usr/local/macold/lib/libc++abi.a -isysroot /
+ 
+ QMAKE_XCODE_GCC_VERSION = com.apple.compilers.llvmgcc42
+ 
+diff --git a/mkspecs/features/mac/default_pre.prf b/mkspecs/features/mac/default_pre.prf
+index 0cc8cd6dfd..ca9725b779 100644
+--- a/mkspecs/features/mac/default_pre.prf
+++ b/mkspecs/features/mac/default_pre.prf
+@@ -12,7 +12,9 @@ isEmpty(QMAKE_XCODE_DEVELOPER_PATH) {
+         error("Xcode is not installed in $${QMAKE_XCODE_DEVELOPER_PATH}. Please use xcode-select to choose Xcode installation path.")
+ 
+     # Make sure Xcode is set up properly
+-    isEmpty($$list($$system("/usr/bin/xcrun -find xcrun 2>/dev/null"))): \
+
+    # Patch: Fix Qt for working with Xcode 8.
+    isEmpty($$list($$system("/usr/bin/xcrun -find xcodebuild 2>/dev/null"))): \
+         error("Xcode not set up properly. You may need to confirm the license agreement by running /usr/bin/xcodebuild.")
+ }
+ 
+diff --git a/src/gui/image/qbmphandler.cpp b/src/gui/image/qbmphandler.cpp
+index bb79a139b3..5d595bc3b3 100644
+--- a/src/gui/image/qbmphandler.cpp
+++ b/src/gui/image/qbmphandler.cpp
+@@ -220,6 +220,10 @@ static bool read_dib_body(QDataStream &s, const BMP_INFOHDR &bi, int offset, int
+     int blue_scale = 0;
+     int alpha_scale = 0;
+ 
+    // Patch: Backport a fix for bmp reader.
+    if (!d->isSequential())
+        d->seek(startpos + BMP_FILEHDR_SIZE + (bi.biSize >= BMP_WIN4? BMP_WIN : bi.biSize)); // goto start of colormap
+
+     if (bi.biSize >= BMP_WIN4 || (comp == BMP_BITFIELDS && (nbits == 16 || nbits == 32))) {
+         if (d->read((char *)&red_mask, sizeof(red_mask)) != sizeof(red_mask))
+             return false;
+@@ -307,8 +311,9 @@ static bool read_dib_body(QDataStream &s, const BMP_INFOHDR &bi, int offset, int
+     image.setDotsPerMeterX(bi.biXPelsPerMeter);
+     image.setDotsPerMeterY(bi.biYPelsPerMeter);
+ 
+-    if (!d->isSequential())
+-        d->seek(startpos + BMP_FILEHDR_SIZE + (bi.biSize >= BMP_WIN4? BMP_WIN : bi.biSize)); // goto start of colormap
+    // Patch: Backport a fix for bmp reader.
+    //if (!d->isSequential())
+    //    d->seek(startpos + BMP_FILEHDR_SIZE + (bi.biSize >= BMP_WIN4? BMP_WIN : bi.biSize)); // goto start of colormap
+ 
+     if (ncols > 0) {                                // read color table
+         uchar rgb[4];
+diff --git a/src/gui/painting/qpaintengine_p.h b/src/gui/painting/qpaintengine_p.h
+index ebff9509ab..4300ca4c0f 100644
+--- a/src/gui/painting/qpaintengine_p.h
+++ b/src/gui/painting/qpaintengine_p.h
+@@ -87,8 +87,18 @@ public:
+         if (hasSystemTransform) {
+             if (systemTransform.type() <= QTransform::TxTranslate)
+                 systemClip.translate(qRound(systemTransform.dx()), qRound(systemTransform.dy()));
+-            else
+            // Patch: Transform the system clip region back from device pixels to device-independent pixels before
+            // applying systemTransform, which already has transform from device-independent pixels to device pixels.
+            else {
+#ifdef Q_OS_MAC
+                QTransform scaleTransform;
+                const qreal invDevicePixelRatio = 1. / pdev->devicePixelRatio();
+                scaleTransform.scale(invDevicePixelRatio, invDevicePixelRatio);
+                systemClip = systemTransform.map(scaleTransform.map(systemClip));
+#else
+                 systemClip = systemTransform.map(systemClip);
+#endif
+            }
+         }
+ 
+         // Make sure we're inside the viewport.
+diff --git a/src/gui/text/qtextlayout.cpp b/src/gui/text/qtextlayout.cpp
+index 4879ae51d7..56cdcbaf01 100644
+--- a/src/gui/text/qtextlayout.cpp
+++ b/src/gui/text/qtextlayout.cpp
+@@ -654,6 +654,9 @@ int QTextLayout::nextCursorPosition(int oldPos, CursorMode mode) const
+         while (oldPos < len && !attributes[oldPos].graphemeBoundary)
+             oldPos++;
+     } else {
+        // Patch: Skip to the end of the current word, not to the start of the next one.
+        while (oldPos < len && attributes[oldPos].whiteSpace)
+            oldPos++;
+         if (oldPos < len && d->atWordSeparator(oldPos)) {
+             oldPos++;
+             while (oldPos < len && d->atWordSeparator(oldPos))
+@@ -662,8 +665,9 @@ int QTextLayout::nextCursorPosition(int oldPos, CursorMode mode) const
+             while (oldPos < len && !d->atSpace(oldPos) && !d->atWordSeparator(oldPos))
+                 oldPos++;
+         }
+-        while (oldPos < len && d->atSpace(oldPos))
+-            oldPos++;
+        // Patch: Skip to the end of the current word, not to the start of the next one.
+        //while (oldPos < len && d->atSpace(oldPos))
+        //    oldPos++;
+     }
+ 
+     return oldPos;
+@@ -1602,6 +1606,9 @@ namespace {
+         int currentPosition;
+         glyph_t previousGlyph;
+ 
+        // Patch: Backport a crash fix.
+        QFontEngine *previousGlyphFontEngine;
+
+         QFixed minw;
+         QFixed softHyphenWidth;
+         QFixed rightBearing;
+@@ -1634,13 +1641,19 @@ namespace {
+             if (currentPosition > 0 &&
+                 logClusters[currentPosition - 1] < glyphs.numGlyphs) {
+                 previousGlyph = currentGlyph(); // needed to calculate right bearing later
+
+                // Patch: Backport a crash fix.
+                previousGlyphFontEngine = fontEngine;
+             }
+         }
+ 
+-        inline void adjustRightBearing(glyph_t glyph)
+        // Patch: Backport a crash fix.
+        inline void adjustRightBearing(QFontEngine *engine, glyph_t glyph)
+         {
+             qreal rb;
+-            fontEngine->getGlyphBearings(glyph, 0, &rb);
+
+            // Patch: Backport a crash fix.
+            engine->getGlyphBearings(glyph, 0, &rb);
+             rightBearing = qMin(QFixed(), QFixed::fromReal(rb));
+         }
+ 
+@@ -1648,13 +1661,16 @@ namespace {
+         {
+             if (currentPosition <= 0)
+                 return;
+-            adjustRightBearing(currentGlyph());
+
+            // Patch: Backport a crash fix.
+            adjustRightBearing(fontEngine, currentGlyph());
+         }
+ 
+         inline void adjustPreviousRightBearing()
+         {
+             if (previousGlyph > 0)
+-                adjustRightBearing(previousGlyph);
+                // Patch: Backport a crash fix.
+                adjustRightBearing(previousGlyphFontEngine, previousGlyph);
+         }
+ 
+         inline void resetRightBearing()
+diff --git a/src/gui/text/qtextlayout.h b/src/gui/text/qtextlayout.h
+index cbe42c3844..b273db7e78 100644
+--- a/src/gui/text/qtextlayout.h
+++ b/src/gui/text/qtextlayout.h
+@@ -194,6 +194,9 @@ private:
+                                QRectF *brect, int tabstops, int* tabarray, int tabarraylen,
+                                QPainter *painter);
+     QTextEngine *d;
+
+    // Patch: Give access to the internal api.
+    friend class TextBlock;
+ };
+ 
+ 
+diff --git a/src/network/access/qhttpnetworkconnection.cpp b/src/network/access/qhttpnetworkconnection.cpp
+index 360f9722c7..f28f289ef6 100644
+--- a/src/network/access/qhttpnetworkconnection.cpp
+++ b/src/network/access/qhttpnetworkconnection.cpp
+@@ -118,6 +118,8 @@ QHttpNetworkConnectionPrivate::~QHttpNetworkConnectionPrivate()
+ {
+     for (int i = 0; i < channelCount; ++i) {
+         if (channels[i].socket) {
+            // Patch: backport critical bugfix from '4f959b6b30' commit.
+            QObject::disconnect(channels[i].socket, Q_NULLPTR, &channels[i], Q_NULLPTR);
+             channels[i].socket->close();
+             delete channels[i].socket;
+         }
+diff --git a/src/platformsupport/fontdatabases/mac/qcoretextfontdatabase.mm b/src/platformsupport/fontdatabases/mac/qcoretextfontdatabase.mm
+index ca7afb7d1b..25ae50008d 100644
+--- a/src/platformsupport/fontdatabases/mac/qcoretextfontdatabase.mm
+++ b/src/platformsupport/fontdatabases/mac/qcoretextfontdatabase.mm
+@@ -256,6 +256,13 @@ static void getFontDescription(CTFontDescriptorRef font, FontDescription *fd)
+ 
+     fd->foundryName = QStringLiteral("CoreText");
+     fd->familyName = (CFStringRef) CTFontDescriptorCopyAttribute(font, kCTFontFamilyNameAttribute);
+
+    // Patch: Fix open sans semibold loading.
+    QCFString _displayName = (CFStringRef) CTFontDescriptorCopyAttribute(font, kCTFontDisplayNameAttribute);
+    if (_displayName == QStringLiteral("Open Sans Semibold")) {
+        fd->familyName = _displayName;
+    }
+
+     fd->styleName = (CFStringRef)CTFontDescriptorCopyAttribute(font, kCTFontStyleNameAttribute);
+     fd->weight = QFont::Normal;
+     fd->style = QFont::StyleNormal;
+diff --git a/src/platformsupport/fontdatabases/mac/qfontengine_coretext.mm b/src/platformsupport/fontdatabases/mac/qfontengine_coretext.mm
+index 6e2c8a2a9a..3cace8abcb 100644
+--- a/src/platformsupport/fontdatabases/mac/qfontengine_coretext.mm
+++ b/src/platformsupport/fontdatabases/mac/qfontengine_coretext.mm
+@@ -717,7 +717,8 @@ void QCoreTextFontEngine::getUnscaledGlyph(glyph_t, QPainterPath *, glyph_metric
+ 
+ QFixed QCoreTextFontEngine::emSquareSize() const
+ {
+-    return QFixed::QFixed(int(CTFontGetUnitsPerEm(ctfont)));
+    // Patch: Fix build for Xcode 9.3.1.
+    return QFixed(int(CTFontGetUnitsPerEm(ctfont)));
+ }
+ 
+ QFontEngine *QCoreTextFontEngine::cloneWithSize(qreal pixelSize) const
+diff --git a/src/plugins/platforms/cocoa/qcocoaapplicationdelegate.mm b/src/plugins/platforms/cocoa/qcocoaapplicationdelegate.mm
+index 92358ecc74..694fee7350 100644
+--- a/src/plugins/platforms/cocoa/qcocoaapplicationdelegate.mm
+++ b/src/plugins/platforms/cocoa/qcocoaapplicationdelegate.mm
+@@ -213,7 +213,8 @@ static void cleanupCocoaApplicationDelegate()
+     if (reflectionDelegate) {
+         if ([reflectionDelegate respondsToSelector:@selector(applicationShouldTerminate:)])
+             return [reflectionDelegate applicationShouldTerminate:sender];
+-        return NSTerminateNow;
+        // Patch: Don't terminate if reflectionDelegate does not respond to that selector, just use the default.
+        //return NSTerminateNow;
+     }
+ 
+     if ([self canQuit]) {
+@@ -289,6 +290,11 @@ static void cleanupCocoaApplicationDelegate()
+ 
+ - (void)applicationDidFinishLaunching:(NSNotification *)aNotification
+ {
+    // Patch: We need to receive this notification in the delegate as well.
+    if (reflectionDelegate
+        && [reflectionDelegate respondsToSelector:@selector(applicationDidFinishLaunching:)])
+        [reflectionDelegate applicationDidFinishLaunching:aNotification];
+
+     Q_UNUSED(aNotification);
+     inLaunch = false;
+     // qt_release_apple_event_handler();
+@@ -411,7 +417,9 @@ static void cleanupCocoaApplicationDelegate()
+ {
+     Q_UNUSED(replyEvent);
+     NSString *urlString = [[event paramDescriptorForKeyword:keyDirectObject] stringValue];
+-    QWindowSystemInterface::handleFileOpenEvent(QUrl(QCFString::toQString(urlString)));
+
+    // Patch: Fix opening of an external url by a protocol handler.
+    QWindowSystemInterface::handleFileOpenEvent(QUrl::fromNSURL([NSURL URLWithString:urlString]));
+ }
+ 
+ - (void)appleEventQuit:(NSAppleEventDescriptor *)event withReplyEvent:(NSAppleEventDescriptor *)replyEvent
+diff --git a/src/plugins/platforms/cocoa/qcocoacursor.mm b/src/plugins/platforms/cocoa/qcocoacursor.mm
+index b81b9a0b1c..4e59e833b1 100644
+--- a/src/plugins/platforms/cocoa/qcocoacursor.mm
+++ b/src/plugins/platforms/cocoa/qcocoacursor.mm
+@@ -81,7 +81,7 @@ void QCocoaCursor::setPos(const QPoint &position)
+     pos.x = position.x();
+     pos.y = position.y();
+ 
+-    CGEventRef e = CGEventCreateMouseEvent(0, kCGEventMouseMoved, pos, 0);
+    CGEventRef e = CGEventCreateMouseEvent(0, kCGEventMouseMoved, pos, kCGMouseButtonLeft);
+     CGEventPost(kCGHIDEventTap, e);
+     CFRelease(e);
+ }
+diff --git a/src/plugins/platforms/cocoa/qcocoahelpers.mm b/src/plugins/platforms/cocoa/qcocoahelpers.mm
+index 9850f83dea..b2e1d3dfda 100644
+--- a/src/plugins/platforms/cocoa/qcocoahelpers.mm
+++ b/src/plugins/platforms/cocoa/qcocoahelpers.mm
+@@ -649,9 +649,10 @@ OSStatus qt_mac_drawCGImage(CGContextRef inContext, const CGRect *inBounds, CGIm
+     // Verbatim copy if HIViewDrawCGImage (as shown on Carbon-Dev)
+     OSStatus err = noErr;
+ 
+-    require_action(inContext != NULL, InvalidContext, err = paramErr);
+-    require_action(inBounds != NULL, InvalidBounds, err = paramErr);
+-    require_action(inImage != NULL, InvalidImage, err = paramErr);
+    // Patch: Fix build on latest Xcode.
+    //require_action(inContext != NULL, InvalidContext, err = paramErr);
+    //require_action(inBounds != NULL, InvalidBounds, err = paramErr);
+    //require_action(inImage != NULL, InvalidImage, err = paramErr);
+ 
+     CGContextSaveGState( inContext );
+     CGContextTranslateCTM (inContext, 0, inBounds->origin.y + CGRectGetMaxY(*inBounds));
+@@ -660,9 +661,11 @@ OSStatus qt_mac_drawCGImage(CGContextRef inContext, const CGRect *inBounds, CGIm
+     CGContextDrawImage(inContext, *inBounds, inImage);
+ 
+     CGContextRestoreGState(inContext);
+-InvalidImage:
+-InvalidBounds:
+-InvalidContext:
+
+// Patch: Fix build on latest Xcode.
+//InvalidImage:
+//InvalidBounds:
+//InvalidContext:
+         return err;
+ }
+ 
+diff --git a/src/plugins/platforms/cocoa/qcocoaintegration.mm b/src/plugins/platforms/cocoa/qcocoaintegration.mm
+index 9fd05a65ee..dea60720e7 100644
+--- a/src/plugins/platforms/cocoa/qcocoaintegration.mm
+++ b/src/plugins/platforms/cocoa/qcocoaintegration.mm
+@@ -402,14 +402,24 @@ void QCocoaIntegration::updateScreens()
+         }
+         siblings << screen;
+     }
+
+    // Patch: Backport crash fix from Qt 5.6.1.
+    // Set virtual siblings list. All screens in mScreens are siblings, because we ignored the
+    // mirrors. Note that some of the screens we update the siblings list for here may be deleted
+    // below, but update anyway to keep the to-be-deleted screens out of the siblings list.
+    foreach (QCocoaScreen* screen, mScreens)
+        screen->setVirtualSiblings(siblings);
+
+     // Now the leftovers in remainingScreens are no longer current, so we can delete them.
+     foreach (QCocoaScreen* screen, remainingScreens) {
+         mScreens.removeOne(screen);
+         delete screen;
+     }
+
+    // Patch: Backport crash fix from Qt 5.6.1.
+     // All screens in mScreens are siblings, because we ignored the mirrors.
+-    foreach (QCocoaScreen* screen, mScreens)
+-        screen->setVirtualSiblings(siblings);
+    //foreach (QCocoaScreen* screen, mScreens)
+    //    screen->setVirtualSiblings(siblings);
+ }
+ 
+ QCocoaScreen *QCocoaIntegration::screenAtIndex(int index)
+diff --git a/src/plugins/platforms/cocoa/qcocoakeymapper.mm b/src/plugins/platforms/cocoa/qcocoakeymapper.mm
+index e46eaff6be..c62db534a2 100644
+--- a/src/plugins/platforms/cocoa/qcocoakeymapper.mm
+++ b/src/plugins/platforms/cocoa/qcocoakeymapper.mm
+@@ -382,6 +382,12 @@ bool QCocoaKeyMapper::updateKeyboard()
+         keyboardInputLocale = QLocale::c();
+         keyboardInputDirection = Qt::LeftToRight;
+     }
+
+    // Patch: Backport a fix for layout-independent keyboard shortcuts.
+    const auto newMode = keyboard_mode;
+    deleteLayouts();
+    keyboard_mode = newMode;
+
+     return true;
+ }
+ 
+@@ -464,7 +470,8 @@ QList<int> QCocoaKeyMapper::possibleKeys(const QKeyEvent *event) const
+         Qt::KeyboardModifiers neededMods = ModsTbl[i];
+         int key = kbItem->qtKey[i];
+         if (key && key != baseKey && ((keyMods & neededMods) == neededMods)) {
+-            ret << int(key + (keyMods & ~neededMods));
+            // Patch: Backport a fix for layout-independent keyboard shortcuts.
+            ret << int(key + neededMods);
+         }
+     }
+     return ret;
+diff --git a/src/plugins/platforms/cocoa/qcocoasystemtrayicon.mm b/src/plugins/platforms/cocoa/qcocoasystemtrayicon.mm
+index 83c960d931..03ae9696af 100755
+--- a/src/plugins/platforms/cocoa/qcocoasystemtrayicon.mm
+++ b/src/plugins/platforms/cocoa/qcocoasystemtrayicon.mm
+@@ -102,7 +102,10 @@ QT_USE_NAMESPACE
+     QCocoaSystemTrayIcon *systray;
+     NSStatusItem *item;
+     QCocoaMenu *menu;
+-    bool menuVisible;
+
+    // Patch: Nice macOS tray icon support.
+    bool menuVisible, iconSelected;
+
+     QIcon icon;
+     QT_MANGLE_NAMESPACE(QNSImageView) *imageCell;
+ }
+@@ -124,6 +127,10 @@ QT_USE_NAMESPACE
+     QT_MANGLE_NAMESPACE(QNSStatusItem) *parent;
+ }
+ -(id)initWithParent:(QT_MANGLE_NAMESPACE(QNSStatusItem)*)myParent;
+
+// Patch: Nice macOS tray icon support.
+-(void)updateIconSelection;
+
+ -(void)menuTrackingDone:(NSNotification*)notification;
+ -(void)mousePressed:(NSEvent *)mouseEvent button:(Qt::MouseButton)mouseButton;
+ @end
+@@ -187,6 +194,19 @@ void QCocoaSystemTrayIcon::cleanup()
+     m_sys = 0;
+ }
+ 
+// Patch: Nice macOS tray icon support.
+namespace {
+
+qreal getDevicePixelRatio() {
+    qreal result = 1.0;
+    foreach (QScreen *screen, QGuiApplication::screens()) {
+        result = qMax(result, screen->devicePixelRatio());
+    }
+    return result;
+}
+
+} // namespace
+
+ void QCocoaSystemTrayIcon::updateIcon(const QIcon &icon)
+ {
+     if (!m_sys)
+@@ -194,13 +214,18 @@ void QCocoaSystemTrayIcon::updateIcon(const QIcon &icon)
+ 
+     m_sys->item->icon = icon;
+ 
+-    const bool menuVisible = m_sys->item->menu && m_sys->item->menuVisible;
+    // Patch: Nice macOS tray icon support.
+    //const bool menuVisible = m_sys->item->menu && m_sys->item->menuVisible;
+ 
+-    CGFloat hgt = [[[NSApplication sharedApplication] mainMenu] menuBarHeight];
+-    const short scale = hgt - 4;
+    const int padding = 0;
+    const int menuHeight = [[NSStatusBar systemStatusBar] thickness];
+    const int maxImageHeight = menuHeight - padding;
+
+    const short scale = maxImageHeight * getDevicePixelRatio();
+ 
+     QPixmap pm = m_sys->item->icon.pixmap(QSize(scale, scale),
+-                                          menuVisible ? QIcon::Selected : QIcon::Normal);
+                                          // Patch: Nice macOS tray icon support.
+                                          m_sys->item->iconSelected ? QIcon::Selected : QIcon::Normal);
+     if (pm.isNull()) {
+         pm = QPixmap(scale, scale);
+         pm.fill(Qt::transparent);
+@@ -322,15 +347,16 @@ QT_END_NAMESPACE
+     return self;
+ }
+ 
+--(void)menuTrackingDone:(NSNotification*)notification
+// Patch: Nice macOS tray icon support.
+-(void)updateIconSelection
+ {
+-    Q_UNUSED(notification);
+-    down = NO;
+    const int padding = 0;
+    const int menuHeight = [[NSStatusBar systemStatusBar] thickness];
+    const int maxImageHeight = menuHeight - padding;
+ 
+-    CGFloat hgt = [[[NSApplication sharedApplication] mainMenu] menuBarHeight];
+-    const short scale = hgt - 4;
+-
+-    QPixmap pm = parent->icon.pixmap(QSize(scale, scale), QIcon::Normal);
+    const short scale = maxImageHeight * getDevicePixelRatio();
+    QPixmap pm = parent->icon.pixmap(QSize(scale, scale),
+    parent->iconSelected ? QIcon::Selected : QIcon::Normal);
+     if (pm.isNull()) {
+         pm = QPixmap(scale, scale);
+         pm.fill(Qt::transparent);
+@@ -338,9 +364,19 @@ QT_END_NAMESPACE
+     NSImage *nsaltimage = static_cast<NSImage *>(qt_mac_create_nsimage(pm));
+     [self setImage: nsaltimage];
+     [nsaltimage release];
+}
+
+-(void)menuTrackingDone:(NSNotification*)notification
+{
+    Q_UNUSED(notification);
+    down = NO;
+ 
+     parent->menuVisible = false;
+ 
+    // Patch: Nice macOS tray icon support.
+    parent->iconSelected = false;
+    [self updateIconSelection];
+
+     [self setNeedsDisplay:YES];
+ }
+ 
+@@ -350,18 +386,9 @@ QT_END_NAMESPACE
+     int clickCount = [mouseEvent clickCount];
+     [self setNeedsDisplay:YES];
+ 
+-    CGFloat hgt = [[[NSApplication sharedApplication] mainMenu] menuBarHeight];
+-    const short scale = hgt - 4;
+-
+-    QPixmap pm = parent->icon.pixmap(QSize(scale, scale),
+-                                     parent->menuVisible ? QIcon::Selected : QIcon::Normal);
+-    if (pm.isNull()) {
+-        pm = QPixmap(scale, scale);
+-        pm.fill(Qt::transparent);
+-    }
+-    NSImage *nsaltimage = static_cast<NSImage *>(qt_mac_create_nsimage(pm));
+-    [self setImage: nsaltimage];
+-    [nsaltimage release];
+    // Patch: Nice macOS tray icon support.
+    parent->iconSelected = (clickCount != 2) && parent->menu;
+    [self updateIconSelection];
+ 
+     if (clickCount == 2) {
+         [self menuTrackingDone:nil];
+@@ -380,6 +407,10 @@ QT_END_NAMESPACE
+ {
+     Q_UNUSED(mouseEvent);
+     [self menuTrackingDone:nil];
+
+    // Patch: Nice macOS tray icon support.
+    parent->iconSelected = false;
+    [self updateIconSelection];
+ }
+ 
+ - (void)rightMouseDown:(NSEvent *)mouseEvent
+@@ -391,6 +422,10 @@ QT_END_NAMESPACE
+ {
+     Q_UNUSED(mouseEvent);
+     [self menuTrackingDone:nil];
+
+    // Patch: Nice macOS tray icon support.
+    parent->iconSelected = false;
+    [self updateIconSelection];
+ }
+ 
+ - (void)otherMouseDown:(NSEvent *)mouseEvent
+@@ -405,7 +440,8 @@ QT_END_NAMESPACE
+ }
+ 
+ -(void)drawRect:(NSRect)rect {
+-    [[parent item] drawStatusBarBackgroundInRect:rect withHighlight:down];
+    // Patch: Nice macOS tray icon support.
+    [[parent item] drawStatusBarBackgroundInRect:rect withHighlight:parent->menu ? down : NO];
+     [super drawRect:rect];
+ }
+ @end
+diff --git a/src/plugins/platforms/cocoa/qcocoawindow.mm b/src/plugins/platforms/cocoa/qcocoawindow.mm
+index 4d0458a4aa..3357a5ef81 100644
+--- a/src/plugins/platforms/cocoa/qcocoawindow.mm
+++ b/src/plugins/platforms/cocoa/qcocoawindow.mm
+@@ -167,7 +167,8 @@ static bool isMouseEvent(NSEvent *ev)
+     if (!self.window.delegate)
+         return; // Already detached, pending NSAppKitDefined event
+ 
+-    if (pw && pw->frameStrutEventsEnabled() && isMouseEvent(theEvent)) {
+    // Patch: Fix events loss if the window was minimized or hidden.
+    if (pw && pw->frameStrutEventsEnabled() && pw->m_synchedWindowState != Qt::WindowMinimized && pw->m_isExposed && isMouseEvent(theEvent)) {
+         NSPoint loc = [theEvent locationInWindow];
+         NSRect windowFrame = [self.window legacyConvertRectFromScreen:[self.window frame]];
+         NSRect contentFrame = [[self.window contentView] frame];
+@@ -795,6 +796,16 @@ NSUInteger QCocoaWindow::windowStyleMask(Qt::WindowFlags flags)
+ {
+     Qt::WindowType type = static_cast<Qt::WindowType>(int(flags & Qt::WindowType_Mask));
+     NSInteger styleMask = NSBorderlessWindowMask;
+
+    // Patch: allow creating panels floating on all spaces in macOS.
+    // If you call "setCollectionBehavior:NSWindowCollectionBehaviorFullScreenAuxiliary" before
+    // setting the "NSNonactivatingPanelMask" bit in the style mask it won't work after that.
+    // So we need a way to set that bit before Qt sets collection behavior the way it does.
+    QVariant nonactivatingPanelMask = window()->property("_td_macNonactivatingPanelMask");
+    if (nonactivatingPanelMask.isValid() && nonactivatingPanelMask.toBool()) {
+        styleMask |= NSNonactivatingPanelMask;
+    }
+
+     if (flags & Qt::FramelessWindowHint)
+         return styleMask;
+     if ((type & Qt::Popup) == Qt::Popup) {
+@@ -914,6 +925,19 @@ void QCocoaWindow::setWindowFilePath(const QString &filePath)
+     [m_nsWindow setRepresentedFilename: fi.exists() ? QCFString::toNSString(filePath) : @""];
+ }
+ 
+// Patch: Nice macOS window icon.
+namespace {
+
+qreal getDevicePixelRatio() {
+	qreal result = 1.0;
+	foreach (QScreen *screen, QGuiApplication::screens()) {
+		result = qMax(result, screen->devicePixelRatio());
+	}
+	return result;
+}
+
+} // namespace
+
+ void QCocoaWindow::setWindowIcon(const QIcon &icon)
+ {
+     QCocoaAutoReleasePool pool;
+@@ -929,7 +953,10 @@ void QCocoaWindow::setWindowIcon(const QIcon &icon)
+     if (icon.isNull()) {
+         [iconButton setImage:nil];
+     } else {
+-        QPixmap pixmap = icon.pixmap(QSize(22, 22));
+        // Patch: Nice macOS window icon.
+        CGFloat hgt = 16. * getDevicePixelRatio();
+        QPixmap pixmap = icon.pixmap(QSize(hgt, hgt));
+
+         NSImage *image = static_cast<NSImage *>(qt_mac_create_nsimage(pixmap));
+         [iconButton setImage:image];
+         [image release];
+diff --git a/src/plugins/platforms/cocoa/qnsview.mm b/src/plugins/platforms/cocoa/qnsview.mm
+index a18ee7ff71..1f91feb0ae 100644
+--- a/src/plugins/platforms/cocoa/qnsview.mm
+++ b/src/plugins/platforms/cocoa/qnsview.mm
+@@ -393,7 +393,9 @@ static NSString *_q_NSWindowDidChangeOcclusionStateNotification = nil;
+         [self notifyWindowStateChanged:newState];
+         // NSWindowDidOrderOnScreenAndFinishAnimatingNotification is private API, and not
+         // emitted in 10.6, so we bring back the old behavior for that case alone.
+-        if (newState == Qt::WindowNoState && QSysInfo::QSysInfo::MacintoshVersion == QSysInfo::MV_10_6)
+
+        // Patch: Fix macOS window show after window was hidden.
+        if (newState == Qt::WindowNoState/* && QSysInfo::QSysInfo::MacintoshVersion == QSysInfo::MV_10_6*/)
+             m_platformWindow->exposeWindow();
+     } else if ([notificationName isEqualToString: @"NSWindowDidOrderOffScreenNotification"]) {
+         m_platformWindow->obscureWindow();
+@@ -1300,7 +1302,9 @@ static QTabletEvent::TabletDevice wacomTabletDevice(NSEvent *theEvent)
+ #if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_8
+         if (QSysInfo::QSysInfo::MacintoshVersion >= QSysInfo::MV_10_8) {
+             // On 10.8 and above, MayBegin is likely to happen.  We treat it the same as an actual begin.
+-            if (phase == NSEventPhaseMayBegin)
+
+            // Patch: Actual begin should be treated as begin as well.
+            if (phase == NSEventPhaseMayBegin || phase == NSEventPhaseBegan)
+                 ph = Qt::ScrollBegin;
+         } else
+ #endif
+@@ -1366,14 +1370,22 @@ static QTabletEvent::TabletDevice wacomTabletDevice(NSEvent *theEvent)
+     quint32 nativeVirtualKey = [nsevent keyCode];
+ 
+     QChar ch = QChar::ReplacementCharacter;
+-    int keyCode = Qt::Key_unknown;
+-    if ([characters length] != 0) {
+-        if (((modifiers & Qt::MetaModifier) || (modifiers & Qt::AltModifier)) && ([charactersIgnoringModifiers length] != 0))
+-            ch = QChar([charactersIgnoringModifiers characterAtIndex:0]);
+-        else
+-            ch = QChar([characters characterAtIndex:0]);
+-        keyCode = [self convertKeyCode:ch];
+-    }
+
+    // Patch: Backport a fix for layout-independent shortcuts.
+    if ([characters length] != 0) // https://bugreports.qt.io/browse/QTBUG-42584
+        ch = QChar([characters characterAtIndex:0]);
+    else if ([charactersIgnoringModifiers length] != 0 && ((modifiers & Qt::MetaModifier) || (modifiers & Qt::AltModifier)))
+        ch = QChar([charactersIgnoringModifiers characterAtIndex:0]);
+
+    int keyCode = [self convertKeyCode:ch];
+    //int keyCode = Qt::Key_unknown;
+    //if ([characters length] != 0) {
+    //    if (((modifiers & Qt::MetaModifier) || (modifiers & Qt::AltModifier)) && ([charactersIgnoringModifiers length] != 0))
+    //        ch = QChar([charactersIgnoringModifiers characterAtIndex:0]);
+    //    else
+    //        ch = QChar([characters characterAtIndex:0]);
+    //    keyCode = [self convertKeyCode:ch];
+    //}
+ 
+     // we will send a key event unless the input method sets m_sendKeyEvent to false
+     m_sendKeyEvent = true;
+@@ -1437,6 +1449,11 @@ static QTabletEvent::TabletDevice wacomTabletDevice(NSEvent *theEvent)
+                 && qtKey == Qt::Key_Period) {
+             [self handleKeyEvent:nsevent eventType:int(QEvent::KeyPress)];
+             return YES;
+
+        // Patch: Allow us to handle Ctrl+Tab and Ctrl+Backtab in the app.
+        } else if ([nsevent modifierFlags] & NSControlKeyMask && (qtKey == Qt::Key_Tab || qtKey == Qt::Key_Backtab)) {
+            [self handleKeyEvent:nsevent eventType:int(QEvent::KeyPress)];
+            return YES;
+         }
+     }
+     return [super performKeyEquivalent:nsevent];
+diff --git a/src/tools/qlalr/lalr.cpp b/src/tools/qlalr/lalr.cpp
+index c68076477f..e2a7aafa58 100644
+--- a/src/tools/qlalr/lalr.cpp
+++ b/src/tools/qlalr/lalr.cpp
+@@ -246,11 +246,13 @@ void Grammar::buildExtendedGrammar ()
+   non_terminals.insert (accept_symbol);
+ }
+ 
+-struct _Nullable: public std::unary_function<Name, bool>
+// Patch: Fix building with the new SDK.
+struct __Nullable: public std::unary_function<Name, bool>
+ {
+   Automaton *_M_automaton;
+ 
+-  _Nullable (Automaton *aut):
+  // Patch: Fix building with the new SDK.
+  __Nullable (Automaton *aut):
+     _M_automaton (aut) {}
+ 
+   bool operator () (Name name) const
+@@ -308,7 +310,8 @@ void Automaton::buildNullables ()
+ 
+       for (RulePointer rule = _M_grammar->rules.begin (); rule != _M_grammar->rules.end (); ++rule)
+         {
+-          NameList::iterator nn = std::find_if (rule->rhs.begin (), rule->rhs.end (), std::not1 (_Nullable (this)));
+          // Patch: Fix building with the new SDK.
+          NameList::iterator nn = std::find_if (rule->rhs.begin (), rule->rhs.end (), std::not1 (__Nullable (this)));
+ 
+           if (nn == rule->rhs.end ())
+             changed |= nullables.insert (rule->lhs).second;
+@@ -643,7 +646,8 @@ void Automaton::buildIncludesDigraph ()
+                   if (! _M_grammar->isNonTerminal (*A))
+                     continue;
+ 
+-                  NameList::iterator first_not_nullable = std::find_if (dot, rule->rhs.end (), std::not1 (_Nullable (this)));
+                  // Patch: Fix building with the new SDK.
+                  NameList::iterator first_not_nullable = std::find_if (dot, rule->rhs.end (), std::not1 (__Nullable (this)));
+                   if (first_not_nullable != rule->rhs.end ())
+                     continue;
+ 
+diff --git a/src/widgets/kernel/qwidget.cpp b/src/widgets/kernel/qwidget.cpp
+index 7396808442..7178aecf80 100644
+--- a/src/widgets/kernel/qwidget.cpp
+++ b/src/widgets/kernel/qwidget.cpp
+@@ -4722,6 +4722,17 @@ void QWidget::render(QPainter *painter, const QPoint &targetOffset,
+         return; // Fully transparent.
+ 
+     Q_D(QWidget);
+
+    // Patch: save and restore dirtyOpaqueChildren field.
+    //
+    // Just like in QWidget::grab() this field should be restored
+    // after the d->render() call, because it will be set to 1 and
+    // opaqueChildren field will be filled with empty region in
+    // case the widget is hidden (because all the opaque children
+    // will be skipped in isVisible() check).
+    //
+    const bool oldDirtyOpaqueChildren = d->dirtyOpaqueChildren;
+
+     const bool inRenderWithPainter = d->extra && d->extra->inRenderWithPainter;
+     const QRegion toBePainted = !inRenderWithPainter ? d->prepareToRender(sourceRegion, renderFlags)
+                                                      : sourceRegion;
+@@ -4743,6 +4754,10 @@ void QWidget::render(QPainter *painter, const QPoint &targetOffset,
+     if (!inRenderWithPainter && (opacity < 1.0 || (target->devType() == QInternal::Printer))) {
+         d->render_helper(painter, targetOffset, toBePainted, renderFlags);
+         d->extra->inRenderWithPainter = inRenderWithPainter;
+
+        // Patch: save and restore dirtyOpaqueChildren field.
+        d->dirtyOpaqueChildren = oldDirtyOpaqueChildren;
+
+         return;
+     }
+ 
+@@ -4774,6 +4789,9 @@ void QWidget::render(QPainter *painter, const QPoint &targetOffset,
+     d->setSharedPainter(oldPainter);
+ 
+     d->extra->inRenderWithPainter = inRenderWithPainter;
+
+    // Patch: save and restore dirtyOpaqueChildren field.
+    d->dirtyOpaqueChildren = oldDirtyOpaqueChildren;
+ }
+ 
+ static void sendResizeEvents(QWidget *target)
+@@ -7983,7 +8001,8 @@ bool QWidget::event(QEvent *event)
+     case QEvent::KeyPress: {
+         QKeyEvent *k = (QKeyEvent *)event;
+         bool res = false;
+-        if (!(k->modifiers() & (Qt::ControlModifier | Qt::AltModifier))) {  //### Add MetaModifier?
+        // Patch: Allow us to handle Ctrl+Tab and Ctrl+Backtab in the app.
+        if (!(k->modifiers() & (Qt::ControlModifier | Qt::AltModifier | Qt::MetaModifier))) {  //### Add MetaModifier?
+             if (k->key() == Qt::Key_Backtab
+                 || (k->key() == Qt::Key_Tab && (k->modifiers() & Qt::ShiftModifier)))
+                 res = focusNextPrevChild(false);
+diff --git a/src/widgets/styles/qmacstyle_mac.mm b/src/widgets/styles/qmacstyle_mac.mm
+index 0845a5eb02..5735cb6b39 100644
+--- a/src/widgets/styles/qmacstyle_mac.mm
+++ b/src/widgets/styles/qmacstyle_mac.mm
+@@ -3667,9 +3667,11 @@ void QMacStyle::drawControl(ControlElement ce, const QStyleOption *opt, QPainter
+ 
+                 NSBezierPath *pushButtonFocusRingPath;
+                 if (bdi.kind == kThemeBevelButton)
+-                    pushButtonFocusRingPath = [NSBezierPath bezierPathWithRect:focusRect];
+                    // Patch: Fix building with the new SDK.
+                    pushButtonFocusRingPath = [NSBezierPath bezierPathWithRect:NSRectFromCGRect(focusRect)];
+                 else
+-                    pushButtonFocusRingPath = [NSBezierPath bezierPathWithRoundedRect:focusRect xRadius:4 yRadius:4];
+                    // Patch: Fix building with the new SDK.
+                    pushButtonFocusRingPath = [NSBezierPath bezierPathWithRoundedRect:NSRectFromCGRect(focusRect) xRadius:4 yRadius:4];
+                 qt_drawFocusRingOnPath(cg, pushButtonFocusRingPath);
+             }
+ 
+diff --git a/src/widgets/util/qsystemtrayicon_qpa.cpp b/src/widgets/util/qsystemtrayicon_qpa.cpp
+index f98aeaf678..00c0734129 100644
+--- a/src/widgets/util/qsystemtrayicon_qpa.cpp
+++ b/src/widgets/util/qsystemtrayicon_qpa.cpp
+@@ -99,13 +99,18 @@ void QSystemTrayIconPrivate::updateIcon_sys()
+ 
+ void QSystemTrayIconPrivate::updateMenu_sys()
+ {
+-    if (qpa_sys && menu) {
+-        if (!menu->platformMenu()) {
+-            QPlatformMenu *platformMenu = qpa_sys->createMenu();
+-            if (platformMenu)
+-                menu->setPlatformMenu(platformMenu);
+    // Patch: Nice macOS tray icon support.
+    if (qpa_sys) {
+        if (menu) {
+            if (!menu->platformMenu()) {
+                QPlatformMenu *platformMenu = qpa_sys->createMenu();
+                if (platformMenu)
+                    menu->setPlatformMenu(platformMenu);
+            }
+            qpa_sys->updateMenu(menu->platformMenu());
+        } else {
+            qpa_sys->updateMenu(0);
+         }
+-        qpa_sys->updateMenu(menu->platformMenu());
+     }
+ }
+ 
+diff --git a/src/widgets/widgets/qwidgetlinecontrol.cpp b/src/widgets/widgets/qwidgetlinecontrol.cpp
+index 75f30599be..980f2be1e9 100644
+--- a/src/widgets/widgets/qwidgetlinecontrol.cpp
+++ b/src/widgets/widgets/qwidgetlinecontrol.cpp
+@@ -1867,7 +1867,8 @@ void QWidgetLineControl::processKeyEvent(QKeyEvent* event)
+ 
+     if (unknown && !isReadOnly()) {
+         QString t = event->text();
+-        if (!t.isEmpty() && t.at(0).isPrint()) {
+        // Patch: Enable ZWJ and ZWNJ characters to be in text input.
+        if (!t.isEmpty() && (t.at(0).isPrint() || t.at(0).unicode() == 0x200C || t.at(0).unicode() == 0x200D)) {
+             insert(t);
+ #ifndef QT_NO_COMPLETER
+             complete(event->key());
+diff --git a/src/widgets/widgets/qwidgettextcontrol.cpp b/src/widgets/widgets/qwidgettextcontrol.cpp
+index 96438a0bdf..b0b7206405 100644
+--- a/src/widgets/widgets/qwidgettextcontrol.cpp
+++ b/src/widgets/widgets/qwidgettextcontrol.cpp
+@@ -1342,7 +1342,8 @@ void QWidgetTextControlPrivate::keyPressEvent(QKeyEvent *e)
+ process:
+     {
+         QString text = e->text();
+-        if (!text.isEmpty() && (text.at(0).isPrint() || text.at(0) == QLatin1Char('\t'))) {
+        // Patch: Enable ZWJ and ZWNJ characters to be in text input.
+        if (!text.isEmpty() && (text.at(0).isPrint() || text.at(0) == QLatin1Char('\t') || text.at(0).unicode() == 0x200C || text.at(0).unicode() == 0x200D)) {
+             if (overwriteMode
+                 // no need to call deleteChar() if we have a selection, insertText
+                 // does it already
--- a/Telegram/Patches/macold/qtimageformats_5_3_2.diff
+++ b/Telegram/Patches/macold/qtimageformats_5_3_2.diff
@@ -0,0 +1,47 @@
+diff --git a/src/3rdparty/libwebp/src/dec/vp8l.c b/src/3rdparty/libwebp/src/dec/vp8l.c
+index ea0254d..953ff01 100644
+--- a/src/3rdparty/libwebp/src/dec/vp8l.c
+++ b/src/3rdparty/libwebp/src/dec/vp8l.c
+@@ -12,7 +12,7 @@
+ // Authors: Vikas Arora (vikaas.arora@gmail.com)
+ //          Jyrki Alakuijala (jyrki@google.com)
+ 
+-#include <stdio.h>
+// Patch: Backport of a crash fix.
+ #include <stdlib.h>
+ #include "./alphai.h"
+ #include "./vp8li.h"
+@@ -740,6 +740,10 @@ static int DecodeAlphaData(VP8LDecoder* const dec, uint8_t* const data,
+   const int len_code_limit = NUM_LITERAL_CODES + NUM_LENGTH_CODES;
+   const int mask = hdr->huffman_mask_;
+   assert(htree_group != NULL);
+
+  // Patch: Backport of a crash fix.
+  assert(pos < end);
+
+   assert(last_row <= height);
+   assert(Is8bOptimizable(hdr));
+ 
+@@ -830,6 +834,10 @@ static int DecodeImageData(VP8LDecoder* const dec, uint32_t* const data,
+       (hdr->color_cache_size_ > 0) ? &hdr->color_cache_ : NULL;
+   const int mask = hdr->huffman_mask_;
+   assert(htree_group != NULL);
+
+  // Patch: Backport of a crash fix.
+  assert(src < src_end);
+
+   assert(src_last <= src_end);
+ 
+   while (!br->eos_ && src < src_last) {
+@@ -1294,6 +1302,11 @@ int VP8LDecodeAlphaImageStream(ALPHDecoder* const alph_dec, int last_row) {
+   assert(dec->action_ == READ_DATA);
+   assert(last_row <= dec->height_);
+ 
+  // Patch: Backport of a crash fix.
+  if (dec->last_pixel_ == dec->width_ * dec->height_) {
+    return 1; // done
+  }
+
+   // Decode (with special row processing).
+   return alph_dec->use_8b_decode ?
+       DecodeAlphaData(dec, (uint8_t*)dec->pixels_, dec->width_, dec->height_,
--- a/Telegram/Patches/mini_chromium.diff
+++ b/Telegram/Patches/mini_chromium.diff
@@ -0,0 +1,52 @@
+diff --git a/base/mac/scoped_nsobject.h b/base/mac/scoped_nsobject.h
+index 2e157a4..5a306a1 100644
+--- a/base/mac/scoped_nsobject.h
+++ b/base/mac/scoped_nsobject.h
+@@ -11,6 +11,7 @@
+ 
+ #include "base/compiler_specific.h"
+ #include "base/mac/scoped_typeref.h"
+#include "base/template_util.h"
+ 
+ namespace base {
+ 
+@@ -55,7 +56,7 @@ class scoped_nsobject : public scoped_nsprotocol<NST*> {
+  public:
+   using scoped_nsprotocol<NST*>::scoped_nsprotocol;
+ 
+-  static_assert(std::is_same<NST, NSAutoreleasePool>::value == false,
+  static_assert(is_same<NST, NSAutoreleasePool>::value == false,
+                 "Use ScopedNSAutoreleasePool instead");
+ };
+ 
+diff --git a/base/macros.h b/base/macros.h
+index 5d96783..096704c 100644
+--- a/base/macros.h
+++ b/base/macros.h
+@@ -42,8 +42,9 @@ char (&ArraySizeHelper(const T (&array)[N]))[N];
+ 
+ template <typename Dest, typename Source>
+ inline Dest bit_cast(const Source& source) {
+#if __cplusplus >= 201103L
+   static_assert(sizeof(Dest) == sizeof(Source), "sizes must be equal");
+-
+#endif
+   Dest dest;
+   memcpy(&dest, &source, sizeof(dest));
+   return dest;
+diff --git a/build/common.gypi b/build/common.gypi
+index 1affc70..6e8f292 100644
+--- a/build/common.gypi
+++ b/build/common.gypi
+@@ -66,6 +66,11 @@
+           'conditions': [
+             ['clang!=0', {
+               'CLANG_CXX_LANGUAGE_STANDARD': 'c++11',  # -std=c++11
+              'conditions': [
+                ['mac_deployment_target=="10.8"', {
+                  'CLANG_CXX_LIBRARY': 'libc++',  # force -stdlib=libc++ for 10.8
+                }]
+              ],
+ 
+               # Don't link in libarclite_macosx.a, see http://crbug.com/156530.
+               'CLANG_LINK_OBJC_RUNTIME': 'NO',      # -fno-objc-link-runtime
--- a/Telegram/Patches/openal.diff
+++ b/Telegram/Patches/openal.diff
@@ -0,0 +1,22 @@
+diff --git a/Alc/backends/winmm.c b/Alc/backends/winmm.c
+index 9d8f8e9..8c8e44a 100644
+--- a/Alc/backends/winmm.c
+++ b/Alc/backends/winmm.c
+@@ -219,7 +219,7 @@ FORCE_ALIGN static int ALCwinmmPlayback_mixerProc(void *arg)
+     SetRTPriority();
+     althrd_setname(althrd_current(), MIXER_THREAD_NAME);
+ 
+-    while(GetMessage(&msg, NULL, 0, 0))
+    if (!self->killNow) while(GetMessage(&msg, NULL, 0, 0))
+     {
+         if(msg.message != WOM_DONE)
+             continue;
+@@ -504,7 +504,7 @@ static int ALCwinmmCapture_captureProc(void *arg)
+ 
+     althrd_setname(althrd_current(), RECORD_THREAD_NAME);
+ 
+-    while(GetMessage(&msg, NULL, 0, 0))
+    if (!self->killNow) while(GetMessage(&msg, NULL, 0, 0))
+     {
+         if(msg.message != WIM_DATA)
+             continue;
--- a/Telegram/Patches/qtbase_5_6_2.diff
+++ b/Telegram/Patches/qtbase_5_6_2.diff
--- a/Telegram/Resources/art/background.jpg
+++ b/Telegram/Resources/art/background.jpg
--- a/Telegram/Resources/art/bg.jpg
+++ b/Telegram/Resources/art/bg.jpg
--- a/Telegram/Resources/art/favicon.ico
+++ b/Telegram/Resources/art/favicon.ico
--- a/Telegram/Resources/art/icon128.png
+++ b/Telegram/Resources/art/icon128.png
--- a/Telegram/Resources/art/icon128@2x.png
+++ b/Telegram/Resources/art/icon128@2x.png
--- a/Telegram/Resources/art/icon16.png
+++ b/Telegram/Resources/art/icon16.png
--- a/Telegram/Resources/art/icon16@2x.png
+++ b/Telegram/Resources/art/icon16@2x.png
--- a/Telegram/Resources/art/icon256.ico
+++ b/Telegram/Resources/art/icon256.ico
--- a/Telegram/Resources/art/icon256.png
+++ b/Telegram/Resources/art/icon256.png
--- a/Telegram/Resources/art/icon256@2x.png
+++ b/Telegram/Resources/art/icon256@2x.png
--- a/Telegram/Resources/art/icon32.png
+++ b/Telegram/Resources/art/icon32.png
--- a/Telegram/Resources/art/icon32@2x.png
+++ b/Telegram/Resources/art/icon32@2x.png
--- a/Telegram/Resources/art/icon48.png
+++ b/Telegram/Resources/art/icon48.png
--- a/Telegram/Resources/art/icon48@2x.png
+++ b/Telegram/Resources/art/icon48@2x.png
--- a/Telegram/Resources/art/icon512.png
+++ b/Telegram/Resources/art/icon512.png
--- a/Telegram/Resources/art/icon512@2x.png
+++ b/Telegram/Resources/art/icon512@2x.png
--- a/Telegram/Resources/art/icon64.png
+++ b/Telegram/Resources/art/icon64.png
--- a/Telegram/Resources/art/icon64@2x.png
+++ b/Telegram/Resources/art/icon64@2x.png
--- a/Telegram/Resources/art/icon_green.png
+++ b/Telegram/Resources/art/icon_green.png
--- a/Telegram/Resources/art/iconbig_green.png
+++ b/Telegram/Resources/art/iconbig_green.png
--- a/Telegram/Resources/art/logo_256.png
+++ b/Telegram/Resources/art/logo_256.png
--- a/Telegram/Resources/art/logo_256_no_margin.png
+++ b/Telegram/Resources/art/logo_256_no_margin.png
--- a/Telegram/Resources/icons/calls/active_hand.json
+++ b/Telegram/Resources/icons/calls/active_hand.json
--- a/Telegram/Resources/icons/calls/call_settings.png
+++ b/Telegram/Resources/icons/calls/call_settings.png
--- a/Telegram/Resources/icons/calls/call_settings@2x.png
+++ b/Telegram/Resources/icons/calls/call_settings@2x.png
--- a/Telegram/Resources/icons/calls/call_settings@3x.png
+++ b/Telegram/Resources/icons/calls/call_settings@3x.png
--- a/Telegram/Resources/icons/calls/calls_more.png
+++ b/Telegram/Resources/icons/calls/calls_more.png
--- a/Telegram/Resources/icons/calls/calls_more@2x.png
+++ b/Telegram/Resources/icons/calls/calls_more@2x.png
--- a/Telegram/Resources/icons/calls/calls_more@3x.png
+++ b/Telegram/Resources/icons/calls/calls_more@3x.png
--- a/Telegram/Resources/icons/calls/calls_present.png
+++ b/Telegram/Resources/icons/calls/calls_present.png
--- a/Telegram/Resources/icons/calls/calls_present@2x.png
+++ b/Telegram/Resources/icons/calls/calls_present@2x.png
--- a/Telegram/Resources/icons/calls/calls_present@3x.png
+++ b/Telegram/Resources/icons/calls/calls_present@3x.png
--- a/Telegram/Resources/icons/calls/calls_settings.png
+++ b/Telegram/Resources/icons/calls/calls_settings.png
--- a/Telegram/Resources/icons/calls/calls_settings@2x.png
+++ b/Telegram/Resources/icons/calls/calls_settings@2x.png
--- a/Telegram/Resources/icons/calls/calls_settings@3x.png
+++ b/Telegram/Resources/icons/calls/calls_settings@3x.png
--- a/Telegram/Resources/icons/calls/group_calls_share.png
+++ b/Telegram/Resources/icons/calls/group_calls_share.png
--- a/Telegram/Resources/icons/calls/group_calls_share@2x.png
+++ b/Telegram/Resources/icons/calls/group_calls_share@2x.png
--- a/Telegram/Resources/icons/calls/group_calls_share@3x.png
+++ b/Telegram/Resources/icons/calls/group_calls_share@3x.png
--- a/Telegram/Resources/icons/calls/hand_muted_active.json
+++ b/Telegram/Resources/icons/calls/hand_muted_active.json
--- a/Telegram/Resources/icons/calls/hands.lottie
+++ b/Telegram/Resources/icons/calls/hands.lottie
--- a/Telegram/Resources/icons/calls/raised_hand.json
+++ b/Telegram/Resources/icons/calls/raised_hand.json
--- a/Telegram/Resources/icons/calls/video_back.png
+++ b/Telegram/Resources/icons/calls/video_back.png
--- a/Telegram/Resources/icons/calls/video_back@2x.png
+++ b/Telegram/Resources/icons/calls/video_back@2x.png
--- a/Telegram/Resources/icons/calls/video_back@3x.png
+++ b/Telegram/Resources/icons/calls/video_back@3x.png
--- a/Telegram/Resources/icons/calls/video_large_paused.png
+++ b/Telegram/Resources/icons/calls/video_large_paused.png
--- a/Telegram/Resources/icons/calls/video_large_paused@2x.png
+++ b/Telegram/Resources/icons/calls/video_large_paused@2x.png
--- a/Telegram/Resources/icons/calls/video_large_paused@3x.png
+++ b/Telegram/Resources/icons/calls/video_large_paused@3x.png
--- a/Telegram/Resources/icons/calls/video_mini_invited.png
+++ b/Telegram/Resources/icons/calls/video_mini_invited.png
--- a/Telegram/Resources/icons/calls/video_mini_invited@2x.png
+++ b/Telegram/Resources/icons/calls/video_mini_invited@2x.png
--- a/Telegram/Resources/icons/calls/video_mini_invited@3x.png
+++ b/Telegram/Resources/icons/calls/video_mini_invited@3x.png
--- a/Telegram/Resources/icons/calls/video_mini_mute.png
+++ b/Telegram/Resources/icons/calls/video_mini_mute.png
--- a/Telegram/Resources/icons/calls/video_mini_mute@2x.png
+++ b/Telegram/Resources/icons/calls/video_mini_mute@2x.png
--- a/Telegram/Resources/icons/calls/video_mini_mute@3x.png
+++ b/Telegram/Resources/icons/calls/video_mini_mute@3x.png
--- a/Telegram/Resources/icons/calls/video_mini_screencast.png
+++ b/Telegram/Resources/icons/calls/video_mini_screencast.png
--- a/Telegram/Resources/icons/calls/video_mini_screencast@2x.png
+++ b/Telegram/Resources/icons/calls/video_mini_screencast@2x.png
--- a/Telegram/Resources/icons/calls/video_mini_screencast@3x.png
+++ b/Telegram/Resources/icons/calls/video_mini_screencast@3x.png
--- a/Telegram/Resources/icons/calls/video_mini_speak.png
+++ b/Telegram/Resources/icons/calls/video_mini_speak.png
--- a/Telegram/Resources/icons/calls/video_mini_speak@2x.png
+++ b/Telegram/Resources/icons/calls/video_mini_speak@2x.png
--- a/Telegram/Resources/icons/calls/video_mini_speak@3x.png
+++ b/Telegram/Resources/icons/calls/video_mini_speak@3x.png
--- a/Telegram/Resources/icons/calls/video_mini_video.png
+++ b/Telegram/Resources/icons/calls/video_mini_video.png
--- a/Telegram/Resources/icons/calls/video_mini_video@2x.png
+++ b/Telegram/Resources/icons/calls/video_mini_video@2x.png
--- a/Telegram/Resources/icons/calls/video_mini_video@3x.png
+++ b/Telegram/Resources/icons/calls/video_mini_video@3x.png
--- a/Telegram/Resources/icons/calls/video_over_mute.png
+++ b/Telegram/Resources/icons/calls/video_over_mute.png
--- a/Telegram/Resources/icons/calls/video_over_mute@2x.png
+++ b/Telegram/Resources/icons/calls/video_over_mute@2x.png
--- a/Telegram/Resources/icons/calls/video_over_mute@3x.png
+++ b/Telegram/Resources/icons/calls/video_over_mute@3x.png
--- a/Telegram/Resources/icons/calls/video_over_pin.png
+++ b/Telegram/Resources/icons/calls/video_over_pin.png
--- a/Telegram/Resources/icons/calls/video_over_pin@2x.png
+++ b/Telegram/Resources/icons/calls/video_over_pin@2x.png
--- a/Telegram/Resources/icons/calls/video_over_pin@3x.png
+++ b/Telegram/Resources/icons/calls/video_over_pin@3x.png
--- a/Telegram/Resources/icons/calls/video_tooltip.png
+++ b/Telegram/Resources/icons/calls/video_tooltip.png
--- a/Telegram/Resources/icons/calls/video_tooltip@2x.png
+++ b/Telegram/Resources/icons/calls/video_tooltip@2x.png
--- a/Telegram/Resources/icons/calls/video_tooltip@3x.png
+++ b/Telegram/Resources/icons/calls/video_tooltip@3x.png
--- a/Telegram/Resources/icons/calls/voice.lottie
+++ b/Telegram/Resources/icons/calls/voice.lottie
--- a/Telegram/Resources/icons/chat/input_autodelete_30d.png
+++ b/Telegram/Resources/icons/chat/input_autodelete_30d.png
--- a/Telegram/Resources/icons/chat/input_autodelete_30d@2x.png
+++ b/Telegram/Resources/icons/chat/input_autodelete_30d@2x.png
--- a/Telegram/Resources/icons/chat/input_autodelete_30d@3x.png
+++ b/Telegram/Resources/icons/chat/input_autodelete_30d@3x.png
--- a/Telegram/Resources/icons/info_media_gif.png
+++ b/Telegram/Resources/icons/info_media_gif.png
--- a/Telegram/Resources/icons/info_media_gif@2x.png
+++ b/Telegram/Resources/icons/info_media_gif@2x.png
--- a/Telegram/Resources/icons/info_media_gif@3x.png
+++ b/Telegram/Resources/icons/info_media_gif@3x.png
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
John Preston	672aacd528	wip linux webview	2021-03-31 22:20:30 +04:00
John Preston	1a5e807fa9	Fix build for macOS / Linux.	2021-03-31 21:38:32 +04:00
John Preston	f98f4f0d14	Simple receipt viewing.	2021-03-30 10:03:54 +04:00
John Preston	78def16ced	Fix showing comments from the beginning.	2021-03-29 19:53:55 +04:00
John Preston	cd7b3419de	Add phone format and validation in payments.	2021-03-29 18:56:26 +04:00
John Preston	dc4048f1c1	Add local validation for card information.	2021-03-29 16:16:54 +04:00
John Preston	bef5320163	Add nice country choosing in payments.	2021-03-26 21:09:09 +04:00
John Preston	9a722ea8d4	Improve checkout information / card page design.	2021-03-26 19:23:12 +04:00
John Preston	1aefada45d	Improve checkout main page design.	2021-03-26 17:05:31 +04:00
John Preston	f5a8bf0e74	Handle native / non-native payment methods (same way).	2021-03-25 23:22:45 +04:00
John Preston	738439c334	Support entering card details natively.	2021-03-25 20:56:20 +04:00
John Preston	8949c9969b	Fix jumping of Media Viewer in some DEs.	2021-03-25 19:10:01 +04:00
John Preston	cdf6fb1512	Port required parts of Stripe SDK to lib_stripe.	2021-03-24 22:00:49 +04:00
John Preston	fb0ea59ff3	Validate saved information on payment form open.	2021-03-24 16:41:46 +04:00
John Preston	36f5be60f4	Show some payment errors, focus fields.	2021-03-24 15:30:01 +04:00
John Preston	46508f7e5e	First full-featured version of payments, no design.	2021-03-23 22:30:00 +04:00
John Preston	28137dfb60	Start proper payments processing.	2021-03-23 16:34:34 +04:00
John Preston	e7784620d3	Use navigation cancel in Webview.	2021-03-22 22:56:29 +04:00
John Preston	462986e9c3	Update lib_webview.	2021-03-22 22:56:29 +04:00
John Preston	c11de2380e	Start Linux support.	2021-03-22 22:56:27 +04:00
John Preston	a432e826a6	Use lib_webview implementation on macOS.	2021-03-22 22:54:54 +04:00
John Preston	ea9e85e70f	Use lib_webview implementation on Windows.	2021-03-22 22:54:54 +04:00
John Preston	d3829c52ec	Fix webview on macOS.	2021-03-22 22:54:54 +04:00
John Preston	9f04570335	3DSecure in Proof-Of-Concept payments.	2021-03-22 22:54:53 +04:00
John Preston	3c486522a7	Proof-Of-Concept simplest invoice payment.	2021-03-22 22:54:53 +04:00
John Preston	07cd8c4e83	Link Telegram with lib_webview.	2021-03-22 22:54:53 +04:00
John Preston	7447c6ea75	Add webview / lib_webview submodules.	2021-03-22 22:54:53 +04:00