Skip to content

Commit

Permalink
improved build instructions
Browse files Browse the repository at this point in the history
  • Loading branch information
john-preston committed Oct 19, 2015
1 parent 2215167 commit ac970f8
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 17 deletions.
2 changes: 1 addition & 1 deletion MSVC.md
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ There go to Libraries directory

and run

git clone https://code.qt.io/qt/qt5.git QtStatic
git clone git://code.qt.io/qt/qt5.git QtStatic
cd QtStatic
git checkout v5.5.1
perl init-repository --module-subset=qtbase,qtimageformats
Expand Down
30 changes: 16 additions & 14 deletions QTCREATOR.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
##Build instructions for Qt Creator 3.1.2 under Ubuntu 14.04
##Build instructions for Qt Creator 3.5.1 under Ubuntu 12.04

###Prepare

Expand Down Expand Up @@ -87,18 +87,20 @@ In Terminal go to **/home/user/TBuild/Libraries** and run
make
sudo make install

####Qt 5.5.0, slightly patched
####Qt 5.5.1, slightly patched

http://download.qt-project.org/official_releases/qt/5.5/5.5.0/single/qt-everywhere-opensource-src-5.5.0.tar.gz

Extract to **/home/user/TBuild/Libraries**, rename **qt-everywhere-opensource-src-5.5.0** to **QtStatic** to have **/home/user/TBuild/Libraries/QtStatic/qtbase** folder
In Terminal go to **/home/user/TBuild/Libraries** and run

Apply patch:
git clone git://code.qt.io/qt/qt5.git QtStatic
cd QtStatic
git checkout v5.5.1
perl init-repository --module-subset=qtbase,qtimageformats

* OR copy (with overwrite!) everything from **/home/user/TBuild/tdesktop/Telegram/\_qt\_5\_5\_0\_patch/** to **/home/user/TBuild/Libraries/QtStatic/**
* OR copy **/home/user/TBuild/tdesktop/Telegram/\_qt\_5\_5\_0\_patch.diff** to **/home/user/TBuild/Libraries/QtStatic/**, go there in Terminal and run
#####Apply the patch

git apply _qt_5_5_0_patch.diff
cd qtbase
git apply ./../../../tdesktop/Telegram/_qtbase_5_5_1_patch.diff
cd ..

#####Building library

Expand All @@ -108,17 +110,17 @@ Install some packages for Qt (see **/home/user/TBuild/Libraries/QtStatic/qtbase/

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

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

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

###Building Telegram Desktop

* Launch Qt Creator, all projects will be taken from **/home/user/TBuild/tdesktop/Telegram**
* Tools > Options > Build & Run > Qt Versions tab > Add > File System /usr/local/Qt-5.5.0/bin/qmake > **Qt 5.5.0 (Qt-5.5.0)** > Apply
* Tools > Options > Build & Run > Kits tab > Desktop (default) > change **Qt version** to **Qt 5.5.0 (Qt-5.5.0)** > Apply
* Tools > Options > Build & Run > Qt Versions tab > Add > File System /usr/local/Qt-5.5.1/bin/qmake > **Qt 5.5.1 (Qt-5.5.1)** > Apply
* Tools > Options > Build & Run > Kits tab > Desktop (default) > change **Qt version** to **Qt 5.5.1 (Qt-5.5.1)** > Apply
* Open MetaStyle.pro, configure project with paths **/home/user/TBuild/tdesktop/Linux/DebugIntermediateStyle** and **/home/user/TBuild/tdesktop/Linux/ReleaseIntermediateStyle** and build for Debug
* Open 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
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ The source code is published under GPLv3 with OpenSSL exception, the license is
* [Visual Studio 2015][msvc]
* [XCode 7][xcode]
* [XCode 7 for OS X 10.6 and 10.7][xcode_old]
* [Qt Creator 3.2.0 Ubuntu][qtcreator]
* [Qt Creator 3.5.1 Ubuntu][qtcreator]

## Projects in Telegram solution

Expand Down
2 changes: 1 addition & 1 deletion XCODE.md
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ Then in Terminal go to **/Users/user/TBuild/Libraries/ffmpeg-2.6.3** and run

In Terminal go to **/Users/user/TBuild/Libraries** and run

git clone https://code.qt.io/qt/qt5.git QtStatic
git clone git://code.qt.io/qt/qt5.git QtStatic
cd QtStatic
git checkout v5.5.1
perl init-repository --module-subset=qtbase,qtimageformats
Expand Down

0 comments on commit ac970f8

Please sign in to comment.