RepoMirrors
/
tdesktop
mirror of https://github.com/telegramdesktop/tdesktop
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
2,237 Commits 9 Branches 751 Tags 330 MiB
Commit Graph

30 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
John Preston e536d5ad59 Linux build with Qt 5.6.2 done. 2016-10-17 23:55:31 +03:00
John Preston 8d13014613 Travis other jobs fixed. 2016-10-09 11:30:56 +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
Christoph 5132335500 Fix syntax error 
How did this even build?

Errors introduced by e320be9626

Signed-off-by: Christoph <auer.chrisi@gmx.net>
 2016-08-04 20:39:26 +02:00
John Preston e320be9626 Fixed build for QtCreator and Ubuntu. 2016-07-19 21:09:34 +03:00
Christoph b669bc2b9c Improve travis build process 
Signed-off-by: Christoph <auer.chrisi@gmx.net>
 2016-07-14 21:41:50 +02: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 78d42476eb Automatic comment on missing sig. 
Add a comment to a PR if a commit message is missing the signature.

Signed-off-by: Christoph <auer.chrisi@gmx.net>
 2016-07-04 21:32:29 +02:00
eegorov bd8bb426be New define: TDESKTOP_DISABLE_UNITY_INTEGRATION 
Signed-off-by: Egor Y. Egorov <egor.y.egorov@gmail.com> (github: eegorov)
 2016-06-29 08:38:42 +06:00
Andy Kluger 331c13ed78 Add TDESKTOP_DISABLE_DESKTOP_FILE_GENERATION 
Signed-off-by: Andy Kluger <andykluger@gmail.com> (github: andydecleyre)
 2016-06-22 17:42:46 -04:00
John Preston 520260f207 Merge branch 'profile' into drafts 
Conflicts:
	Telegram/SourceFiles/app.cpp
	Telegram/SourceFiles/codegen/style/processor.cpp
	Telegram/SourceFiles/history.cpp
	Telegram/SourceFiles/historywidget.cpp
	Telegram/SourceFiles/mainwidget.cpp
	Telegram/SourceFiles/mainwidget.h
	Telegram/SourceFiles/profilewidget.cpp
	Telegram/SourceFiles/profilewidget.h
	Telegram/Telegram.vcxproj
	Telegram/Telegram.vcxproj.filters
 2016-06-06 18:16:52 +03:00
Christoph 316c30d375 Update arch.sh to latest version from upstream 
Signed-off-by: Christoph <auer.chrisi@gmx.net>
 2016-05-08 17:55:01 +02:00
eegorov fe52b6075d Fix travis-scripts to support prev commit 
Signed-off-by: Egor Y. Egorov <egor.y.egorov@gmail.com> (github:
eegorov)
 2016-05-08 14:17:28 +06:00
John Preston fe6e3c5252 Build scripts improved, QtCreator build fixed. 
qmake and travis builds use -j4 for make.
 2016-04-27 16:59:08 +03:00
John Preston 745f89dbb9 Moving build / lang scripts from Telegram to subfolders. 
Travis build tested with -j param.
Xcode / QtCreator / qmake builds could be broken.
 2016-04-27 15:02:17 +03:00
John Preston 1e64a56986 Fixed travis build output file check. 2016-04-25 11:55:15 +03:00
John Preston d5ed93edd5 Merge branch 'dev' of https://github.com/telegramdesktop/tdesktop into dev 2016-04-25 11:06:50 +03:00
John Preston d2922a4173 Fix travis build. Xcode project path fix. 2016-04-25 11:06:13 +03:00
Christoph bd41ce024a Fix path to qt patch 
Signed-off-by: Christoph <auer.chrisi@gmx.net>
 2016-04-23 20:02:17 +02:00
John Preston 53a56bbc2a Telegram.pro using final Qt install path. 2016-04-23 14:53:48 +03: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
Christoph 6bac9029fa Fix travis build 
Signed-off-by: Christoph <auer.chrisi@gmx.net>
 2016-04-01 20:31:09 +02:00
Christoph 88282d8364 Check commit message 
Signed-off-by: Christoph <auer.chrisi@gmx.net>
 2016-03-30 23:47:25 +02:00
Christoph Auer f227740e93 Add new macros to travis 
Signed-off-by: Christoph Auer <auer.chrisi@gmx.net>
 2016-03-24 23:56:21 +01:00
Christoph Auer 729a024ddf Add Travis CI files 
Signed-off-by: Christoph Auer <auer.chrisi@gmx.net>
 2016-03-17 20:49:48 +01:00