From 086f754a96835dab43f9e9d637c89fea4f2202a1 Mon Sep 17 00:00:00 2001 From: John Preston Date: Tue, 18 Oct 2016 00:33:24 +0300 Subject: [PATCH] Changed docs to work with Qt 5.6.2, hopefully fixed travis build. --- .travis/build.sh | 2 +- README.md | 2 +- doc/building-cmake.md | 22 +++++++++++----------- doc/building-msvc.md | 22 +++++++++++----------- doc/building-qmake.md | 2 +- doc/building-qtcreator.md | 28 ++++++++++++++-------------- doc/building-xcode.md | 20 ++++++++++---------- 7 files changed, 49 insertions(+), 49 deletions(-) diff --git a/.travis/build.sh b/.travis/build.sh index 02e978bc66eb1..e84b64e46c6e8 100755 --- a/.travis/build.sh +++ b/.travis/build.sh @@ -9,7 +9,7 @@ UPSTREAM="$REPO/upstream" EXTERNAL="$REPO/external" CACHE="$HOME/travisCacheDir" -QT_VERSION=5.6.0 +QT_VERSION=5.6.2 XKB_PATH="$BUILD/libxkbcommon" XKB_CACHE_VERSION="2" diff --git a/README.md b/README.md index 95de7a67300a9..1fe05ab7eb092 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,7 @@ The source code is published under GPLv3 with OpenSSL exception, the license is ## Third-party -* Qt 5.3.2 and 5.6.0, slightly patched ([LGPL](http://doc.qt.io/qt-5/lgpl.html)) +* Qt 5.3.2 and 5.6.2, slightly patched ([LGPL](http://doc.qt.io/qt-5/lgpl.html)) * OpenSSL 1.0.1g ([OpenSSL License](https://www.openssl.org/source/license.html)) * zlib 1.2.8 ([zlib License](http://www.zlib.net/zlib_license.html)) * libexif 0.6.20 ([LGPL](https://www.gnu.org/licenses/old-licenses/lgpl-2.1.en.html)) diff --git a/doc/building-cmake.md b/doc/building-cmake.md index 769d43ce5b44f..8951d03ed8140 100644 --- a/doc/building-cmake.md +++ b/doc/building-cmake.md @@ -27,7 +27,7 @@ By git – in Terminal go to **/home/user/TBuild** and run Install dev libraries - sudo apt-get install libexif-dev liblzma-dev libz-dev libssl-dev libappindicator-dev libunity-dev + sudo apt-get install libexif-dev liblzma-dev libz-dev libssl-dev libappindicator-dev libunity-dev libicu-dev ####zlib 1.2.8 @@ -120,31 +120,31 @@ In Terminal go to **/home/user/TBuild/Libraries** and run make sudo make install -####Qt 5.6.0, slightly patched +####Qt 5.6.2, slightly patched In Terminal go to **/home/user/TBuild/Libraries** and run - git clone git://code.qt.io/qt/qt5.git qt5_6_0 - cd qt5_6_0 + git clone git://code.qt.io/qt/qt5.git qt5_6_2 + cd qt5_6_2 git checkout 5.6 perl init-repository --module-subset=qtbase,qtimageformats - git checkout v5.6.0 - cd qtimageformats && git checkout v5.6.0 && cd .. - cd qtbase && git checkout v5.6.0 && cd .. + git checkout v5.6.2 + cd qtimageformats && git checkout v5.6.2 && cd .. + cd qtbase && git checkout v5.6.2 && cd .. #####Apply the patch - cd qtbase && git apply ../../../tdesktop/Telegram/Patches/qtbase_5_6_0.diff && cd .. + cd qtbase && git apply ../../../tdesktop/Telegram/Patches/qtbase_5_6_2.diff && cd .. #####Building library -Install some packages for Qt (see **/home/user/TBuild/Libraries/qt5_6_0/qtbase/src/plugins/platforms/xcb/README**) +Install some packages for Qt (see **/home/user/TBuild/Libraries/qt5_6_2/qtbase/src/plugins/platforms/xcb/README**) sudo apt-get install libxcb1-dev libxcb-image0-dev libxcb-keysyms1-dev libxcb-icccm4-dev libxcb-render-util0-dev libxcb-util0-dev libxrender-dev libasound-dev libpulse-dev libxcb-sync0-dev libxcb-xfixes0-dev libxcb-randr0-dev libx11-xcb-dev libffi-dev -In Terminal go to **/home/user/TBuild/Libraries/qt5_6_0** and there run +In Terminal go to **/home/user/TBuild/Libraries/qt5_6_2** and there run - OPENSSL_LIBS='-L/usr/local/ssl/lib -lssl -lcrypto' ./configure -prefix "/usr/local/tdesktop/Qt-5.6.0" -release -force-debug-info -opensource -confirm-license -qt-zlib -qt-libpng -qt-libjpeg -qt-freetype -qt-harfbuzz -qt-pcre -qt-xcb -qt-xkbcommon-x11 -no-opengl -no-gtkstyle -static -openssl-linked -nomake examples -nomake tests + ./configure -prefix "/usr/local/tdesktop/Qt-5.6.2" -release -force-debug-info -opensource -confirm-license -qt-zlib -qt-libpng -qt-libjpeg -qt-freetype -qt-harfbuzz -qt-pcre -qt-xcb -qt-xkbcommon-x11 -no-opengl -no-gtkstyle -static -openssl-linked -nomake examples -nomake tests make -j4 sudo make install diff --git a/doc/building-msvc.md b/doc/building-msvc.md index a07492f12e7ce..b7c9f071e6a28 100644 --- a/doc/building-msvc.md +++ b/doc/building-msvc.md @@ -16,7 +16,7 @@ - [Building libraries](#building-libraries) + [FFmpeg](#ffmpeg) - [Building libraries](#building-libraries-1) - + [Qt 5.6.0, slightly patched](#qt-560-slightly-patched) + + [Qt 5.6.2, slightly patched](#qt-560-slightly-patched) - [Apply the patch](#apply-the-patch) - [Install Windows SDKs](#install-windows-sdks) - [Building library](#building-library-4) @@ -177,24 +177,24 @@ Go to **D:\\msys64** and launch **msys2_shell.bat**, there run make make install -### Qt 5.6.0, slightly patched +### Qt 5.6.2, slightly patched * Install Python 3.3.2 from https://www.python.org/download/releases/3.3.2 > [**Windows x86 MSI Installer (3.3.2)**](https://www.python.org/ftp/python/3.3.2/python-3.3.2.msi) * Go to **D:\\TBuild\\Libraries** and run - git clone git://code.qt.io/qt/qt5.git qt5_6_0 - cd qt5_6_0 + git clone git://code.qt.io/qt/qt5.git qt5_6_2 + cd qt5_6_2 git checkout 5.6 perl init-repository --module-subset=qtbase,qtimageformats - git checkout v5.6.0 - cd qtimageformats && git checkout v5.6.0 && cd .. - cd qtbase && git checkout v5.6.0 && cd .. + git checkout v5.6.2 + cd qtimageformats && git checkout v5.6.2 && cd .. + cd qtbase && git checkout v5.6.2 && cd .. #### Apply the patch - cd qtbase && git apply ../../../tdesktop/Telegram/Patches/qtbase_5_6_0.diff && cd .. + cd qtbase && git apply ../../../tdesktop/Telegram/Patches/qtbase_5_6_2.diff && cd .. #### Install Windows SDKs @@ -265,9 +265,9 @@ Breakpad is a set of client and server components which implement a crash-report * Launch VS2015 for configuring Qt5Package * QT5 > Qt Options > Add - * Version name: **Qt 5.6.0 Win32** - * Path: **D:\TBuild\Libraries\qt5_6_0\qtbase** -* Default Qt/Win version: **Qt 5.6.0 Win32** – **OK** - You may need to restart Visual Studio for this to take effect. + * Version name: **Qt 5.6.22Win32** + * Path: **D:\TBuild\Libraries\qt5_6_2\qtbase** +* Default Qt/Win version: **Qt 5.6.2 Win32** – **OK** - You may need to restart Visual Studio for this to take effect. #### Build the project diff --git a/doc/building-qmake.md b/doc/building-qmake.md index be7d0cf3274bc..344c9566a03dd 100644 --- a/doc/building-qmake.md +++ b/doc/building-qmake.md @@ -7,7 +7,7 @@ The following commands assume the following environment variables are set: * `$srcdir`: The directory into which the source has been downloaded and unpacked. - * `_qtver`: The Qt version being used (eg: `5.6.0`). + * `_qtver`: The Qt version being used (eg: `5.6.2`). * `$pkgdir`: The directory into which installable files are places. This is `/` for local installations, or can be different directory when preparing a redistributable package. diff --git a/doc/building-qtcreator.md b/doc/building-qtcreator.md index 42500c225c20f..8b73f6964a0b0 100644 --- a/doc/building-qtcreator.md +++ b/doc/building-qtcreator.md @@ -123,31 +123,31 @@ In Terminal go to **/home/user/TBuild/Libraries** and run make sudo make install -####Qt 5.6.0, slightly patched +####Qt 5.6.2, slightly patched In Terminal go to **/home/user/TBuild/Libraries** and run - git clone git://code.qt.io/qt/qt5.git qt5_6_0 - cd qt5_6_0 + git clone git://code.qt.io/qt/qt5.git qt5_6_2 + cd qt5_6_2 git checkout 5.6 perl init-repository --module-subset=qtbase,qtimageformats - git checkout v5.6.0 - cd qtimageformats && git checkout v5.6.0 && cd .. - cd qtbase && git checkout v5.6.0 && cd .. + git checkout v5.6.2 + cd qtimageformats && git checkout v5.6.2 && cd .. + cd qtbase && git checkout v5.6.2 && cd .. #####Apply the patch - cd qtbase && git apply ../../../tdesktop/Telegram/Patches/qtbase_5_6_0.diff && cd .. + cd qtbase && git apply ../../../tdesktop/Telegram/Patches/qtbase_5_6_2.diff && cd .. #####Building library -Install some packages for Qt (see **/home/user/TBuild/Libraries/qt5_6_0/qtbase/src/plugins/platforms/xcb/README**) +Install some packages for Qt (see **/home/user/TBuild/Libraries/qt5_6_2/qtbase/src/plugins/platforms/xcb/README**) sudo apt-get install libxcb1-dev libxcb-image0-dev libxcb-keysyms1-dev libxcb-icccm4-dev libxcb-render-util0-dev libxcb-util0-dev libxrender-dev libasound-dev libpulse-dev libxcb-sync0-dev libxcb-xfixes0-dev libxcb-randr0-dev libx11-xcb-dev libffi-dev -In Terminal go to **/home/user/TBuild/Libraries/qt5_6_0** and there run +In Terminal go to **/home/user/TBuild/Libraries/qt5_6_2** and there run - OPENSSL_LIBS='-L/usr/local/ssl/lib -lssl -lcrypto' ./configure -prefix "/usr/local/tdesktop/Qt-5.6.0" -release -force-debug-info -opensource -confirm-license -qt-zlib -qt-libpng -qt-libjpeg -qt-freetype -qt-harfbuzz -qt-pcre -qt-xcb -qt-xkbcommon-x11 -no-opengl -no-gtkstyle -static -openssl-linked -nomake examples -nomake tests + ./configure -prefix "/usr/local/tdesktop/Qt-5.6.2" -release -force-debug-info -opensource -confirm-license -qt-zlib -qt-libpng -qt-libjpeg -qt-freetype -qt-harfbuzz -qt-pcre -qt-xcb -qt-xkbcommon-x11 -no-opengl -no-gtkstyle -static -openssl-linked -nomake examples -nomake tests make -j4 sudo make install @@ -170,18 +170,18 @@ In Terminal go to **/home/user/TBuild/tdesktop** and run mkdir -p Linux/obj/codegen_style/Debug cd Linux/obj/codegen_style/Debug - /usr/local/tdesktop/Qt-5.6.0/bin/qmake CONFIG+=debug ../../../../Telegram/build/qmake/codegen_style/codegen_style.pro + /usr/local/tdesktop/Qt-5.6.2/bin/qmake CONFIG+=debug ../../../../Telegram/build/qmake/codegen_style/codegen_style.pro make mkdir -p ../../codegen_numbers/Debug cd ../../codegen_numbers/Debug - /usr/local/tdesktop/Qt-5.6.0/bin/qmake CONFIG+=debug ../../../../Telegram/build/qmake/codegen_numbers/codegen_numbers.pro + /usr/local/tdesktop/Qt-5.6.2/bin/qmake CONFIG+=debug ../../../../Telegram/build/qmake/codegen_numbers/codegen_numbers.pro make ###Building Telegram Desktop * Launch Qt Creator, all projects will be taken from **/home/user/TBuild/tdesktop/Telegram** -* Tools > Options > Build & Run > Qt Versions tab > Add > File System /usr/local/tdesktop/Qt-5.6.0/bin/qmake > **Qt 5.6.0 (Qt-5.6.0)** > Apply -* Tools > Options > Build & Run > Kits tab > Desktop (default) > change **Qt version** to **Qt 5.6.0 (Qt-5.6.0)** > Apply +* Tools > Options > Build & Run > Qt Versions tab > Add > File System /usr/local/tdesktop/Qt-5.6.2/bin/qmake > **Qt 5.6.2 (Qt-5.6.2)** > Apply +* Tools > Options > Build & Run > Kits tab > Desktop (default) > change **Qt version** to **Qt 5.6.2 (Qt-5.6.2)** > Apply * Open MetaLang.pro, configure project with paths **/home/user/TBuild/tdesktop/Linux/DebugIntermediateLang** and **/home/user/TBuild/tdesktop/Linux/ReleaseIntermediateLang** and build for Debug * Open Telegram.pro, configure project with paths **/home/user/TBuild/tdesktop/Linux/DebugIntermediate** and **/home/user/TBuild/tdesktop/Linux/ReleaseIntermediate** and build for Debug, if GeneratedFiles are not found click **Run qmake** from **Build** menu and try again * Open Updater.pro, configure project with paths **/home/user/TBuild/tdesktop/Linux/DebugIntermediateUpdater** and **/home/user/TBuild/tdesktop/Linux/ReleaseIntermediateUpdater** and build for Debug diff --git a/doc/building-xcode.md b/doc/building-xcode.md index 1820551d50bc0..831d2f65d3c5a 100644 --- a/doc/building-xcode.md +++ b/doc/building-xcode.md @@ -175,30 +175,30 @@ Then in Terminal go to **/Users/user/TBuild/Libraries/ffmpeg** and run: make sudo make install -####Qt 5.6.0, slightly patched +####Qt 5.6.2, slightly patched #####Get the source code In Terminal go to **/Users/user/TBuild/Libraries** and run: - git clone git://code.qt.io/qt/qt5.git qt5_6_0 - cd qt5_6_0 + git clone git://code.qt.io/qt/qt5.git qt5_6_2 + cd qt5_6_2 git checkout 5.6 perl init-repository --module-subset=qtbase,qtimageformats - git checkout v5.6.0 - cd qtimageformats && git checkout v5.6.0 && cd .. - cd qtbase && git checkout v5.6.0 && cd .. + git checkout v5.6.2 + cd qtimageformats && git checkout v5.6.2 && cd .. + cd qtbase && git checkout v5.6.2 && cd .. #####Apply the patch -From **/Users/user/TBuild/Libraries/qt5_6_0/qtbase**, run: +From **/Users/user/TBuild/Libraries/qt5_6_2/qtbase**, run: - git apply ../../../tdesktop/Telegram/Patches/qtbase_5_6_0.diff + git apply ../../../tdesktop/Telegram/Patches/qtbase_5_6_2.diff #####Building library -Go to **/Users/user/TBuild/Libraries/qt5_6_0** and run: +Go to **/Users/user/TBuild/Libraries/qt5_6_2** and run: - ./configure -prefix "/usr/local/tdesktop/Qt-5.6.0" -debug-and-release -force-debug-info -opensource -confirm-license -static -opengl desktop -no-openssl -securetransport -nomake examples -nomake tests -platform macx-clang + ./configure -prefix "/usr/local/tdesktop/Qt-5.6.2" -debug-and-release -force-debug-info -opensource -confirm-license -static -opengl desktop -no-openssl -securetransport -nomake examples -nomake tests -platform macx-clang make -j4 sudo make install