diff --git a/Telegram/SourceFiles/window/main_window.cpp b/Telegram/SourceFiles/window/main_window.cpp index b6f2d0096c..9a808233a4 100644 --- a/Telegram/SourceFiles/window/main_window.cpp +++ b/Telegram/SourceFiles/window/main_window.cpp @@ -357,9 +357,11 @@ void MainWindow::updateShadowSize() { } void MainWindow::recountGeometryConstraints() { +#ifdef Q_OS_LINUX const auto hasShadow = this->hasShadow(); setWindowFlag(Qt::NoDropShadowWindowHint, hasShadow); setAttribute(Qt::WA_OpaquePaintEvent, !hasShadow); +#endif // Q_OS_LINUX updateShadowSize(); updateMinimumSize(); diff --git a/Telegram/lib_ui b/Telegram/lib_ui index a1dbca8578..b5d6851c97 160000 --- a/Telegram/lib_ui +++ b/Telegram/lib_ui @@ -1 +1 @@ -Subproject commit a1dbca85783289d737ce0368f5ec3659b5745458 +Subproject commit b5d6851c976ef87a9f662a8aaae3db45d6141cef diff --git a/cmake b/cmake index 4c8956027d..9b1ed3965b 160000 --- a/cmake +++ b/cmake @@ -1 +1 @@ -Subproject commit 4c8956027de8e8e8b984c5daa643aacb14a89123 +Subproject commit 9b1ed3965b836131fe08b1090a8b5788a04066b8 diff --git a/docs/building-cmake.md b/docs/building-cmake.md index 6d5b08d8d9..fcab9f775f 100644 --- a/docs/building-cmake.md +++ b/docs/building-cmake.md @@ -273,19 +273,18 @@ Go to ***BuildPath*** and run sudo make install cd .. - LibrariesPath=`pwd` git clone https://github.com/desktop-app/tg_owt.git cd tg_owt mkdir out cd out mkdir Debug cd Debug - cmake -G Ninja -DCMAKE_BUILD_TYPE=Debug -DTG_OWT_SPECIAL_TARGET=linux -DTG_OWT_LIBJPEG_INCLUDE_PATH=$LibrariesPath/qt_5_12_8/qtbase/src/3rdparty/libjpeg -DTG_OWT_OPENSSL_INCLUDE_PATH=/usr/local/desktop-app/openssl-1.1.1/include -DTG_OWT_OPUS_INCLUDE_PATH=/usr/local/include/opus -DTG_OWT_FFMPEG_INCLUDE_PATH=/usr/local/include ../.. + cmake -G Ninja -DCMAKE_BUILD_TYPE=Debug -DTG_OWT_SPECIAL_TARGET=linux -DTG_OWT_LIBJPEG_INCLUDE_PATH=`pwd`/../../../qt_5_12_8/qtbase/src/3rdparty/libjpeg -DTG_OWT_OPENSSL_INCLUDE_PATH=/usr/local/desktop-app/openssl-1.1.1/include -DTG_OWT_OPUS_INCLUDE_PATH=/usr/local/include/opus -DTG_OWT_FFMPEG_INCLUDE_PATH=/usr/local/include ../.. ninja cd .. mkdir Release cd Release - cmake -G Ninja -DCMAKE_BUILD_TYPE=Release -DTG_OWT_SPECIAL_TARGET=mac -DTG_OWT_LIBJPEG_INCLUDE_PATH=$LibrariesPath/qt_5_12_8/qtbase/src/3rdparty/libjpeg -DTG_OWT_OPENSSL_INCLUDE_PATH=$LibrariesPath/openssl_1_1_1/include -DTG_OWT_OPUS_INCLUDE_PATH=/usr/local/macos/include/opus -DTG_OWT_FFMPEG_INCLUDE_PATH=/usr/local/macos/include ../.. + cmake -G Ninja -DCMAKE_BUILD_TYPE=Release -DTG_OWT_SPECIAL_TARGET=mac -DTG_OWT_LIBJPEG_INCLUDE_PATH=`pwd`/../../../qt_5_12_8/qtbase/src/3rdparty/libjpeg -DTG_OWT_OPENSSL_INCLUDE_PATH=$LibrariesPath/openssl_1_1_1/include -DTG_OWT_OPUS_INCLUDE_PATH=/usr/local/macos/include/opus -DTG_OWT_FFMPEG_INCLUDE_PATH=/usr/local/macos/include ../.. ninja cd ..\.. diff --git a/docs/building-msvc.md b/docs/building-msvc.md index 9df32aff24..0ce31ba21f 100644 --- a/docs/building-msvc.md +++ b/docs/building-msvc.md @@ -165,19 +165,18 @@ Open **x86 Native Tools Command Prompt for VS 2019.bat**, go to ***BuildPath*** jom -j4 install cd .. - set LibrariesPath=%cd% git clone https://github.com/desktop-app/tg_owt.git cd tg_owt mkdir out cd out mkdir Debug cd Debug - cmake -G Ninja -DCMAKE_BUILD_TYPE=Debug -DTG_OWT_SPECIAL_TARGET=win -DTG_OWT_LIBJPEG_INCLUDE_PATH=%LibrariesPath%/qt_5_12_8/qtbase/src/3rdparty/libjpeg -DTG_OWT_OPENSSL_INCLUDE_PATH=%LibrariesPath%/openssl_1_1_1/include -DTG_OWT_OPUS_INCLUDE_PATH=%LibrariesPath%/opus/include -DTG_OWT_FFMPEG_INCLUDE_PATH=%LibrariesPath%/ffmpeg ../.. + cmake -G Ninja -DCMAKE_BUILD_TYPE=Debug -DTG_OWT_SPECIAL_TARGET=win -DTG_OWT_LIBJPEG_INCLUDE_PATH=%cd%/../../../qt_5_12_8/qtbase/src/3rdparty/libjpeg -DTG_OWT_OPENSSL_INCLUDE_PATH=%%cd%/../../../openssl_1_1_1/include -DTG_OWT_OPUS_INCLUDE_PATH=%cd%/../../../opus/include -DTG_OWT_FFMPEG_INCLUDE_PATH=%cd%/../../..ffmpeg ../.. ninja cd .. mkdir Release cd Release - cmake -G Ninja -DCMAKE_BUILD_TYPE=Release -DTG_OWT_SPECIAL_TARGET=win -DTG_OWT_LIBJPEG_INCLUDE_PATH=%LibrariesPath%/qt_5_12_8/qtbase/src/3rdparty/libjpeg -DTG_OWT_OPENSSL_INCLUDE_PATH=%LibrariesPath%/openssl_1_1_1/include -DTG_OWT_OPUS_INCLUDE_PATH=%LibrariesPath%/opus/include -DTG_OWT_FFMPEG_INCLUDE_PATH=%LibrariesPath%/ffmpeg ../.. + cmake -G Ninja -DCMAKE_BUILD_TYPE=Release -DTG_OWT_SPECIAL_TARGET=win -DTG_OWT_LIBJPEG_INCLUDE_PATH=%cd%/../../../qt_5_12_8/qtbase/src/3rdparty/libjpeg -DTG_OWT_OPENSSL_INCLUDE_PATH=%cd%/../../../openssl_1_1_1/include -DTG_OWT_OPUS_INCLUDE_PATH=%cd%/../../../opus/include -DTG_OWT_FFMPEG_INCLUDE_PATH=%cd%/../../../ffmpeg ../.. ninja cd ..\.. diff --git a/docs/building-osx.md b/docs/building-osx.md index f47c7de91d..4ed10d78c1 100644 --- a/docs/building-osx.md +++ b/docs/building-osx.md @@ -46,7 +46,6 @@ Go to ***BuildPath*** and run cd ../.. cd Libraries - LibrariesPath=`pwd` git clone https://github.com/desktop-app/patches.git cd patches @@ -69,10 +68,10 @@ Go to ***BuildPath*** and run sudo make install cd .. - git clone https://github.com/openssl/openssl - cd openssl - git checkout OpenSSL_1_0_1-stable - ./Configure darwin64-x86_64-cc -static -mmacosx-version-min=10.10 + git clone https://github.com/openssl/openssl openssl_1_1_1 + cd openssl_1_1_1 + git checkout OpenSSL_1_1_1-stable + ./Configure --prefix=/usr/local/macos no-tests darwin64-x86_64-cc -static $MIN_VER make build_libs $MAKE_THREADS_CNT cd .. @@ -246,6 +245,21 @@ Go to ***BuildPath*** and run sudo make install cd .. + git clone https://github.com/desktop-app/tg_owt.git + cd tg_owt + mkdir out + cd out + mkdir Debug + cd Debug + cmake -G Ninja -DCMAKE_BUILD_TYPE=Debug -DTG_OWT_SPECIAL_TARGET=osx -DTG_OWT_LIBJPEG_INCLUDE_PATH=`pwd`/../../../qt5_6_2/qtbase/src/3rdparty/libjpeg -DTG_OWT_OPENSSL_INCLUDE_PATH=`pwd`/../../../openssl_1_1_1/include -DTG_OWT_OPUS_INCLUDE_PATH=/usr/local/include/opus -DTG_OWT_FFMPEG_INCLUDE_PATH=`pwd`/../../../ffmpeg ../.. + ninja + cd .. + mkdir Release + cd Release + cmake -G Ninja -DCMAKE_BUILD_TYPE=Release -DTG_OWT_SPECIAL_TARGET=osx -DTG_OWT_LIBJPEG_INCLUDE_PATH=`pwd`/../../../qt5_6_2/qtbase/src/3rdparty/libjpeg -DTG_OWT_OPENSSL_INCLUDE_PATH=`pwd`/../../../openssl_1_1_1/include -DTG_OWT_OPUS_INCLUDE_PATH=/usr/local/include/opus -DTG_OWT_FFMPEG_INCLUDE_PATH=`pwd`/../../../ffmpeg ../.. + ninja + cd ..\.. + ### Building the project Go to ***BuildPath*/tdesktop/Telegram** and run (using [your **api_id** and **api_hash**](#obtain-your-api-credentials)) diff --git a/docs/building-xcode.md b/docs/building-xcode.md index c63093e5a6..1d4f1c2818 100644 --- a/docs/building-xcode.md +++ b/docs/building-xcode.md @@ -43,7 +43,6 @@ Go to ***BuildPath*** and run mkdir -p Libraries/macos cd Libraries/macos - LibrariesPath=`pwd` git clone https://github.com/desktop-app/patches.git cd patches @@ -252,22 +251,6 @@ Go to ***BuildPath*** and run find ../../patches/qtbase_5_12_8 -type f -print0 | sort -z | xargs -0 git apply cd .. - LibrariesPath=`pwd` - git clone https://github.com/desktop-app/tg_owt.git - cd tg_owt - mkdir out - cd out - mkdir Debug - cd Debug - cmake -G Ninja -DCMAKE_BUILD_TYPE=Debug -DTG_OWT_SPECIAL_TARGET=mac -DTG_OWT_LIBJPEG_INCLUDE_PATH=$LibrariesPath/qt_5_12_8/qtbase/src/3rdparty/libjpeg -DTG_OWT_OPENSSL_INCLUDE_PATH=$LibrariesPath/openssl_1_1_1/include -DTG_OWT_OPUS_INCLUDE_PATH=/usr/local/macos/include/opus -DTG_OWT_FFMPEG_INCLUDE_PATH=/usr/local/macos/include ../.. - ninja - cd .. - mkdir Release - cd Release - cmake -G Ninja -DCMAKE_BUILD_TYPE=Release -DTG_OWT_SPECIAL_TARGET=mac -DTG_OWT_LIBJPEG_INCLUDE_PATH=$LibrariesPath/qt_5_12_8/qtbase/src/3rdparty/libjpeg -DTG_OWT_OPENSSL_INCLUDE_PATH=$LibrariesPath/openssl_1_1_1/include -DTG_OWT_OPUS_INCLUDE_PATH=/usr/local/macos/include/opus -DTG_OWT_FFMPEG_INCLUDE_PATH=/usr/local/macos/include ../.. - ninja - cd ..\.. - ./configure -prefix "/usr/local/desktop-app/Qt-5.12.8" \ -debug-and-release \ -force-debug-info \ @@ -285,27 +268,20 @@ Go to ***BuildPath*** and run sudo make install cd .. - git clone https://chromium.googlesource.com/chromium/tools/depot_tools.git - export PATH=`pwd`/depot_tools:$PATH - - mkdir webrtc - cd webrtc - cp ../patches/webrtc/.gclient ./ - git clone https://github.com/open-webrtc-toolkit/owt-deps-webrtc src - gclient sync --no-history - cd src - git apply ../../patches/webrtc/src.diff - cd build - git apply ../../../patches/webrtc/build.diff - cd ../third_party - git apply ../../../patches/webrtc/third_party.diff - cd libsrtp - git apply ../../../../patches/webrtc/libsrtp.diff - cd ../.. - ../../patches/webrtc/configure.sh - ninja -C out/Debug webrtc - ninja -C out/Release webrtc - cd ../.. + git clone https://github.com/desktop-app/tg_owt.git + cd tg_owt + mkdir out + cd out + mkdir Debug + cd Debug + cmake -G Ninja -DCMAKE_BUILD_TYPE=Debug -DTG_OWT_SPECIAL_TARGET=mac -DTG_OWT_LIBJPEG_INCLUDE_PATH=`pwd`/../../../qt_5_12_8/qtbase/src/3rdparty/libjpeg -DTG_OWT_OPENSSL_INCLUDE_PATH=`pwd`/../../../openssl_1_1_1/include -DTG_OWT_OPUS_INCLUDE_PATH=/usr/local/macos/include/opus -DTG_OWT_FFMPEG_INCLUDE_PATH=/usr/local/macos/include ../.. + ninja + cd .. + mkdir Release + cd Release + cmake -G Ninja -DCMAKE_BUILD_TYPE=Release -DTG_OWT_SPECIAL_TARGET=mac -DTG_OWT_LIBJPEG_INCLUDE_PATH=`pwd`/../../../qt_5_12_8/qtbase/src/3rdparty/libjpeg -DTG_OWT_OPENSSL_INCLUDE_PATH=`pwd`/../../../openssl_1_1_1/include -DTG_OWT_OPUS_INCLUDE_PATH=/usr/local/macos/include/opus -DTG_OWT_FFMPEG_INCLUDE_PATH=/usr/local/macos/include ../.. + ninja + cd ..\.. ### Building the project