Commit Graph

39 Commits

Author SHA1 Message Date
John Preston 086f754a96 Changed docs to work with Qt 5.6.2, hopefully fixed travis build. 2016-10-18 00:33:24 +03:00
John Preston 7345408568 Merge branch 'master' into dev 2016-10-18 00:27:16 +03:00
worm202 72b26861a9 Fixed Markdown parsing issues in build documentation for Windows (#2527)
The issue is that Markdown parser doesn't handle code blocks after lists right. Instead of putting code into a block, it is shown as regular unformatted text. To resolve this issue, the empty HTML comments were added between lists and code blocks.

Signed-off-by: Sergey Filatov <raxp.worm202@gmail.com> (github: worm202)
2016-10-17 23:20:30 +03:00
John Preston eb6b2c7d2e Merge branch 'master' into dev
Conflicts:
	Telegram/gyp/qt.gypi
2016-10-17 23:00:34 +03:00
John Preston fd6a312abc SPMediaKeyTap solution for macOS media keys added. 2016-10-17 17:57:14 +03:00
John Preston 9950629e4e Removed some download-in-ZIP from build docs. 2016-10-11 12:56:51 +03:00
John Preston 1a67b31ee9 Travis build fixed.
Caching libxkbcommon, Qt, breakpad, GYP, libva, ffmpeg, openal-soft.
2016-10-09 10:43:56 +03:00
John Preston cb798ab3c5 Merge pull request #2326 from IMAN4K/patch-1
Update building-msvc.md
2016-09-14 18:36:20 +03:00
John Preston a62a47098e Version 0.10.5: new settings. First stable version on GYP. 2016-09-12 15:02:52 +03:00
John Preston a41912cdf3 Moved all builds to GYP. 2016-09-12 14:45:41 +03:00
John Preston 994576375e Merge branch 'gyp' into dev 2016-08-14 21:42:52 +03:00
John Preston 4def7f2a18 Build docs updated, .sln files added to .gitignore. 2016-08-14 21:41:31 +03:00
Tine Mezgec b6d054bb1c Fixed FFmpeg version in Xcode build instructions
Signed-off-by: Tine Mezgec <tine.mezgec@gmail.com> (github: mezga0153)
2016-08-09 19:09:09 +02:00
Iman 71cfc83c1d Update building-msvc.md 2016-08-07 13:39:27 +04:30
Iman 10f3d2049a Update building-msvc.md
Signed-off-by: Iman <iman72411@yahoo.com> (github: IMAN4K)
2016-08-07 13:06:14 +04:30
John Preston 27cf45e1a9 Moved to ffmpeg 3.1 release code. 2016-07-22 18:01:24 +03:00
Victor Gaydov 12f604623e Replace hard-coded paths with pkg-config
Signed-off-by: Victor Gaydov <victor@enise.org> (github: gavv)
2016-07-11 03:32:13 +03:00
John Preston a20dd065fb Building Qt with -no-gtkstyle and disable forcing "-style=0" in main.cpp
We can't use Qt gtk style, because it loads gtk-2 and we are possibly
loading and using gtk-3 for libappindicator3 and it crashes :(
2016-07-07 19:12:52 +03:00
Christoph 16ab51ae87 Improve build instructions for MSVC 2015 [ci skip]
Add TOC
Fix breakpad install

Fix #2211

Signed-off-by: Christoph <auer.chrisi@gmx.net>
2016-07-03 15:21:17 +02:00
Paul f6e3687e9c Updates/fixes for Windows build instructions
* Use depot_tools to prepare breakpad instead of invoking gyp
* directly--fixes missing directory error
* Formatting consistency
* Help for common errors
* Use `/Zi` instead of `/ZI` for building openal-soft--fixes flag conflict
* for Debug configuration

Signed-off-by: Paul Buonopane <paul+git@earth2me.com> (github: Zenexer)
2016-05-19 07:29:06 -04:00
John Preston fd7f618fd2 Merge branch 'dev' 2016-05-10 11:58:21 +03:00
Zhang Sen 55619e4eb5 Fixed doc building-msvc.md
just a small fix, added cd into the directory

Signed-off-by: Senorsen <senorsen.zhang@gmail.com> (github: Senorsen)
2016-04-27 00:12:15 +08:00
John Preston 0130d0cd63 Moved patches to Telegram/Patches, travis builds debug version. 2016-04-23 14:50:28 +03:00
John Preston 2834ce0344 Moving to Qt 5.6.0, instructions can be broken. 2016-04-23 14:40:42 +03:00
John Preston d20c370ccc MetaStyle project removed, added -static-libstdc++ for linux build. 2016-04-22 10:25:14 +03:00
John Preston 7edb835efc Removed openssl patch. Xcode warning fixed. 2016-04-19 11:57:55 +03:00
John Preston 4e0a1fad82 Merge branch 'dev' of https://bitbucket.org/johnprestonmail/telegram-desktop into dev 2016-04-14 15:02:57 +03:00
John Preston 48ffebe266 Langs updated for 9040123 closed beta. 2016-04-09 15:18:43 +04:00
John Preston c7673096c9 deployment targets set to 10.8, QtCreator build instructions fixed openssl libraries 2016-03-31 12:18:44 +04:00
John Preston 9378c05ef1 Merge branch 'dev' 2016-03-26 11:52:14 +03:00
John Preston 1919501d1e Qt compiled with force-debug-info, some langs improved, some override specifiers added 2016-03-21 21:41:39 +03:00
Christoph Auer 6e441312cb Remove duplicated information
Signed-off-by: Christoph Auer <auer.chrisi@gmx.net>
2016-03-17 22:21:46 +01:00
Christoph Auer 580306d090 Fix path in doc/building-xcode.md
Closes #1794

Signed-off-by: Christoph Auer <auer.chrisi@gmx.net>
2016-03-17 20:46:09 +01:00
John Preston ebe6db3c48 crash fixed in migrated message highlight, xcode version fixed in docs 2016-03-14 18:28:39 +03:00
John Preston 877ff6fc49 fixed os x shortcuts by Qt patch 2016-03-03 16:05:18 +02:00
Christoph Auer aebe15acda Fix last commit (Update qmake for v0.9.26)
Signed-off-by: Christoph Auer <auer.chrisi@gmx.net>
2016-02-22 17:02:57 +01:00
auchri 46e562c86e Update qmake for v0.9.26 2016-02-22 16:55:35 +01:00
Hugo Osvaldo Barrera 3546fe421c Move all build documentation into /doc
Signed-off-by: Hugo Osvaldo Barrera <hugo@barrera.io> (github: hobarrera)
2016-02-21 21:43:05 -03:00
Hugo Osvaldo Barrera 6405876656 Document how to build via qmake
Signed-off-by: Hugo Osvaldo Barrera <hugo@barrera.io> (github: hobarrera)
2016-02-21 21:43:05 -03:00