Compare commits
909 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
3013301a91 | ||
|
|
96acecc35b | ||
|
|
f8d900d7fb | ||
|
|
ce760f0534 | ||
|
|
1225c9194a | ||
|
|
abfe685697 | ||
|
|
37ff1bde31 | ||
|
|
b674003868 | ||
|
|
0868a9f7b9 | ||
|
|
1e861f79f0 | ||
|
|
ae3fae44b2 | ||
|
|
dd68c7e90d | ||
|
|
a547f80ae9 | ||
|
|
263bbf1788 | ||
|
|
94c4ea6174 | ||
|
|
bd2e1ceb02 | ||
|
|
8c67a4b991 | ||
|
|
126ffc8769 | ||
|
|
4379fa2297 | ||
|
|
b9bd937aaa | ||
|
|
351ba3a912 | ||
|
|
c2b2236e64 | ||
|
|
6f4e31c9c3 | ||
|
|
1290cda830 | ||
|
|
a27a80351a | ||
|
|
e53f4a5450 | ||
|
|
65b949d36b | ||
|
|
a8d3951116 | ||
|
|
f91e11efc9 | ||
|
|
ed7a88ca17 | ||
|
|
dcdaee3db2 | ||
|
|
c7b1683f6e | ||
|
|
961fd1dbab | ||
|
|
2f963d7f12 | ||
|
|
5be9ce0cf0 | ||
|
|
04e3b250e7 | ||
|
|
2255eb2c68 | ||
|
|
0ce5405eef | ||
|
|
46d8d9f97a | ||
|
|
274fed3cb0 | ||
|
|
021ada5e9e | ||
|
|
6f2a04e5ae | ||
|
|
eb438e35ee | ||
|
|
b2895a39ed | ||
|
|
cca906d383 | ||
|
|
8704f6efd0 | ||
|
|
e1114530ab | ||
|
|
27018d94ee | ||
|
|
1ee4dac4f3 | ||
|
|
fe15ee742d | ||
|
|
ebf2a678b1 | ||
|
|
8c0cd9b9e9 | ||
|
|
8e15e71fd5 | ||
|
|
1fb529803e | ||
|
|
3355e6da0c | ||
|
|
1331e7089e | ||
|
|
9c613fe2f7 | ||
|
|
0467401635 | ||
|
|
4fd6a85861 | ||
|
|
3d38abce97 | ||
|
|
271d929ad6 | ||
|
|
ef364e998f | ||
|
|
53ba300d7e | ||
|
|
caf1af8963 | ||
|
|
9fce11b672 | ||
|
|
f7cb38c36a | ||
|
|
d7ab7aed62 | ||
|
|
ea61211a61 | ||
|
|
c560f327cd | ||
|
|
030b298a7d | ||
|
|
b45705f39d | ||
|
|
9871184953 | ||
|
|
7f74084237 | ||
|
|
0fc1a40b42 | ||
|
|
45a6985df5 | ||
|
|
619aca04f9 | ||
|
|
a968e112e8 | ||
|
|
325323e0b3 | ||
|
|
b012847017 | ||
|
|
56d3e69399 | ||
|
|
f1c7409980 | ||
|
|
33ea5ad297 | ||
|
|
a5ea13f248 | ||
|
|
8796572704 | ||
|
|
8829b742fd | ||
|
|
a2b0631932 | ||
|
|
8b804d1995 | ||
|
|
af85aec33b | ||
|
|
e0d4884351 | ||
|
|
b3f5973329 | ||
|
|
f0ed5640db | ||
|
|
39a80e9de7 | ||
|
|
ff0ff1d99c | ||
|
|
ab16c88473 | ||
|
|
26ec440a13 | ||
|
|
fa245099b6 | ||
|
|
ea644a3f81 | ||
|
|
9b6d41a0aa | ||
|
|
7798f88c6f | ||
|
|
2c1e3cd094 | ||
|
|
f1e3d2f513 | ||
|
|
0f08342533 | ||
|
|
2a96f358f6 | ||
|
|
bafa838afc | ||
|
|
de3cc76468 | ||
|
|
b4df7b4efd | ||
|
|
26be382b02 | ||
|
|
7dff10f6fd | ||
|
|
71f6dd85c2 | ||
|
|
abd55679af | ||
|
|
c90e803f1b | ||
|
|
c89a21ef5e | ||
|
|
04843ebdd8 | ||
|
|
60cf1b6490 | ||
|
|
a80f7c53ea | ||
|
|
757e0e6335 | ||
|
|
09b5055fac | ||
|
|
ba1691bf7e | ||
|
|
9873e6d75c | ||
|
|
62a6812259 | ||
|
|
c424607603 | ||
|
|
92ff237c2d | ||
|
|
9059b2e617 | ||
|
|
2b8e76a060 | ||
|
|
9c60d2be80 | ||
|
|
3b7123d159 | ||
|
|
2f2847bfdf | ||
|
|
8099305c53 | ||
|
|
3eadc62cd5 | ||
|
|
c9f56abce5 | ||
|
|
58604406f8 | ||
|
|
a49806bf79 | ||
|
|
65a36e49bd | ||
|
|
db66e93258 | ||
|
|
2f1b029ec9 | ||
|
|
0eb975e679 | ||
|
|
a49a96ba33 | ||
|
|
d2d51cc883 | ||
|
|
e8a99a854d | ||
|
|
a64c8c52b4 | ||
|
|
01054858a4 | ||
|
|
87caa58456 | ||
|
|
6b9675a5b1 | ||
|
|
371f1a51c3 | ||
|
|
8aaaef3ff4 | ||
|
|
7fbec0dbca | ||
|
|
0a86e732cd | ||
|
|
4e10552c12 | ||
|
|
0eae8fe6a0 | ||
|
|
ee2c7fad78 | ||
|
|
b9d89cb4a0 | ||
|
|
f0eba3e283 | ||
|
|
801b500aa6 | ||
|
|
9c1ce702bb | ||
|
|
50778790fe | ||
|
|
b05bf049bc | ||
|
|
b9c24a1fe8 | ||
|
|
c92a798e1b | ||
|
|
8660f976a9 | ||
|
|
f5c79cb1b6 | ||
|
|
6b80ff4bcc | ||
|
|
3556fbf702 | ||
|
|
3577e71782 | ||
|
|
c4aac5fa0e | ||
|
|
68fb9b8b67 | ||
|
|
630c07391c | ||
|
|
4ab3c2dfcb | ||
|
|
973c3f8838 | ||
|
|
a03d42daa8 | ||
|
|
0c84fc1271 | ||
|
|
0f25638545 | ||
|
|
f58efd7ee3 | ||
|
|
26c29f6af7 | ||
|
|
ab82ff0fb7 | ||
|
|
12a4a849ca | ||
|
|
38e2837cb6 | ||
|
|
0e7cefb69c | ||
|
|
21eaa35d8c | ||
|
|
c1ae825d98 | ||
|
|
fbc206ebee | ||
|
|
67739ae3fd | ||
|
|
7ee16ba45c | ||
|
|
236513943c | ||
|
|
cfff744cb1 | ||
|
|
61b6effccc | ||
|
|
642deecbbb | ||
|
|
707aa88974 | ||
|
|
5b04698f5f | ||
|
|
246e4e45bd | ||
|
|
f2ef2fab4f | ||
|
|
1a2755f126 | ||
|
|
801580c46f | ||
|
|
3f1ec52e6c | ||
|
|
2c422dcd73 | ||
|
|
6abf74530d | ||
|
|
08ad74da8f | ||
|
|
38427aa52a | ||
|
|
68eb48be8d | ||
|
|
5e5b4197e9 | ||
|
|
48eb5dd112 | ||
|
|
9b7e3dc3ec | ||
|
|
d1518da1ad | ||
|
|
2f02198ac7 | ||
|
|
da845a089e | ||
|
|
2caa3e3def | ||
|
|
f9a32dc70f | ||
|
|
8dc7f8b8a1 | ||
|
|
78d3bdfe3a | ||
|
|
fbfd3ddd68 | ||
|
|
33b3fa68f0 | ||
|
|
2fae2278f7 | ||
|
|
f073963582 | ||
|
|
22c2054dcf | ||
|
|
b2e5ab36d4 | ||
|
|
159f90a42c | ||
|
|
08a3a5747a | ||
|
|
47910b2ae1 | ||
|
|
5f97b3bc22 | ||
|
|
cf45b0d317 | ||
|
|
1dd461b24a | ||
|
|
626e7c1f76 | ||
|
|
288b7ba100 | ||
|
|
2b8951b2ac | ||
|
|
48cee21b9f | ||
|
|
b2f821d3de | ||
|
|
911f138bf8 | ||
|
|
bb528eaa9c | ||
|
|
3d3d024878 | ||
|
|
9a4fdb1530 | ||
|
|
63a6893fda | ||
|
|
dcd5aa83da | ||
|
|
5901b42a83 | ||
|
|
5d321f7c59 | ||
|
|
996bd942eb | ||
|
|
dc27bfff2d | ||
|
|
63fc552636 | ||
|
|
0659822ac9 | ||
|
|
f9f1826f34 | ||
|
|
ddb9c84a1d | ||
|
|
69960a47da | ||
|
|
f8740c5894 | ||
|
|
58aaed4c0f | ||
|
|
8af684f7f7 | ||
|
|
0fe0311b45 | ||
|
|
89a0cd3e81 | ||
|
|
6de30b1137 | ||
|
|
d26924dd6b | ||
|
|
4293a4857f | ||
|
|
aec6e17b5d | ||
|
|
64dd5139da | ||
|
|
e55e46a0f0 | ||
|
|
4f65d0469c | ||
|
|
a0e2a925ee | ||
|
|
8bfef7d873 | ||
|
|
2d4a743231 | ||
|
|
0247e876df | ||
|
|
39b7f307a4 | ||
|
|
4356b1c193 | ||
|
|
6f885fb6cc | ||
|
|
5f1cb9d31c | ||
|
|
9b430147c0 | ||
|
|
4e8c57a861 | ||
|
|
d9ad3a4bbe | ||
|
|
4ad8c4877c | ||
|
|
edf4180d11 | ||
|
|
d48cafe1a3 | ||
|
|
aede79640d | ||
|
|
4dae89310d | ||
|
|
6102795856 | ||
|
|
7669b8e12b | ||
|
|
5c9a907c88 | ||
|
|
116b5d006a | ||
|
|
db35c3de3b | ||
|
|
be64f18e96 | ||
|
|
39008bf6fe | ||
|
|
c9552390e7 | ||
|
|
5c3f93eee1 | ||
|
|
cf0d4a0559 | ||
|
|
ee5c819cef | ||
|
|
ca548a11d7 | ||
|
|
0b26475300 | ||
|
|
d74992b85b | ||
|
|
08bddc5579 | ||
|
|
cb3e649e61 | ||
|
|
accb20a571 | ||
|
|
08101ba666 | ||
|
|
430a3c2cec | ||
|
|
48ad171a29 | ||
|
|
5f62c2100c | ||
|
|
4c571f5bff | ||
|
|
52b9212625 | ||
|
|
f56df0e1d9 | ||
|
|
6dd8f32f66 | ||
|
|
5ab1cd405a | ||
|
|
3dd2a6bb5b | ||
|
|
9ff02707bf | ||
|
|
2d1dcb36cb | ||
|
|
01d5589594 | ||
|
|
40532e32ab | ||
|
|
ceec71d3e6 | ||
|
|
8fd811517b | ||
|
|
58519300ea | ||
|
|
607655941d | ||
|
|
9acdc4eac1 | ||
|
|
518ff146b2 | ||
|
|
74c65f30f7 | ||
|
|
83306bb01f | ||
|
|
f3ed7a674a | ||
|
|
854870683b | ||
|
|
c58f097535 | ||
|
|
0367319934 | ||
|
|
be0cf8d379 | ||
|
|
305a611211 | ||
|
|
927735dff2 | ||
|
|
0c0d6bc411 | ||
|
|
2862070348 | ||
|
|
58d86af399 | ||
|
|
76c3e9a529 | ||
|
|
9bf8a8108d | ||
|
|
905a024aed | ||
|
|
e1000b79a3 | ||
|
|
c2a10f9c56 | ||
|
|
4d42e7e5b9 | ||
|
|
e200a7d502 | ||
|
|
55a6e70f74 | ||
|
|
6f242f284f | ||
|
|
25471f3952 | ||
|
|
72690ee106 | ||
|
|
edc8c23772 | ||
|
|
0023fdc707 | ||
|
|
2518250ae0 | ||
|
|
08cd46cd4c | ||
|
|
12614ab68c | ||
|
|
7cfb122dea | ||
|
|
cc8f4aa24f | ||
|
|
60e36b1411 | ||
|
|
8aa0b31c1a | ||
|
|
56b6673e17 | ||
|
|
c310cdbb8c | ||
|
|
71f340d9b5 | ||
|
|
5187e6dc58 | ||
|
|
c21f5712f8 | ||
|
|
c6eccc655f | ||
|
|
3767483977 | ||
|
|
14ad7a2479 | ||
|
|
ba8257ce64 | ||
|
|
9bfa6d7cf4 | ||
|
|
826d6011a1 | ||
|
|
fb847135b5 | ||
|
|
49681525ed | ||
|
|
839feed329 | ||
|
|
392d90dc1d | ||
|
|
7808620764 | ||
|
|
fe3181649b | ||
|
|
b5be6df5e2 | ||
|
|
0f0c3b7461 | ||
|
|
ff51423125 | ||
|
|
cc2fd51097 | ||
|
|
321e4ffe9c | ||
|
|
fb244c00b9 | ||
|
|
f980023f49 | ||
|
|
6c17ed2242 | ||
|
|
a0926f2d70 | ||
|
|
d9a14e1227 | ||
|
|
1ab4dbe466 | ||
|
|
37af963717 | ||
|
|
3744bdcbe7 | ||
|
|
4ad293e2ae | ||
|
|
be89a0bf7e | ||
|
|
14de1fe485 | ||
|
|
bec39d89e1 | ||
|
|
467f1449ab | ||
|
|
53c659cbda | ||
|
|
5deee18247 | ||
|
|
60a991bcb0 | ||
|
|
d3c5ed08ab | ||
|
|
2bdce7dce6 | ||
|
|
41b2e7c9c7 | ||
|
|
6021923bf1 | ||
|
|
839cedde65 | ||
|
|
92d10fd34c | ||
|
|
25e0e4b5d3 | ||
|
|
43cc2145a8 | ||
|
|
c3c46f8e29 | ||
|
|
0744f43a0e | ||
|
|
73470c3a95 | ||
|
|
a6d0fa433e | ||
|
|
a9fa49e372 | ||
|
|
2cb69f0c2b | ||
|
|
1da9bfc643 | ||
|
|
78227cd947 | ||
|
|
456a949d01 | ||
|
|
7f598e358a | ||
|
|
a058e75a6d | ||
|
|
48362cd4bc | ||
|
|
bd653dfdff | ||
|
|
bc03c80d8d | ||
|
|
2dcbe15f8b | ||
|
|
b364cbbd69 | ||
|
|
3e374eda51 | ||
|
|
0ae63b072c | ||
|
|
f718410df3 | ||
|
|
74e120bc7b | ||
|
|
5f8ede194b | ||
|
|
4d321b1cf0 | ||
|
|
84858b8940 | ||
|
|
92f95fa9eb | ||
|
|
5d8888bb8b | ||
|
|
4988d21819 | ||
|
|
94964c35ce | ||
|
|
d605b18ec0 | ||
|
|
590e6c8e9d | ||
|
|
67572b0d9a | ||
|
|
5554867553 | ||
|
|
f3102573ea | ||
|
|
0e7ce97da7 | ||
|
|
9d789c2657 | ||
|
|
468975e9f3 | ||
|
|
145dda843e | ||
|
|
6e69069ba2 | ||
|
|
be2b2cbf7e | ||
|
|
0e4d85a5e5 | ||
|
|
653fd1bb63 | ||
|
|
741501d1d9 | ||
|
|
89e1291d86 | ||
|
|
25e3674819 | ||
|
|
c84f99cf3a | ||
|
|
820c7ba84e | ||
|
|
6735605f21 | ||
|
|
d5a2daa8c9 | ||
|
|
25177d9022 | ||
|
|
f24ce584db | ||
|
|
1ed83cf193 | ||
|
|
aaf61dfbad | ||
|
|
be58e23775 | ||
|
|
db631acf80 | ||
|
|
74dc4e0c62 | ||
|
|
99bb09374d | ||
|
|
a6e96f9a28 | ||
|
|
cd3c1c6dc0 | ||
|
|
3971f27c66 | ||
|
|
c4357c7ad3 | ||
|
|
1da9385fe2 | ||
|
|
9ba65e9ca0 | ||
|
|
a12bc60ef5 | ||
|
|
f76dc74040 | ||
|
|
932ed20c4b | ||
|
|
b353af00c9 | ||
|
|
ce2204e120 | ||
|
|
4b3a9fac67 | ||
|
|
54ca5772f8 | ||
|
|
2dacf1b2ef | ||
|
|
817e9aa43d | ||
|
|
dba677dcc7 | ||
|
|
24dcde2f87 | ||
|
|
77fbf19a72 | ||
|
|
3cd9d4b5ec | ||
|
|
d3bf489bea | ||
|
|
efb2972d28 | ||
|
|
3fa3428b4b | ||
|
|
84e9e37353 | ||
|
|
5c0f278775 | ||
|
|
8759d637ff | ||
|
|
95023ca770 | ||
|
|
3f49796c43 | ||
|
|
aa8f62da9d | ||
|
|
eba2a98703 | ||
|
|
d36f6a0322 | ||
|
|
9ec3d24fec | ||
|
|
bf182697b9 | ||
|
|
e87084715d | ||
|
|
3bd1bbc77a | ||
|
|
8aaa70a05a | ||
|
|
9b247ce5ed | ||
|
|
09ff556aa6 | ||
|
|
a26d82eec6 | ||
|
|
bb2e683dea | ||
|
|
d7a67a6a1c | ||
|
|
8c6e72b21a | ||
|
|
0b5500fe75 | ||
|
|
2845f48430 | ||
|
|
4ba959e6e1 | ||
|
|
72d9ac508a | ||
|
|
386600baf9 | ||
|
|
eb1825defd | ||
|
|
33069739ee | ||
|
|
dd8c526fb7 | ||
|
|
2701e63406 | ||
|
|
b972da059a | ||
|
|
81862215b4 | ||
|
|
a34e998c42 | ||
|
|
6d1193a751 | ||
|
|
0cd7399dc9 | ||
|
|
f1b0b60340 | ||
|
|
d1cf43f9a4 | ||
|
|
a0b3b1affd | ||
|
|
2a7fdfc832 | ||
|
|
672070e618 | ||
|
|
6a2b1bb48d | ||
|
|
db121c0839 | ||
|
|
ca9db9fd3f | ||
|
|
ecccf673a9 | ||
|
|
e0d7cae3fe | ||
|
|
241526f127 | ||
|
|
4148099115 | ||
|
|
5edf200157 | ||
|
|
bd7ba3acb1 | ||
|
|
e024d9bbb0 | ||
|
|
3d7b8b3162 | ||
|
|
8887272577 | ||
|
|
c86257568f | ||
|
|
ae25538706 | ||
|
|
21e417433b | ||
|
|
cb272be805 | ||
|
|
b79d8d6c82 | ||
|
|
be8aed6a95 | ||
|
|
d06337dddc | ||
|
|
0f3ec47074 | ||
|
|
3a5bad4b7a | ||
|
|
2aecd1035e | ||
|
|
5d04842a80 | ||
|
|
59c73a4814 | ||
|
|
25affe5484 | ||
|
|
399aed4087 | ||
|
|
31dbe2278e | ||
|
|
9ed064b7fc | ||
|
|
a59353df9f | ||
|
|
8acd47bf2f | ||
|
|
be53cb027c | ||
|
|
6ff8c1de05 | ||
|
|
2ebbf062d0 | ||
|
|
fd538bc6c8 | ||
|
|
c0959ceaeb | ||
|
|
6c382c647c | ||
|
|
8f9bed0443 | ||
|
|
dc3996c077 | ||
|
|
5bfd5e4495 | ||
|
|
d646de7184 | ||
|
|
bc2b0f8392 | ||
|
|
f2a7cf5c64 | ||
|
|
0df628dc7a | ||
|
|
a5d1fbff98 | ||
|
|
5cae57601a | ||
|
|
2b7fb7a9a6 | ||
|
|
feb238c5d9 | ||
|
|
0d888eea85 | ||
|
|
bfb6ecbac7 | ||
|
|
2152fe6a79 | ||
|
|
b113696fe6 | ||
|
|
b65a24df96 | ||
|
|
c655bf852f | ||
|
|
be495c17bc | ||
|
|
9785ff4be6 | ||
|
|
5ec37e9112 | ||
|
|
f9f84fd407 | ||
|
|
ed93669693 | ||
|
|
e79ddf2459 | ||
|
|
5efe47cfb6 | ||
|
|
b8045cbcc7 | ||
|
|
aa1090a585 | ||
|
|
0a5589f869 | ||
|
|
383b29dbd8 | ||
|
|
13a9b967e9 | ||
|
|
b798654ca7 | ||
|
|
a5e6890b77 | ||
|
|
2a3a38531b | ||
|
|
4ebf6ebb6f | ||
|
|
6fe736c9fc | ||
|
|
ef682e7023 | ||
|
|
5c3f667fc3 | ||
|
|
a95a055acd | ||
|
|
846499a4fb | ||
|
|
6afb3f70bb | ||
|
|
c063d94aa5 | ||
|
|
261720c941 | ||
|
|
7b3c452316 | ||
|
|
aa00f9bd34 | ||
|
|
b0ff443eac | ||
|
|
a886c598c1 | ||
|
|
2ce4abfdfe | ||
|
|
18c42954ae | ||
|
|
b57b4fa0f8 | ||
|
|
e66cde398a | ||
|
|
3706be77ea | ||
|
|
f481f1e142 | ||
|
|
84b09795f3 | ||
|
|
95954c4b1f | ||
|
|
a56a12a1ef | ||
|
|
5c4b459f57 | ||
|
|
9a616edf2a | ||
|
|
92332b45ea | ||
|
|
5a7fcc3a22 | ||
|
|
6c441353c4 | ||
|
|
b742c95516 | ||
|
|
a59c3da3d0 | ||
|
|
8399f4189f | ||
|
|
67b9fe846b | ||
|
|
0f4ccce0e1 | ||
|
|
01d763eed1 | ||
|
|
41c60419f1 | ||
|
|
195164d9d4 | ||
|
|
518d1da736 | ||
|
|
aade3d4f27 | ||
|
|
22356eb01c | ||
|
|
b5eb88a32f | ||
|
|
6887993f92 | ||
|
|
71b733a018 | ||
|
|
e2eb9cea00 | ||
|
|
99e96a5b13 | ||
|
|
7093254b66 | ||
|
|
f4544b0964 | ||
|
|
c27456277e | ||
|
|
2e824ace00 | ||
|
|
dafa286b18 | ||
|
|
003d01206f | ||
|
|
f0963a332a | ||
|
|
91bdb66f0d | ||
|
|
ffb48c42b0 | ||
|
|
8171828c2a | ||
|
|
a8aa66d191 | ||
|
|
e631d98230 | ||
|
|
1940c67a09 | ||
|
|
c574119718 | ||
|
|
648cd44ddd | ||
|
|
fde8dd9607 | ||
|
|
f1e0cd6c1d | ||
|
|
44df10d6cb | ||
|
|
b6a757842a | ||
|
|
4636c74586 | ||
|
|
2208621050 | ||
|
|
f133dd396c | ||
|
|
ccd04b98b9 | ||
|
|
d37b65e624 | ||
|
|
3e9b811875 | ||
|
|
44c562d8ba | ||
|
|
93c548c013 | ||
|
|
a7d9281768 | ||
|
|
3b369fc98e | ||
|
|
e5cd7e6d40 | ||
|
|
99d05ba967 | ||
|
|
ec9512899e | ||
|
|
26ea6c4e63 | ||
|
|
8e44a7f5c4 | ||
|
|
a093cb6274 | ||
|
|
64f2f330f6 | ||
|
|
473e30e594 | ||
|
|
dc95756ec9 | ||
|
|
2a935868a8 | ||
|
|
f48d8538c0 | ||
|
|
3372dfcd3e | ||
|
|
78d00bcf22 | ||
|
|
9dc9e019f6 | ||
|
|
178c0078c1 | ||
|
|
8478abe378 | ||
|
|
bfc9e43eb4 | ||
|
|
e174025a92 | ||
|
|
89f4408029 | ||
|
|
d7dc277003 | ||
|
|
32bc723745 | ||
|
|
c2ad765424 | ||
|
|
9799afa064 | ||
|
|
e880c14d61 | ||
|
|
e70465c633 | ||
|
|
4ed1835d32 | ||
|
|
19bbccd1a7 | ||
|
|
9d8b80cbce | ||
|
|
dec8264625 | ||
|
|
fe618bd652 | ||
|
|
d208236994 | ||
|
|
4d987f7278 | ||
|
|
193e454fd4 | ||
|
|
bdfb9b4143 | ||
|
|
c9716f3c72 | ||
|
|
7c1704e68b | ||
|
|
771a51224e | ||
|
|
cf275b152a | ||
|
|
98cb85df66 | ||
|
|
032694ad9e | ||
|
|
5437215677 | ||
|
|
5ec80238a0 | ||
|
|
ae6c152988 | ||
|
|
7d15cca1ee | ||
|
|
83c5a67af5 | ||
|
|
c9ad2cd1aa | ||
|
|
fe1f198d99 | ||
|
|
818662c2e6 | ||
|
|
05d0d2a6d6 | ||
|
|
c1a0dad2b7 | ||
|
|
4caf26d069 | ||
|
|
83bc6fb39c | ||
|
|
dbb7568b92 | ||
|
|
45fda44924 | ||
|
|
26f1ade5ba | ||
|
|
9dd93a77a0 | ||
|
|
331d1baad6 | ||
|
|
d3159d86da | ||
|
|
f9e1513491 | ||
|
|
b6e37b7730 | ||
|
|
f9d56eb4c1 | ||
|
|
95565c39ed | ||
|
|
890aacaeee | ||
|
|
e2f0886950 | ||
|
|
fe21b5a502 | ||
|
|
e7043c4d63 | ||
|
|
aae2101131 | ||
|
|
64afed0fb2 | ||
|
|
4d9464ed87 | ||
|
|
b43191506a | ||
|
|
c47781c25a | ||
|
|
f0c4868b3e | ||
|
|
35e5c2329b | ||
|
|
74fc5524ab | ||
|
|
2d4c99a6f7 | ||
|
|
69c73d0a2c | ||
|
|
58510e0208 | ||
|
|
0681d10c51 | ||
|
|
add2356c8a | ||
|
|
c66b2b2291 | ||
|
|
769923c6cc | ||
|
|
27528d084f | ||
|
|
299aa69058 | ||
|
|
d1cc09f40e | ||
|
|
a133b43eed | ||
|
|
9b57725b8c | ||
|
|
34b0f6f014 | ||
|
|
f5cc93ec64 | ||
|
|
4f3263d979 | ||
|
|
b28e374e06 | ||
|
|
918d58ef0a | ||
|
|
5a388d9dde | ||
|
|
0f4909621b | ||
|
|
55d3d8adc3 | ||
|
|
d2d6a6daa4 | ||
|
|
a7f4ac2797 | ||
|
|
25b5027dc7 | ||
|
|
93a967dc74 | ||
|
|
3cfc3dcecf | ||
|
|
e09510ea9f | ||
|
|
4c289fc8fb | ||
|
|
58cf0fa2b1 | ||
|
|
5ca12a73c3 | ||
|
|
fd8e9dad92 | ||
|
|
df0fe0a460 | ||
|
|
646d15b257 | ||
|
|
2eb6848eb8 | ||
|
|
9b3c103f16 | ||
|
|
6a2a13d346 | ||
|
|
b6edf4561d | ||
|
|
c2744700c0 | ||
|
|
f506a5ea6c | ||
|
|
2f702148e3 | ||
|
|
e10c928207 | ||
|
|
a1baa23a52 | ||
|
|
a70e72f75d | ||
|
|
4111da1dd0 | ||
|
|
e7804d014d | ||
|
|
bf87de3706 | ||
|
|
ebc2043055 | ||
|
|
69b1f6c4e1 | ||
|
|
2708777167 | ||
|
|
6e0d62bb65 | ||
|
|
6d706fd222 | ||
|
|
6066265717 | ||
|
|
805e4d01e7 | ||
|
|
e209299af4 | ||
|
|
b3f0a3c9f5 | ||
|
|
1da8841ac7 | ||
|
|
7df5df6351 | ||
|
|
bf85b0c109 | ||
|
|
314e30272b | ||
|
|
61b9a32504 | ||
|
|
01b7d4ffba | ||
|
|
8643972f8c | ||
|
|
1894b8fcf7 | ||
|
|
e59a68cd68 | ||
|
|
466c6da5e3 | ||
|
|
b8cb792831 | ||
|
|
0f9c2a62fe | ||
|
|
04350af96f | ||
|
|
287b3509ab | ||
|
|
2a5bcd3eec | ||
|
|
2a0b9a44dd | ||
|
|
c552db04d7 | ||
|
|
22f1ffc72b | ||
|
|
4f33be20d4 | ||
|
|
9728ddeaf9 | ||
|
|
3c44bdb6b7 | ||
|
|
b236844c94 | ||
|
|
67d12fa6d2 | ||
|
|
215856adc3 | ||
|
|
07e010dfb5 | ||
|
|
dba9ca2084 | ||
|
|
9a60e744d3 | ||
|
|
e1a2ab0d7e | ||
|
|
a605c110a8 | ||
|
|
18c6be0d3b | ||
|
|
ff728e2fc1 | ||
|
|
eff90395b6 | ||
|
|
f4d52b82b4 | ||
|
|
61419b57c8 | ||
|
|
441989a8e1 | ||
|
|
c5a41e1f55 | ||
|
|
0ce4d66601 | ||
|
|
d2d6b319b6 | ||
|
|
47edb71a68 | ||
|
|
1f8626b383 | ||
|
|
0d6a36e187 | ||
|
|
548a0c8517 | ||
|
|
09d85e25c1 | ||
|
|
51b5b14dea | ||
|
|
0d290a2c28 | ||
|
|
c1b3d589c7 | ||
|
|
65430d92ea | ||
|
|
8711830f66 | ||
|
|
c4d919d46b | ||
|
|
3e7a688811 | ||
|
|
2773a675d0 | ||
|
|
9bbdccc111 | ||
|
|
bb8defeb42 | ||
|
|
545dbd0791 | ||
|
|
c7469075ab | ||
|
|
54fa974789 | ||
|
|
2cd3cec478 | ||
|
|
c11b977f1d | ||
|
|
30e8f17b37 | ||
|
|
2c3190ce2a | ||
|
|
ea7796dccc | ||
|
|
a11ca58f36 | ||
|
|
496d711684 | ||
|
|
219b824338 | ||
|
|
df389a365c | ||
|
|
aa2c52c1f8 | ||
|
|
f48ae29f22 | ||
|
|
de00e0e15c | ||
|
|
79fea49272 | ||
|
|
8190b10680 | ||
|
|
1ebd9562a2 | ||
|
|
ebaf63393f | ||
|
|
7c168740d9 | ||
|
|
11b991cddc | ||
|
|
8306e58b75 | ||
|
|
4002739682 | ||
|
|
c259921269 | ||
|
|
2eb3041c1f | ||
|
|
d539d9b5d2 | ||
|
|
d17c985bcb | ||
|
|
e2668e7cfa | ||
|
|
18c2c61bee | ||
|
|
be0b0c1984 | ||
|
|
b00ca217b3 | ||
|
|
874d76b16b | ||
|
|
cfac261516 | ||
|
|
7b5e5c2587 | ||
|
|
db064381d9 | ||
|
|
096c310e0e | ||
|
|
0b87db8b45 | ||
|
|
71cf4a4885 | ||
|
|
a0c6104fae | ||
|
|
8e54ac4dcf | ||
|
|
97b0288c7d | ||
|
|
e3cc8652e4 | ||
|
|
8708a001c7 | ||
|
|
6fc4facddf | ||
|
|
e5536880fb | ||
|
|
44ff8f92ac | ||
|
|
95208267de | ||
|
|
9c579e0d5b | ||
|
|
d1be4c6d96 | ||
|
|
a65afdac95 | ||
|
|
22b47925d4 | ||
|
|
f291e365e5 | ||
|
|
6f176803d4 | ||
|
|
b6a3bb4080 | ||
|
|
c7c1deab81 | ||
|
|
2ded5870b5 | ||
|
|
57f2ae098f | ||
|
|
76c06923d5 | ||
|
|
fb7ac874f0 | ||
|
|
12905f0dcb | ||
|
|
68a313a58f | ||
|
|
152115bf2e | ||
|
|
8bd3051224 | ||
|
|
aa94ca6619 | ||
|
|
e397f72eb2 | ||
|
|
4d495b8d7c | ||
|
|
a142a2717c | ||
|
|
de4a477686 | ||
|
|
4e692e2c1e | ||
|
|
8237e6f7a3 | ||
|
|
d1a9f1feac | ||
|
|
ef1d38462f | ||
|
|
93c8e9aa1f | ||
|
|
ac2dce4bb1 | ||
|
|
f2e1d90c74 | ||
|
|
8e28a229f2 | ||
|
|
363f6cb329 | ||
|
|
b6f7832745 | ||
|
|
74c1db740d | ||
|
|
4bb5dcf50c | ||
|
|
b0d01389c6 | ||
|
|
3e22ada889 | ||
|
|
6d08394adc | ||
|
|
47bdeeef9a | ||
|
|
099440d008 | ||
|
|
eb7201a55b | ||
|
|
6d9f40db30 | ||
|
|
7960706e60 | ||
|
|
8b0e54a95c | ||
|
|
89e8f0ccc3 |
@@ -25,9 +25,11 @@ GOTO:EOF
|
||||
|
||||
:getDependencies
|
||||
call:logInfo "Clone dependencies repository"
|
||||
git clone -q --depth 1 --branch=master https://github.com/telegramdesktop/dependencies_windows.git %LIB_DIR%
|
||||
git clone -q --depth 1 --branch master https://github.com/telegramdesktop/dependencies_windows.git %LIB_DIR%
|
||||
cd %LIB_DIR%
|
||||
git clone https://github.com/ericniebler/range-v3
|
||||
|
||||
git clone --depth 1 --branch 0.5.0 https://github.com/ericniebler/range-v3
|
||||
|
||||
if exist prepare.bat (
|
||||
call prepare.bat
|
||||
) else (
|
||||
@@ -72,10 +74,6 @@ GOTO:EOF
|
||||
set TDESKTOP_BUILD_DEFINES=%TDESKTOP_BUILD_DEFINES%,TDESKTOP_DISABLE_DESKTOP_FILE_GENERATION
|
||||
)
|
||||
|
||||
echo %BUILD_VERSION% | findstr /C:"disable_unity_integration">nul && (
|
||||
set TDESKTOP_BUILD_DEFINES=%TDESKTOP_BUILD_DEFINES%,TDESKTOP_DISABLE_UNITY_INTEGRATION
|
||||
)
|
||||
|
||||
echo %BUILD_VERSION% | findstr /C:"disable_gtk_integration">nul && (
|
||||
set TDESKTOP_BUILD_DEFINES=%TDESKTOP_BUILD_DEFINES%,TDESKTOP_DISABLE_GTK_INTEGRATION
|
||||
)
|
||||
|
||||
6
.gitmodules
vendored
@@ -16,3 +16,9 @@
|
||||
[submodule "Telegram/ThirdParty/xxHash"]
|
||||
path = Telegram/ThirdParty/xxHash
|
||||
url = https://github.com/Cyan4973/xxHash.git
|
||||
[submodule "Telegram/ThirdParty/qtlottie"]
|
||||
path = Telegram/ThirdParty/qtlottie
|
||||
url = https://github.com/telegramdesktop/qtlottie.git
|
||||
[submodule "Telegram/ThirdParty/rapidjson"]
|
||||
path = Telegram/ThirdParty/rapidjson
|
||||
url = https://github.com/Tencent/rapidjson.git
|
||||
|
||||
11
.travis.yml
@@ -14,7 +14,6 @@ env:
|
||||
- BUILD_VERSION="disable_crash_reports"
|
||||
- BUILD_VERSION="disable_network_proxy"
|
||||
- BUILD_VERSION="disable_desktop_file_generation"
|
||||
- BUILD_VERSION="disable_unity_integration"
|
||||
- BUILD_VERSION="disable_gtk_integration"
|
||||
|
||||
matrix:
|
||||
@@ -32,8 +31,8 @@ addons:
|
||||
- dpatch
|
||||
- equivs
|
||||
- fakeroot
|
||||
- g++-7
|
||||
- gcc-7
|
||||
- g++-8
|
||||
- gcc-8
|
||||
- git
|
||||
- gnome-common
|
||||
- gobject-introspection
|
||||
@@ -45,7 +44,7 @@ addons:
|
||||
- libopus-dev
|
||||
- libpulse-dev
|
||||
- libssl-dev
|
||||
- libunity-dev
|
||||
- libdee-dev
|
||||
- libva-dev
|
||||
- libvdpau-dev
|
||||
- libxcb-xkb-dev
|
||||
@@ -57,8 +56,8 @@ addons:
|
||||
- yasm
|
||||
|
||||
before_install:
|
||||
- export CXX="g++-7" CC="gcc-7"
|
||||
- sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-7 60 --slave /usr/bin/g++ g++ /usr/bin/g++-7
|
||||
- export CXX="g++-8" CC="gcc-8"
|
||||
- sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-8 60 --slave /usr/bin/g++ g++ /usr/bin/g++-8
|
||||
- sudo update-alternatives --config gcc
|
||||
- g++ --version
|
||||
|
||||
|
||||
@@ -28,7 +28,7 @@ GYP_CACHE_VERSION="3"
|
||||
GYP_PATCH="$UPSTREAM/Telegram/Patches/gyp.diff"
|
||||
|
||||
RANGE_PATH="$BUILD/range-v3"
|
||||
RANGE_CACHE_VERSION="3"
|
||||
RANGE_CACHE_VERSION="4"
|
||||
|
||||
VA_PATH="$BUILD/libva"
|
||||
VA_CACHE_VERSION="3"
|
||||
@@ -116,10 +116,6 @@ build() {
|
||||
GYP_DEFINES+=",TDESKTOP_DISABLE_DESKTOP_FILE_GENERATION"
|
||||
fi
|
||||
|
||||
if [[ $BUILD_VERSION == *"disable_unity_integration"* ]]; then
|
||||
GYP_DEFINES+=",TDESKTOP_DISABLE_UNITY_INTEGRATION"
|
||||
fi
|
||||
|
||||
if [[ $BUILD_VERSION == *"disable_gtk_integration"* ]]; then
|
||||
GYP_DEFINES+=",TDESKTOP_DISABLE_GTK_INTEGRATION"
|
||||
fi
|
||||
@@ -220,7 +216,7 @@ buildRange() {
|
||||
rm -rf *
|
||||
|
||||
cd "$EXTERNAL"
|
||||
git clone --depth=1 https://github.com/ericniebler/range-v3
|
||||
git clone --depth 1 --branch 0.5.0 https://github.com/ericniebler/range-v3
|
||||
|
||||
cd "$EXTERNAL/range-v3"
|
||||
cp -r * "$RANGE_PATH/"
|
||||
@@ -318,6 +314,7 @@ buildVdpau() {
|
||||
git clone git://anongit.freedesktop.org/vdpau/libvdpau
|
||||
|
||||
cd "$EXTERNAL/libvdpau"
|
||||
git checkout libvdpau-1.2
|
||||
./autogen.sh --prefix=$VDPAU_PATH --enable-static
|
||||
make $MAKE_ARGS
|
||||
sudo make install
|
||||
|
||||
2
LEGAL
@@ -1,7 +1,7 @@
|
||||
This file is part of Telegram Desktop,
|
||||
the official desktop application for the Telegram messaging service.
|
||||
|
||||
Copyright (c) 2014-2018 John Preston, https://desktop.telegram.org
|
||||
Copyright (c) 2014-2019 John Preston, https://desktop.telegram.org
|
||||
|
||||
Telegram Desktop is free software: you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
|
||||
@@ -15,9 +15,10 @@ The source code is published under GPLv3 with OpenSSL exception, the license is
|
||||
* Windows XP - Windows 10 (**not** RT)
|
||||
* Mac OS X 10.8 - Mac OS X 10.11
|
||||
* Mac OS X 10.6 - Mac OS X 10.7 (separate build)
|
||||
* Ubuntu 12.04 - Ubuntu 18.04
|
||||
* Fedora 22 - Fedora 28
|
||||
* Ubuntu 12.04 - Ubuntu 19.04
|
||||
* Fedora 22 - Fedora 30
|
||||
* [Snappy](https://snapcraft.io/telegram-desktop)
|
||||
* [Flathub](https://flathub.org/apps/details/org.telegram.desktop)
|
||||
|
||||
## Third-party
|
||||
|
||||
@@ -44,8 +45,8 @@ The source code is published under GPLv3 with OpenSSL exception, the license is
|
||||
|
||||
## Build instructions
|
||||
|
||||
* [Visual Studio 2017][msvc]
|
||||
* [Xcode 9][xcode]
|
||||
* [Visual Studio 2019][msvc]
|
||||
* [Xcode 10][xcode]
|
||||
* [GYP/CMake on GNU/Linux][cmake]
|
||||
|
||||
[//]: # (LINKS)
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
diff --git a/src/build/common.gypi b/src/build/common.gypi
|
||||
index 29990c6..53e99d4 100644
|
||||
index 29990c65..53e99d44 100644
|
||||
--- a/src/build/common.gypi
|
||||
+++ b/src/build/common.gypi
|
||||
@@ -330,6 +330,7 @@
|
||||
@@ -11,7 +11,7 @@ index 29990c6..53e99d4 100644
|
||||
},
|
||||
}],
|
||||
diff --git a/src/client/mac/Breakpad.xcodeproj/project.pbxproj b/src/client/mac/Breakpad.xcodeproj/project.pbxproj
|
||||
index 1a93ce6..1c1d643 100644
|
||||
index 1a93ce6d..b5986e33 100644
|
||||
--- a/src/client/mac/Breakpad.xcodeproj/project.pbxproj
|
||||
+++ b/src/client/mac/Breakpad.xcodeproj/project.pbxproj
|
||||
@@ -35,6 +35,19 @@
|
||||
@@ -34,7 +34,15 @@ index 1a93ce6..1c1d643 100644
|
||||
162F64F2161C577500CD68D5 /* arch_utilities.cc in Sources */ = {isa = PBXBuildFile; fileRef = 162F64F0161C577500CD68D5 /* arch_utilities.cc */; };
|
||||
162F64F3161C577500CD68D5 /* arch_utilities.h in Headers */ = {isa = PBXBuildFile; fileRef = 162F64F1161C577500CD68D5 /* arch_utilities.h */; };
|
||||
162F64F4161C579B00CD68D5 /* arch_utilities.cc in Sources */ = {isa = PBXBuildFile; fileRef = 162F64F0161C577500CD68D5 /* arch_utilities.cc */; };
|
||||
@@ -170,11 +183,8 @@
|
||||
@@ -67,6 +80,7 @@
|
||||
4DBE49A7134A4F280072546A /* CoreServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4DBE4769134A4F080072546A /* CoreServices.framework */; };
|
||||
4DBE49A8134A4F380072546A /* CoreServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4DBE4769134A4F080072546A /* CoreServices.framework */; };
|
||||
4DBE49A9134A4F460072546A /* CoreServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4DBE4769134A4F080072546A /* CoreServices.framework */; };
|
||||
+ 5A8B220921E0C5740045F83C /* breakpad_nlist_64.cc in Sources */ = {isa = PBXBuildFile; fileRef = F92C53690ECCE3FD009BE4BA /* breakpad_nlist_64.cc */; };
|
||||
8B3101C611F0CD9F00FCF3E4 /* AppKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0867D6A5FE840307C02AAC07 /* AppKit.framework */; };
|
||||
8B3101C711F0CD9F00FCF3E4 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0867D69BFE84028FC02AAC07 /* Foundation.framework */; };
|
||||
8B3101CA11F0CDB000FCF3E4 /* AppKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0867D6A5FE840307C02AAC07 /* AppKit.framework */; };
|
||||
@@ -170,11 +184,8 @@
|
||||
F92C564A0ECD10CA009BE4BA /* string_conversion.cc in Sources */ = {isa = PBXBuildFile; fileRef = F92C53850ECCE6AD009BE4BA /* string_conversion.cc */; };
|
||||
F92C564C0ECD10DD009BE4BA /* breakpadUtilities.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = F92C563C0ECD10B3009BE4BA /* breakpadUtilities.dylib */; };
|
||||
F92C56570ECD113E009BE4BA /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F92C554A0ECCF530009BE4BA /* Carbon.framework */; };
|
||||
@@ -46,7 +54,7 @@ index 1a93ce6..1c1d643 100644
|
||||
F92C56A90ECE04C5009BE4BA /* crash_report_sender.m in Sources */ = {isa = PBXBuildFile; fileRef = F92C56A80ECE04C5009BE4BA /* crash_report_sender.m */; };
|
||||
F93803CD0F8083B7004D428B /* dynamic_images.cc in Sources */ = {isa = PBXBuildFile; fileRef = F92C536B0ECCE3FD009BE4BA /* dynamic_images.cc */; };
|
||||
F93803CE0F8083B7004D428B /* exception_handler.cc in Sources */ = {isa = PBXBuildFile; fileRef = F92C536D0ECCE3FD009BE4BA /* exception_handler.cc */; };
|
||||
@@ -213,7 +223,6 @@
|
||||
@@ -213,7 +224,6 @@
|
||||
F9C44DBD0EF072A0003AEBAA /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = F9C44DBA0EF072A0003AEBAA /* MainMenu.xib */; };
|
||||
F9C44E000EF077CD003AEBAA /* Breakpad.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8DC2EF5B0486A6940098B216 /* Breakpad.framework */; };
|
||||
F9C44E3C0EF08B12003AEBAA /* Breakpad.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 8DC2EF5B0486A6940098B216 /* Breakpad.framework */; };
|
||||
@@ -54,7 +62,7 @@ index 1a93ce6..1c1d643 100644
|
||||
F9C44EA20EF09F93003AEBAA /* HTTPMultipartUpload.m in Sources */ = {isa = PBXBuildFile; fileRef = F92C53770ECCE635009BE4BA /* HTTPMultipartUpload.m */; };
|
||||
F9C44EE50EF0A006003AEBAA /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F9C44EE40EF0A006003AEBAA /* SystemConfiguration.framework */; };
|
||||
F9C44EE90EF0A3C1003AEBAA /* GTMLogger.m in Sources */ = {isa = PBXBuildFile; fileRef = F9C44EE80EF0A3C1003AEBAA /* GTMLogger.m */; };
|
||||
@@ -410,20 +419,6 @@
|
||||
@@ -410,20 +420,6 @@
|
||||
remoteGlobalIDString = F92C563B0ECD10B3009BE4BA;
|
||||
remoteInfo = breakpadUtilities;
|
||||
};
|
||||
@@ -75,7 +83,7 @@ index 1a93ce6..1c1d643 100644
|
||||
F93DE2FB0F82C3C600608B94 /* PBXContainerItemProxy */ = {
|
||||
isa = PBXContainerItemProxy;
|
||||
containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
|
||||
@@ -536,13 +531,6 @@
|
||||
@@ -536,13 +532,6 @@
|
||||
remoteGlobalIDString = 8DC2EF4F0486A6940098B216;
|
||||
remoteInfo = Breakpad;
|
||||
};
|
||||
@@ -89,7 +97,7 @@ index 1a93ce6..1c1d643 100644
|
||||
/* End PBXContainerItemProxy section */
|
||||
|
||||
/* Begin PBXCopyFilesBuildPhase section */
|
||||
@@ -714,7 +702,6 @@
|
||||
@@ -714,7 +703,6 @@
|
||||
isa = PBXFrameworksBuildPhase;
|
||||
buildActionMask = 2147483647;
|
||||
files = (
|
||||
@@ -97,7 +105,7 @@ index 1a93ce6..1c1d643 100644
|
||||
8DC2EF570486A6940098B216 /* Cocoa.framework in Frameworks */,
|
||||
);
|
||||
runOnlyForDeploymentPostprocessing = 0;
|
||||
@@ -1181,18 +1168,13 @@
|
||||
@@ -1181,18 +1169,13 @@
|
||||
isa = PBXNativeTarget;
|
||||
buildConfigurationList = 1DEB91AD08733DA50010E9CD /* Build configuration list for PBXNativeTarget "Breakpad" */;
|
||||
buildPhases = (
|
||||
@@ -116,7 +124,7 @@ index 1a93ce6..1c1d643 100644
|
||||
);
|
||||
name = Breakpad;
|
||||
productInstallPath = "$(HOME)/Library/Frameworks";
|
||||
@@ -1399,6 +1381,8 @@
|
||||
@@ -1399,6 +1382,8 @@
|
||||
/* Begin PBXProject section */
|
||||
0867D690FE84028FC02AAC07 /* Project object */ = {
|
||||
isa = PBXProject;
|
||||
@@ -125,7 +133,7 @@ index 1a93ce6..1c1d643 100644
|
||||
buildConfigurationList = 1DEB91B108733DA50010E9CD /* Build configuration list for PBXProject "Breakpad" */;
|
||||
compatibilityVersion = "Xcode 3.1";
|
||||
developmentRegion = English;
|
||||
@@ -1583,16 +1567,6 @@
|
||||
@@ -1583,16 +1568,6 @@
|
||||
/* End PBXReferenceProxy section */
|
||||
|
||||
/* Begin PBXResourcesBuildPhase section */
|
||||
@@ -142,7 +150,7 @@ index 1a93ce6..1c1d643 100644
|
||||
F92C569C0ECE04A7009BE4BA /* Resources */ = {
|
||||
isa = PBXResourcesBuildPhase;
|
||||
buildActionMask = 2147483647;
|
||||
@@ -1640,20 +1614,6 @@
|
||||
@@ -1640,20 +1615,6 @@
|
||||
shellPath = /bin/sh;
|
||||
shellScript = "install_name_tool -id \"@executable_path/../Resources/breakpadUtilities.dylib\" \"${BUILT_PRODUCTS_DIR}/breakpadUtilities.dylib\"\n";
|
||||
};
|
||||
@@ -163,10 +171,11 @@ index 1a93ce6..1c1d643 100644
|
||||
F9C77DD80F7DD5CF0045F7DB /* ShellScript */ = {
|
||||
isa = PBXShellScriptBuildPhase;
|
||||
buildActionMask = 2147483647;
|
||||
@@ -1674,6 +1634,19 @@
|
||||
@@ -1674,6 +1635,20 @@
|
||||
isa = PBXSourcesBuildPhase;
|
||||
buildActionMask = 2147483647;
|
||||
files = (
|
||||
+ 5A8B220921E0C5740045F83C /* breakpad_nlist_64.cc in Sources */,
|
||||
+ 0748C0501C63C52D004489BF /* bootstrap_compat.cc in Sources */,
|
||||
+ 0748C04F1C63C523004489BF /* macho_walker.cc in Sources */,
|
||||
+ 0748C04E1C63C51C004489BF /* md5.cc in Sources */,
|
||||
@@ -183,7 +192,7 @@ index 1a93ce6..1c1d643 100644
|
||||
F92C565F0ECD116B009BE4BA /* protected_memory_allocator.cc in Sources */,
|
||||
F92C56630ECD1179009BE4BA /* exception_handler.cc in Sources */,
|
||||
F92C55D10ECD0064009BE4BA /* Breakpad.mm in Sources */,
|
||||
@@ -1955,16 +1928,6 @@
|
||||
@@ -1955,16 +1930,6 @@
|
||||
target = F92C563B0ECD10B3009BE4BA /* breakpadUtilities */;
|
||||
targetProxy = F92C564D0ECD10E5009BE4BA /* PBXContainerItemProxy */;
|
||||
};
|
||||
@@ -200,7 +209,7 @@ index 1a93ce6..1c1d643 100644
|
||||
F93DE2FC0F82C3C600608B94 /* PBXTargetDependency */ = {
|
||||
isa = PBXTargetDependency;
|
||||
target = F93803BD0F80820F004D428B /* generator_test */;
|
||||
@@ -2025,11 +1988,6 @@
|
||||
@@ -2025,11 +1990,6 @@
|
||||
target = 8DC2EF4F0486A6940098B216 /* Breakpad */;
|
||||
targetProxy = F9C44E190EF0790F003AEBAA /* PBXContainerItemProxy */;
|
||||
};
|
||||
@@ -212,7 +221,7 @@ index 1a93ce6..1c1d643 100644
|
||||
/* End PBXTargetDependency section */
|
||||
|
||||
/* Begin PBXVariantGroup section */
|
||||
@@ -2126,8 +2084,12 @@
|
||||
@@ -2126,8 +2086,12 @@
|
||||
isa = XCBuildConfiguration;
|
||||
baseConfigurationReference = 8B31027711F0D3AF00FCF3E4 /* BreakpadDebug.xcconfig */;
|
||||
buildSettings = {
|
||||
@@ -226,7 +235,7 @@ index 1a93ce6..1c1d643 100644
|
||||
};
|
||||
name = Debug;
|
||||
};
|
||||
@@ -2135,7 +2097,12 @@
|
||||
@@ -2135,7 +2099,12 @@
|
||||
isa = XCBuildConfiguration;
|
||||
baseConfigurationReference = 8B31027811F0D3AF00FCF3E4 /* BreakpadRelease.xcconfig */;
|
||||
buildSettings = {
|
||||
@@ -239,7 +248,7 @@ index 1a93ce6..1c1d643 100644
|
||||
};
|
||||
name = Release;
|
||||
};
|
||||
@@ -2454,7 +2421,12 @@
|
||||
@@ -2454,7 +2423,12 @@
|
||||
isa = XCBuildConfiguration;
|
||||
baseConfigurationReference = 8B31027711F0D3AF00FCF3E4 /* BreakpadDebug.xcconfig */;
|
||||
buildSettings = {
|
||||
@@ -253,7 +262,7 @@ index 1a93ce6..1c1d643 100644
|
||||
name = "Debug With Code Coverage";
|
||||
};
|
||||
diff --git a/src/client/mac/Framework/Breakpad.mm b/src/client/mac/Framework/Breakpad.mm
|
||||
index 1d2e519..943310f 100644
|
||||
index 1d2e519b..943310fa 100644
|
||||
--- a/src/client/mac/Framework/Breakpad.mm
|
||||
+++ b/src/client/mac/Framework/Breakpad.mm
|
||||
@@ -355,10 +355,10 @@ bool Breakpad::Initialize(NSDictionary *parameters) {
|
||||
@@ -480,7 +489,7 @@ index 1d2e519..943310f 100644
|
||||
}
|
||||
|
||||
diff --git a/src/common/language.cc b/src/common/language.cc
|
||||
index 978fb85..a95ae5f 100644
|
||||
index 978fb855..a95ae5f7 100644
|
||||
--- a/src/common/language.cc
|
||||
+++ b/src/common/language.cc
|
||||
@@ -46,8 +46,27 @@
|
||||
@@ -552,7 +561,7 @@ index 978fb85..a95ae5f 100644
|
||||
#endif
|
||||
}
|
||||
diff --git a/src/common/linux/elf_symbols_to_module.cc b/src/common/linux/elf_symbols_to_module.cc
|
||||
index 562875e..4367851 100644
|
||||
index 562875e1..43678510 100644
|
||||
--- a/src/common/linux/elf_symbols_to_module.cc
|
||||
+++ b/src/common/linux/elf_symbols_to_module.cc
|
||||
@@ -39,6 +39,29 @@
|
||||
@@ -615,7 +624,7 @@ index 562875e..4367851 100644
|
||||
module->AddExtern(ext);
|
||||
}
|
||||
diff --git a/src/tools/linux/tools_linux.gypi b/src/tools/linux/tools_linux.gypi
|
||||
index 1c15992..020e4c1 100644
|
||||
index 1c15992e..020e4c1c 100644
|
||||
--- a/src/tools/linux/tools_linux.gypi
|
||||
+++ b/src/tools/linux/tools_linux.gypi
|
||||
@@ -58,7 +58,7 @@
|
||||
@@ -627,3 +636,16 @@ index 1c15992..020e4c1 100644
|
||||
],
|
||||
'dependencies': [
|
||||
'../common/common.gyp:common',
|
||||
diff --git a/src/tools/mac/dump_syms/macho_dump.cc b/src/tools/mac/dump_syms/macho_dump.cc
|
||||
index d882bbe8..3432bb45 100644
|
||||
--- a/src/tools/mac/dump_syms/macho_dump.cc
|
||||
+++ b/src/tools/mac/dump_syms/macho_dump.cc
|
||||
@@ -140,7 +140,7 @@ void DumpFile(const char *filename) {
|
||||
size_t object_files_size;
|
||||
const SuperFatArch* super_fat_object_files =
|
||||
fat_reader.object_files(&object_files_size);
|
||||
- struct fat_arch *object_files;
|
||||
+ struct fat_arch *object_files = 0;
|
||||
if (!super_fat_object_files->ConvertToFatArch(object_files)) {
|
||||
exit(1);
|
||||
}
|
||||
|
||||
@@ -12,7 +12,108 @@ pacman --noconfirm -S pkg-config
|
||||
|
||||
PKG_CONFIG_PATH="/mingw64/lib/pkgconfig:$PKG_CONFIG_PATH"
|
||||
|
||||
./configure --toolchain=msvc --disable-programs --disable-doc --disable-everything --enable-protocol=file --enable-libopus --enable-decoder=aac --enable-decoder=aac_latm --enable-decoder=aasc --enable-decoder=flac --enable-decoder=gif --enable-decoder=h264 --enable-decoder=mp1 --enable-decoder=mp1float --enable-decoder=mp2 --enable-decoder=mp2float --enable-decoder=mp3 --enable-decoder=mp3adu --enable-decoder=mp3adufloat --enable-decoder=mp3float --enable-decoder=mp3on4 --enable-decoder=mp3on4float --enable-decoder=mpeg4 --enable-decoder=msmpeg4v2 --enable-decoder=msmpeg4v3 --enable-decoder=wavpack --enable-decoder=opus --enable-decoder=pcm_alaw --enable-decoder=pcm_alaw_at --enable-decoder=pcm_f32be --enable-decoder=pcm_f32le --enable-decoder=pcm_f64be --enable-decoder=pcm_f64le --enable-decoder=pcm_lxf --enable-decoder=pcm_mulaw --enable-decoder=pcm_mulaw_at --enable-decoder=pcm_s16be --enable-decoder=pcm_s16be_planar --enable-decoder=pcm_s16le --enable-decoder=pcm_s16le_planar --enable-decoder=pcm_s24be --enable-decoder=pcm_s24daud --enable-decoder=pcm_s24le --enable-decoder=pcm_s24le_planar --enable-decoder=pcm_s32be --enable-decoder=pcm_s32le --enable-decoder=pcm_s32le_planar --enable-decoder=pcm_s64be --enable-decoder=pcm_s64le --enable-decoder=pcm_s8 --enable-decoder=pcm_s8_planar --enable-decoder=pcm_u16be --enable-decoder=pcm_u16le --enable-decoder=pcm_u24be --enable-decoder=pcm_u24le --enable-decoder=pcm_u32be --enable-decoder=pcm_u32le --enable-decoder=pcm_u8 --enable-decoder=pcm_zork --enable-decoder=vorbis --enable-decoder=wmalossless --enable-decoder=wmapro --enable-decoder=wmav1 --enable-decoder=wmav2 --enable-decoder=wmavoice --enable-encoder=libopus --enable-hwaccel=h264_d3d11va --enable-hwaccel=h264_dxva2 --enable-parser=aac --enable-parser=aac_latm --enable-parser=flac --enable-parser=h264 --enable-parser=mpeg4video --enable-parser=mpegaudio --enable-parser=opus --enable-parser=vorbis --enable-demuxer=aac --enable-demuxer=flac --enable-demuxer=gif --enable-demuxer=h264 --enable-demuxer=mov --enable-demuxer=mp3 --enable-demuxer=ogg --enable-demuxer=wav --enable-muxer=ogg --enable-muxer=opus --extra-ldflags="-libpath:$FullExecPath/../opus/win32/VS2015/Win32/Release"
|
||||
./configure --toolchain=msvc \
|
||||
--extra-ldflags="-libpath:$FullExecPath/../opus/win32/VS2015/Win32/Release" \
|
||||
--disable-programs \
|
||||
--disable-doc \
|
||||
--disable-network \
|
||||
--disable-everything \
|
||||
--enable-hwaccel=h264_d3d11va \
|
||||
--enable-hwaccel=h264_d3d11va2 \
|
||||
--enable-hwaccel=h264_dxva2 \
|
||||
--enable-hwaccel=hevc_d3d11va \
|
||||
--enable-hwaccel=hevc_d3d11va2 \
|
||||
--enable-hwaccel=hevc_dxva2 \
|
||||
--enable-hwaccel=mpeg2_d3d11va \
|
||||
--enable-hwaccel=mpeg2_d3d11va2 \
|
||||
--enable-hwaccel=mpeg2_dxva2 \
|
||||
--enable-protocol=file --enable-libopus \
|
||||
--enable-decoder=aac \
|
||||
--enable-decoder=aac_at \
|
||||
--enable-decoder=aac_fixed \
|
||||
--enable-decoder=aac_latm \
|
||||
--enable-decoder=aasc \
|
||||
--enable-decoder=alac \
|
||||
--enable-decoder=alac_at \
|
||||
--enable-decoder=flac \
|
||||
--enable-decoder=gif \
|
||||
--enable-decoder=h264 \
|
||||
--enable-decoder=hevc \
|
||||
--enable-decoder=mp1 \
|
||||
--enable-decoder=mp1float \
|
||||
--enable-decoder=mp2 \
|
||||
--enable-decoder=mp2float \
|
||||
--enable-decoder=mp3 \
|
||||
--enable-decoder=mp3adu \
|
||||
--enable-decoder=mp3adufloat \
|
||||
--enable-decoder=mp3float \
|
||||
--enable-decoder=mp3on4 \
|
||||
--enable-decoder=mp3on4float \
|
||||
--enable-decoder=mpeg4 \
|
||||
--enable-decoder=msmpeg4v2 \
|
||||
--enable-decoder=msmpeg4v3 \
|
||||
--enable-decoder=opus \
|
||||
--enable-decoder=pcm_alaw \
|
||||
--enable-decoder=pcm_alaw_at \
|
||||
--enable-decoder=pcm_f32be \
|
||||
--enable-decoder=pcm_f32le \
|
||||
--enable-decoder=pcm_f64be \
|
||||
--enable-decoder=pcm_f64le \
|
||||
--enable-decoder=pcm_lxf \
|
||||
--enable-decoder=pcm_mulaw \
|
||||
--enable-decoder=pcm_mulaw_at \
|
||||
--enable-decoder=pcm_s16be \
|
||||
--enable-decoder=pcm_s16be_planar \
|
||||
--enable-decoder=pcm_s16le \
|
||||
--enable-decoder=pcm_s16le_planar \
|
||||
--enable-decoder=pcm_s24be \
|
||||
--enable-decoder=pcm_s24daud \
|
||||
--enable-decoder=pcm_s24le \
|
||||
--enable-decoder=pcm_s24le_planar \
|
||||
--enable-decoder=pcm_s32be \
|
||||
--enable-decoder=pcm_s32le \
|
||||
--enable-decoder=pcm_s32le_planar \
|
||||
--enable-decoder=pcm_s64be \
|
||||
--enable-decoder=pcm_s64le \
|
||||
--enable-decoder=pcm_s8 \
|
||||
--enable-decoder=pcm_s8_planar \
|
||||
--enable-decoder=pcm_u16be \
|
||||
--enable-decoder=pcm_u16le \
|
||||
--enable-decoder=pcm_u24be \
|
||||
--enable-decoder=pcm_u24le \
|
||||
--enable-decoder=pcm_u32be \
|
||||
--enable-decoder=pcm_u32le \
|
||||
--enable-decoder=pcm_u8 \
|
||||
--enable-decoder=pcm_zork \
|
||||
--enable-decoder=vorbis \
|
||||
--enable-decoder=wavpack \
|
||||
--enable-decoder=wmalossless \
|
||||
--enable-decoder=wmapro \
|
||||
--enable-decoder=wmav1 \
|
||||
--enable-decoder=wmav2 \
|
||||
--enable-decoder=wmavoice \
|
||||
--enable-encoder=libopus \
|
||||
--enable-parser=aac \
|
||||
--enable-parser=aac_latm \
|
||||
--enable-parser=flac \
|
||||
--enable-parser=h264 \
|
||||
--enable-parser=hevc \
|
||||
--enable-parser=mpeg4video \
|
||||
--enable-parser=mpegaudio \
|
||||
--enable-parser=opus \
|
||||
--enable-parser=vorbis \
|
||||
--enable-demuxer=aac \
|
||||
--enable-demuxer=flac \
|
||||
--enable-demuxer=gif \
|
||||
--enable-demuxer=h264 \
|
||||
--enable-demuxer=hevc \
|
||||
--enable-demuxer=m4v \
|
||||
--enable-demuxer=mov \
|
||||
--enable-demuxer=mp3 \
|
||||
--enable-demuxer=ogg \
|
||||
--enable-demuxer=wav \
|
||||
--enable-muxer=ogg \
|
||||
--enable-muxer=opus
|
||||
|
||||
make -j4
|
||||
make -j4 install
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
diff --git a/pylib/gyp/generator/cmake.py b/pylib/gyp/generator/cmake.py
|
||||
index a2b9629..ac59461 100644
|
||||
index 4a2041cf..e5333926 100644
|
||||
--- a/pylib/gyp/generator/cmake.py
|
||||
+++ b/pylib/gyp/generator/cmake.py
|
||||
@@ -1070,6 +1070,23 @@ def WriteTarget(namer, qualified_target, target_dicts, build_dir, config_to_use,
|
||||
@@ -1078,6 +1078,23 @@ def WriteTarget(namer, qualified_target, target_dicts, build_dir, config_to_use,
|
||||
|
||||
output.write(')\n')
|
||||
|
||||
@@ -26,7 +26,7 @@ index a2b9629..ac59461 100644
|
||||
UnsetVariable(output, 'TOOLSET')
|
||||
UnsetVariable(output, 'TARGET')
|
||||
|
||||
@@ -1112,6 +1129,8 @@ def GenerateOutputForConfig(target_list, target_dicts, data,
|
||||
@@ -1120,6 +1137,8 @@ def GenerateOutputForConfig(target_list, target_dicts, data,
|
||||
SetVariable(output, 'configuration', config_to_use)
|
||||
|
||||
ar = None
|
||||
@@ -35,7 +35,7 @@ index a2b9629..ac59461 100644
|
||||
cc = None
|
||||
cxx = None
|
||||
|
||||
@@ -1121,17 +1140,27 @@ def GenerateOutputForConfig(target_list, target_dicts, data,
|
||||
@@ -1129,17 +1148,27 @@ def GenerateOutputForConfig(target_list, target_dicts, data,
|
||||
for key, value in make_global_settings:
|
||||
if key == 'AR':
|
||||
ar = os.path.join(build_to_top, value)
|
||||
@@ -64,48 +64,63 @@ index a2b9629..ac59461 100644
|
||||
SetVariable(output, 'CMAKE_C_COMPILER', cc)
|
||||
if cxx:
|
||||
diff --git a/pylib/gyp/generator/xcode.py b/pylib/gyp/generator/xcode.py
|
||||
index db99d6a..8d56baf 100644
|
||||
index 8bc22bed..24bee427 100644
|
||||
--- a/pylib/gyp/generator/xcode.py
|
||||
+++ b/pylib/gyp/generator/xcode.py
|
||||
@@ -72,6 +72,10 @@ generator_additional_non_configuration_keys = [
|
||||
@@ -74,6 +74,12 @@ generator_additional_non_configuration_keys = [
|
||||
'ios_app_extension',
|
||||
'ios_watch_app',
|
||||
'ios_watchkit_extension',
|
||||
+
|
||||
+ 'mac_sandbox', # sandbox support
|
||||
+ 'mac_sandbox_development_team',
|
||||
+
|
||||
+ 'mac_hardened_runtime', # hardened runtime support
|
||||
+
|
||||
'mac_bundle',
|
||||
'mac_bundle_resources',
|
||||
'mac_framework_headers',
|
||||
@@ -772,6 +776,26 @@ def GenerateOutput(target_list, target_dicts, data, params):
|
||||
@@ -774,6 +780,39 @@ def GenerateOutput(target_list, target_dicts, data, params):
|
||||
xcode_targets[qualified_target] = xct
|
||||
xcode_target_to_target_dict[xct] = spec
|
||||
|
||||
+ # sandbox support
|
||||
+ # sandbox and hardened runtime support
|
||||
+ is_sandbox = int(spec.get('mac_sandbox', 0))
|
||||
+ is_hardened_runtime = int(spec.get('mac_hardened_runtime', 0))
|
||||
+ if is_sandbox or is_hardened_runtime:
|
||||
+ try:
|
||||
+ tmp = pbxp._properties['attributes']['TargetAttributes']
|
||||
+ except KeyError:
|
||||
+ pbxp._properties['attributes']['TargetAttributes'] = {}
|
||||
+ try:
|
||||
+ tmp = pbxp._properties['attributes']['TargetAttributes'][xct]
|
||||
+ except KeyError:
|
||||
+ pbxp._properties['attributes']['TargetAttributes'][xct] = {}
|
||||
+ try:
|
||||
+ tmp = pbxp._properties['attributes']['TargetAttributes'][xct]['SystemCapabilities']
|
||||
+ except KeyError:
|
||||
+ pbxp._properties['attributes']['TargetAttributes'][xct]['SystemCapabilities'] = {}
|
||||
+
|
||||
+ if is_sandbox:
|
||||
+ dev_team = spec.get('mac_sandbox_development_team', '%%ERROR%%')
|
||||
+ assert dev_team != '%%ERROR%%', (
|
||||
+ 'mac_sandbox must be accompanied by mac_sandbox_development_team (target "%s")' %
|
||||
+ target_name)
|
||||
+ try:
|
||||
+ tmp = pbxp._properties['attributes']['TargetAttributes']
|
||||
+ except KeyError:
|
||||
+ pbxp._properties['attributes']['TargetAttributes'] = {}
|
||||
+ pbxp._properties['attributes']['TargetAttributes'][xct] = {
|
||||
+ 'DevelopmentTeam': dev_team,
|
||||
+ 'SystemCapabilities': {
|
||||
+ 'com.apple.Sandbox': {
|
||||
+ 'enabled': 1,
|
||||
+ },
|
||||
+ },
|
||||
+ pbxp._properties['attributes']['TargetAttributes'][xct]['DevelopmentTeam'] = dev_team
|
||||
+ pbxp._properties['attributes']['TargetAttributes'][xct]['SystemCapabilities']['com.apple.Sandbox'] = {
|
||||
+ 'enabled': 1,
|
||||
+ }
|
||||
+
|
||||
+ # hardened runtime support
|
||||
+ if is_hardened_runtime:
|
||||
+ pbxp._properties['attributes']['TargetAttributes'][xct]['SystemCapabilities']['com.apple.HardenedRuntime'] = {
|
||||
+ 'enabled': 1,
|
||||
+ }
|
||||
+
|
||||
spec_actions = spec.get('actions', [])
|
||||
spec_rules = spec.get('rules', [])
|
||||
|
||||
@@ -1141,7 +1165,8 @@ exit 1
|
||||
@@ -1132,7 +1171,8 @@ exit 1
|
||||
groups = [x for x in groups if not x.endswith('_excluded')]
|
||||
for group in groups:
|
||||
for item in rule.get(group, []):
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
diff --git a/build/common.gypi b/build/common.gypi
|
||||
index 1affc70..c0d2f6a 100644
|
||||
index 1affc70..0677e4b 100644
|
||||
--- a/build/common.gypi
|
||||
+++ b/build/common.gypi
|
||||
@@ -66,6 +66,11 @@
|
||||
@@ -66,6 +66,13 @@
|
||||
'conditions': [
|
||||
['clang!=0', {
|
||||
'CLANG_CXX_LANGUAGE_STANDARD': 'c++11', # -std=c++11
|
||||
@@ -10,11 +10,13 @@ index 1affc70..c0d2f6a 100644
|
||||
+ 'OTHER_LDFLAGS': [
|
||||
+ '/usr/local/macold/lib/libc++.a',
|
||||
+ '/usr/local/macold/lib/libc++abi.a',
|
||||
+ '-isysroot/',
|
||||
+ '-L/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/lib/',
|
||||
+ ],
|
||||
|
||||
# Don't link in libarclite_macosx.a, see http://crbug.com/156530.
|
||||
'CLANG_LINK_OBJC_RUNTIME': 'NO', # -fno-objc-link-runtime
|
||||
@@ -116,6 +121,9 @@
|
||||
@@ -116,6 +123,9 @@
|
||||
],
|
||||
|
||||
},
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
diff --git a/mkspecs/common/msvc-desktop.conf b/mkspecs/common/msvc-desktop.conf
|
||||
index eec9e1f..7ae53c7 100644
|
||||
index eec9e1f688..7ae53c7a1e 100644
|
||||
--- a/mkspecs/common/msvc-desktop.conf
|
||||
+++ b/mkspecs/common/msvc-desktop.conf
|
||||
@@ -30,9 +30,10 @@ QMAKE_YACCFLAGS = -d
|
||||
@@ -17,7 +17,7 @@ index eec9e1f..7ae53c7 100644
|
||||
QMAKE_CFLAGS_LTCG = -GL
|
||||
QMAKE_CFLAGS_SSE2 = -arch:SSE2
|
||||
diff --git a/src/corelib/io/qfsfileengine_win.cpp b/src/corelib/io/qfsfileengine_win.cpp
|
||||
index 391fbcc..d07802b 100644
|
||||
index 391fbcc519..d07802bb7a 100644
|
||||
--- a/src/corelib/io/qfsfileengine_win.cpp
|
||||
+++ b/src/corelib/io/qfsfileengine_win.cpp
|
||||
@@ -427,11 +427,12 @@ qint64 QFSFileEnginePrivate::nativeWrite(const char *data, qint64 len)
|
||||
@@ -36,7 +36,7 @@ index 391fbcc..d07802b 100644
|
||||
// Note: Only return error if the first WriteFile failed.
|
||||
q->setError(QFile::WriteError, qt_error_string());
|
||||
diff --git a/src/corelib/tools/qunicodetables.cpp b/src/corelib/tools/qunicodetables.cpp
|
||||
index 14e4fd1..0619a17 100644
|
||||
index 14e4fd10aa..0619a176a7 100644
|
||||
--- a/src/corelib/tools/qunicodetables.cpp
|
||||
+++ b/src/corelib/tools/qunicodetables.cpp
|
||||
@@ -6227,7 +6227,8 @@ static const Properties uc_properties[] = {
|
||||
@@ -50,7 +50,7 @@ index 14e4fd1..0619a17 100644
|
||||
{ 3, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 14, 9, 11, 11 },
|
||||
{ 3, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 14, 9, 11, 11 },
|
||||
diff --git a/src/gui/kernel/qhighdpiscaling.cpp b/src/gui/kernel/qhighdpiscaling.cpp
|
||||
index 2d00b9d..eeba86e 100644
|
||||
index 2d00b9dce9..eeba86e936 100644
|
||||
--- a/src/gui/kernel/qhighdpiscaling.cpp
|
||||
+++ b/src/gui/kernel/qhighdpiscaling.cpp
|
||||
@@ -51,6 +51,9 @@ static const char screenFactorsEnvVar[] = "QT_SCREEN_SCALE_FACTORS";
|
||||
@@ -64,7 +64,7 @@ index 2d00b9d..eeba86e 100644
|
||||
qreal result = 1;
|
||||
if (qEnvironmentVariableIsSet(scaleFactorEnvVar)) {
|
||||
diff --git a/src/gui/kernel/qplatformdialoghelper.h b/src/gui/kernel/qplatformdialoghelper.h
|
||||
index 5b2f4ec..790db46 100644
|
||||
index 5b2f4ece77..790db46d25 100644
|
||||
--- a/src/gui/kernel/qplatformdialoghelper.h
|
||||
+++ b/src/gui/kernel/qplatformdialoghelper.h
|
||||
@@ -386,6 +386,10 @@ public:
|
||||
@@ -79,7 +79,7 @@ index 5b2f4ec..790db46 100644
|
||||
virtual void selectNameFilter(const QString &filter) = 0;
|
||||
virtual QString selectedNameFilter() const = 0;
|
||||
diff --git a/src/gui/kernel/qwindow.cpp b/src/gui/kernel/qwindow.cpp
|
||||
index bcd29b6..bcb0672 100644
|
||||
index bcd29b6fe1..bcb0672f69 100644
|
||||
--- a/src/gui/kernel/qwindow.cpp
|
||||
+++ b/src/gui/kernel/qwindow.cpp
|
||||
@@ -2525,7 +2525,8 @@ void QWindowPrivate::setCursor(const QCursor *newCursor)
|
||||
@@ -93,7 +93,7 @@ index bcd29b6..bcb0672 100644
|
||||
QCursor *c = QGuiApplication::overrideCursor();
|
||||
if (!c && hasCursor)
|
||||
diff --git a/src/gui/painting/qpaintengine_p.h b/src/gui/painting/qpaintengine_p.h
|
||||
index 918c989..4158259 100644
|
||||
index 918c98997b..4158259743 100644
|
||||
--- a/src/gui/painting/qpaintengine_p.h
|
||||
+++ b/src/gui/painting/qpaintengine_p.h
|
||||
@@ -80,8 +80,18 @@ public:
|
||||
@@ -117,7 +117,7 @@ index 918c989..4158259 100644
|
||||
|
||||
// Make sure we're inside the viewport.
|
||||
diff --git a/src/gui/text/qtextengine_p.h b/src/gui/text/qtextengine_p.h
|
||||
index 7e507bb..936e7a9 100644
|
||||
index 7e507bba2d..936e7a92cb 100644
|
||||
--- a/src/gui/text/qtextengine_p.h
|
||||
+++ b/src/gui/text/qtextengine_p.h
|
||||
@@ -283,7 +283,8 @@ private:
|
||||
@@ -131,7 +131,7 @@ index 7e507bb..936e7a9 100644
|
||||
public:
|
||||
inline QTextItemInt()
|
||||
diff --git a/src/gui/text/qtextlayout.cpp b/src/gui/text/qtextlayout.cpp
|
||||
index aca475a..5fa0be2 100644
|
||||
index aca475a581..5fa0be2c45 100644
|
||||
--- a/src/gui/text/qtextlayout.cpp
|
||||
+++ b/src/gui/text/qtextlayout.cpp
|
||||
@@ -694,6 +694,9 @@ int QTextLayout::nextCursorPosition(int oldPos, CursorMode mode) const
|
||||
@@ -208,7 +208,7 @@ index aca475a..5fa0be2 100644
|
||||
|
||||
static const QFixed RightBearingNotCalculated;
|
||||
diff --git a/src/gui/text/qtextlayout.h b/src/gui/text/qtextlayout.h
|
||||
index f74d4d4..8ad672c 100644
|
||||
index f74d4d4229..8ad672c9fe 100644
|
||||
--- a/src/gui/text/qtextlayout.h
|
||||
+++ b/src/gui/text/qtextlayout.h
|
||||
@@ -196,6 +196,9 @@ private:
|
||||
@@ -222,7 +222,7 @@ index f74d4d4..8ad672c 100644
|
||||
|
||||
|
||||
diff --git a/src/network/access/qhttpnetworkconnection.cpp b/src/network/access/qhttpnetworkconnection.cpp
|
||||
index c4cb8e6..45793e3 100644
|
||||
index c4cb8e65c0..45793e364f 100644
|
||||
--- a/src/network/access/qhttpnetworkconnection.cpp
|
||||
+++ b/src/network/access/qhttpnetworkconnection.cpp
|
||||
@@ -110,6 +110,8 @@ QHttpNetworkConnectionPrivate::~QHttpNetworkConnectionPrivate()
|
||||
@@ -235,7 +235,7 @@ index c4cb8e6..45793e3 100644
|
||||
delete channels[i].socket;
|
||||
}
|
||||
diff --git a/src/network/socket/qnativesocketengine_win.cpp b/src/network/socket/qnativesocketengine_win.cpp
|
||||
index 41834b2..8cdf4ab 100644
|
||||
index 41834b21ae..8cdf4ab145 100644
|
||||
--- a/src/network/socket/qnativesocketengine_win.cpp
|
||||
+++ b/src/network/socket/qnativesocketengine_win.cpp
|
||||
@@ -675,6 +675,13 @@ bool QNativeSocketEnginePrivate::nativeConnect(const QHostAddress &address, quin
|
||||
@@ -252,8 +252,26 @@ index 41834b2..8cdf4ab 100644
|
||||
if (value == WSAEADDRNOTAVAIL) {
|
||||
setError(QAbstractSocket::NetworkError, AddressNotAvailableErrorString);
|
||||
socketState = QAbstractSocket::UnconnectedState;
|
||||
diff --git a/src/platformsupport/cglconvenience/cglconvenience.mm b/src/platformsupport/cglconvenience/cglconvenience.mm
|
||||
index fb609ae485..7cca45ded4 100644
|
||||
--- a/src/platformsupport/cglconvenience/cglconvenience.mm
|
||||
+++ b/src/platformsupport/cglconvenience/cglconvenience.mm
|
||||
@@ -128,7 +128,12 @@ void *qcgl_createNSOpenGLPixelFormat(const QSurfaceFormat &format)
|
||||
if (format.stereo())
|
||||
attrs << NSOpenGLPFAStereo;
|
||||
|
||||
- attrs << NSOpenGLPFAAllowOfflineRenderers;
|
||||
+ // Patch: Fix macOS regression. On 10.14.4, it crashes on GPU switches.
|
||||
+ // See https://bugreports.qt.io/browse/QTCREATORBUG-22215
|
||||
+ static const QAppleOperatingSystemVersion version = qt_apple_os_version();
|
||||
+ if (!(version.major == 10 && version.minor == 14 && version.patch == 4)) {
|
||||
+ attrs << NSOpenGLPFAAllowOfflineRenderers;
|
||||
+ }
|
||||
|
||||
QByteArray useLayer = qgetenv("QT_MAC_WANTS_LAYER");
|
||||
if (!useLayer.isEmpty() && useLayer.toInt() > 0) {
|
||||
diff --git a/src/platformsupport/dbustray/qdbustrayicon.cpp b/src/platformsupport/dbustray/qdbustrayicon.cpp
|
||||
index 4d6e707..9bdb0be 100644
|
||||
index 4d6e70720d..9bdb0beb67 100644
|
||||
--- a/src/platformsupport/dbustray/qdbustrayicon.cpp
|
||||
+++ b/src/platformsupport/dbustray/qdbustrayicon.cpp
|
||||
@@ -58,9 +58,18 @@ QT_BEGIN_NAMESPACE
|
||||
@@ -290,7 +308,7 @@ index 4d6e707..9bdb0be 100644
|
||||
}
|
||||
if (!necessary)
|
||||
diff --git a/src/platformsupport/fontdatabases/basic/qbasicfontdatabase.cpp b/src/platformsupport/fontdatabases/basic/qbasicfontdatabase.cpp
|
||||
index 728b166..1dc6459 100644
|
||||
index 728b166b71..1dc64593e1 100644
|
||||
--- a/src/platformsupport/fontdatabases/basic/qbasicfontdatabase.cpp
|
||||
+++ b/src/platformsupport/fontdatabases/basic/qbasicfontdatabase.cpp
|
||||
@@ -172,6 +172,79 @@ void QBasicFontDatabase::releaseHandle(void *handle)
|
||||
@@ -388,7 +406,7 @@ index 728b166..1dc6459 100644
|
||||
if (error != FT_Err_Ok) {
|
||||
qDebug() << "FT_New_Face failed with index" << index << ':' << hex << error;
|
||||
diff --git a/src/platformsupport/fontdatabases/fontconfig/qfontconfigdatabase.cpp b/src/platformsupport/fontdatabases/fontconfig/qfontconfigdatabase.cpp
|
||||
index 8ebabf3..7bb8abd 100644
|
||||
index 8ebabf3419..7bb8abd0d0 100644
|
||||
--- a/src/platformsupport/fontdatabases/fontconfig/qfontconfigdatabase.cpp
|
||||
+++ b/src/platformsupport/fontdatabases/fontconfig/qfontconfigdatabase.cpp
|
||||
@@ -375,6 +375,17 @@ static void populateFromPattern(FcPattern *pattern)
|
||||
@@ -450,7 +468,7 @@ index 8ebabf3..7bb8abd 100644
|
||||
}
|
||||
populateFromPattern(pattern);
|
||||
diff --git a/src/platformsupport/fontdatabases/mac/qcoretextfontdatabase.mm b/src/platformsupport/fontdatabases/mac/qcoretextfontdatabase.mm
|
||||
index 566abf2..5c5fde9 100644
|
||||
index 566abf2126..5c5fde9813 100644
|
||||
--- a/src/platformsupport/fontdatabases/mac/qcoretextfontdatabase.mm
|
||||
+++ b/src/platformsupport/fontdatabases/mac/qcoretextfontdatabase.mm
|
||||
@@ -265,6 +265,13 @@ static void getFontDescription(CTFontDescriptorRef font, FontDescription *fd)
|
||||
@@ -482,7 +500,7 @@ index 566abf2..5c5fde9 100644
|
||||
if (CFNumberRef italic = (CFNumberRef) CFDictionaryGetValue(styles, kCTFontSlantTrait)) {
|
||||
double d;
|
||||
diff --git a/src/platformsupport/fontdatabases/mac/qfontengine_coretext.mm b/src/platformsupport/fontdatabases/mac/qfontengine_coretext.mm
|
||||
index 7b45958..2ed2fd9 100644
|
||||
index 7b459584ea..2ed2fd9b3b 100644
|
||||
--- a/src/platformsupport/fontdatabases/mac/qfontengine_coretext.mm
|
||||
+++ b/src/platformsupport/fontdatabases/mac/qfontengine_coretext.mm
|
||||
@@ -764,7 +764,8 @@ void QCoreTextFontEngine::getUnscaledGlyph(glyph_t glyph, QPainterPath *path, gl
|
||||
@@ -496,7 +514,7 @@ index 7b45958..2ed2fd9 100644
|
||||
|
||||
QFontEngine *QCoreTextFontEngine::cloneWithSize(qreal pixelSize) const
|
||||
diff --git a/src/plugins/platforminputcontexts/compose/compose.pro b/src/plugins/platforminputcontexts/compose/compose.pro
|
||||
index 86bdd47..9b9c8de 100644
|
||||
index 86bdd4729b..9b9c8ded08 100644
|
||||
--- a/src/plugins/platforminputcontexts/compose/compose.pro
|
||||
+++ b/src/plugins/platforminputcontexts/compose/compose.pro
|
||||
@@ -15,7 +15,8 @@ HEADERS += $$PWD/qcomposeplatforminputcontext.h \
|
||||
@@ -510,7 +528,7 @@ index 86bdd47..9b9c8de 100644
|
||||
LIBS += $$QMAKE_LIBS_XKBCOMMON
|
||||
QMAKE_CXXFLAGS += $$QMAKE_CFLAGS_XKBCOMMON
|
||||
diff --git a/src/plugins/platforminputcontexts/compose/qcomposeplatforminputcontext.cpp b/src/plugins/platforminputcontexts/compose/qcomposeplatforminputcontext.cpp
|
||||
index d1bea9a..36a15a6 100644
|
||||
index d1bea9af23..36a15a6473 100644
|
||||
--- a/src/plugins/platforminputcontexts/compose/qcomposeplatforminputcontext.cpp
|
||||
+++ b/src/plugins/platforminputcontexts/compose/qcomposeplatforminputcontext.cpp
|
||||
@@ -232,6 +232,12 @@ bool QComposeInputContext::checkComposeTable()
|
||||
@@ -527,7 +545,7 @@ index d1bea9a..36a15a6 100644
|
||||
event.setCommitString(QChar(character));
|
||||
QCoreApplication::sendEvent(m_focusObject, &event);
|
||||
diff --git a/src/plugins/platforminputcontexts/platforminputcontexts.pro b/src/plugins/platforminputcontexts/platforminputcontexts.pro
|
||||
index faea54b..fe4a837 100644
|
||||
index faea54b874..fe4a837511 100644
|
||||
--- a/src/plugins/platforminputcontexts/platforminputcontexts.pro
|
||||
+++ b/src/plugins/platforminputcontexts/platforminputcontexts.pro
|
||||
@@ -1,7 +1,8 @@
|
||||
@@ -541,7 +559,7 @@ index faea54b..fe4a837 100644
|
||||
|
||||
contains(QT_CONFIG, xcb-plugin): SUBDIRS += compose
|
||||
diff --git a/src/plugins/platforms/cocoa/qcocoaapplicationdelegate.mm b/src/plugins/platforms/cocoa/qcocoaapplicationdelegate.mm
|
||||
index caa8884..9dc3bc1 100644
|
||||
index caa8884661..9dc3bc1661 100644
|
||||
--- a/src/plugins/platforms/cocoa/qcocoaapplicationdelegate.mm
|
||||
+++ b/src/plugins/platforms/cocoa/qcocoaapplicationdelegate.mm
|
||||
@@ -210,7 +210,8 @@ QT_END_NAMESPACE
|
||||
@@ -572,7 +590,7 @@ index caa8884..9dc3bc1 100644
|
||||
}
|
||||
|
||||
diff --git a/src/plugins/platforms/cocoa/qcocoabackingstore.h b/src/plugins/platforms/cocoa/qcocoabackingstore.h
|
||||
index 934f68a..3ece698 100644
|
||||
index 934f68ad18..3ece6984ac 100644
|
||||
--- a/src/plugins/platforms/cocoa/qcocoabackingstore.h
|
||||
+++ b/src/plugins/platforms/cocoa/qcocoabackingstore.h
|
||||
@@ -64,6 +64,9 @@ public:
|
||||
@@ -586,7 +604,7 @@ index 934f68a..3ece698 100644
|
||||
|
||||
QT_END_NAMESPACE
|
||||
diff --git a/src/plugins/platforms/cocoa/qcocoabackingstore.mm b/src/plugins/platforms/cocoa/qcocoabackingstore.mm
|
||||
index ca92103..f27ea15 100644
|
||||
index ca92103826..f27ea15bad 100644
|
||||
--- a/src/plugins/platforms/cocoa/qcocoabackingstore.mm
|
||||
+++ b/src/plugins/platforms/cocoa/qcocoabackingstore.mm
|
||||
@@ -38,7 +38,8 @@
|
||||
@@ -624,7 +642,7 @@ index ca92103..f27ea15 100644
|
||||
p.setCompositionMode(QPainter::CompositionMode_Source);
|
||||
const QVector<QRect> rects = region.rects();
|
||||
diff --git a/src/plugins/platforms/cocoa/qcocoahelpers.mm b/src/plugins/platforms/cocoa/qcocoahelpers.mm
|
||||
index 058209d..6af61e7 100644
|
||||
index 058209da7e..6af61e7dab 100644
|
||||
--- a/src/plugins/platforms/cocoa/qcocoahelpers.mm
|
||||
+++ b/src/plugins/platforms/cocoa/qcocoahelpers.mm
|
||||
@@ -546,9 +546,9 @@ OSStatus qt_mac_drawCGImage(CGContextRef inContext, const CGRect *inBounds, CGIm
|
||||
@@ -654,7 +672,7 @@ index 058209d..6af61e7 100644
|
||||
}
|
||||
|
||||
diff --git a/src/plugins/platforms/cocoa/qcocoakeymapper.mm b/src/plugins/platforms/cocoa/qcocoakeymapper.mm
|
||||
index c2d206f..9b97398 100644
|
||||
index c2d206fb45..9b9739862d 100644
|
||||
--- a/src/plugins/platforms/cocoa/qcocoakeymapper.mm
|
||||
+++ b/src/plugins/platforms/cocoa/qcocoakeymapper.mm
|
||||
@@ -384,6 +384,12 @@ bool QCocoaKeyMapper::updateKeyboard()
|
||||
@@ -681,7 +699,7 @@ index c2d206f..9b97398 100644
|
||||
}
|
||||
return ret;
|
||||
diff --git a/src/plugins/platforms/cocoa/qcocoasystemtrayicon.mm b/src/plugins/platforms/cocoa/qcocoasystemtrayicon.mm
|
||||
index 8152c57..87ba2f3 100644
|
||||
index 8152c57ffd..87ba2f3f72 100644
|
||||
--- a/src/plugins/platforms/cocoa/qcocoasystemtrayicon.mm
|
||||
+++ b/src/plugins/platforms/cocoa/qcocoasystemtrayicon.mm
|
||||
@@ -94,6 +94,8 @@ QT_USE_NAMESPACE
|
||||
@@ -821,7 +839,7 @@ index 8152c57..87ba2f3 100644
|
||||
}
|
||||
}
|
||||
diff --git a/src/plugins/platforms/cocoa/qcocoawindow.mm b/src/plugins/platforms/cocoa/qcocoawindow.mm
|
||||
index c0d5904..f3c2047 100644
|
||||
index c0d5904367..f3c2047196 100644
|
||||
--- a/src/plugins/platforms/cocoa/qcocoawindow.mm
|
||||
+++ b/src/plugins/platforms/cocoa/qcocoawindow.mm
|
||||
@@ -141,7 +141,8 @@ static bool isMouseEvent(NSEvent *ev)
|
||||
@@ -883,7 +901,7 @@ index c0d5904..f3c2047 100644
|
||||
[iconButton setImage:image];
|
||||
[image release];
|
||||
diff --git a/src/plugins/platforms/cocoa/qnsview.mm b/src/plugins/platforms/cocoa/qnsview.mm
|
||||
index c67bcfd..2616f42 100644
|
||||
index c67bcfd23b..6a60670aee 100644
|
||||
--- a/src/plugins/platforms/cocoa/qnsview.mm
|
||||
+++ b/src/plugins/platforms/cocoa/qnsview.mm
|
||||
@@ -647,6 +647,12 @@ QT_WARNING_POP
|
||||
@@ -957,8 +975,19 @@ index c67bcfd..2616f42 100644
|
||||
- (void)cancelOperation:(id)sender
|
||||
{
|
||||
Q_UNUSED(sender);
|
||||
@@ -1981,6 +2006,10 @@ static QPoint mapWindowCoordinates(QWindow *source, QWindow *target, QPoint poin
|
||||
// change the cursor
|
||||
[nativeCursor set];
|
||||
|
||||
+ // Patch: Backport a fix from cd08753d3e. Starting with macOS Mojave this requires accessibility access.
|
||||
+ if (QSysInfo::macVersion() >= Q_MV_OSX(10, 14))
|
||||
+ return;
|
||||
+
|
||||
// Make sure the cursor is updated correctly if the mouse does not move and window is under cursor
|
||||
// by creating a fake move event
|
||||
if (m_updatingDrag)
|
||||
diff --git a/src/plugins/platforms/windows/qwindowsdialoghelpers.cpp b/src/plugins/platforms/windows/qwindowsdialoghelpers.cpp
|
||||
index 94bb71e..16ab51e 100644
|
||||
index 94bb71e429..16ab51e166 100644
|
||||
--- a/src/plugins/platforms/windows/qwindowsdialoghelpers.cpp
|
||||
+++ b/src/plugins/platforms/windows/qwindowsdialoghelpers.cpp
|
||||
@@ -716,12 +716,20 @@ public:
|
||||
@@ -1163,7 +1192,7 @@ index 94bb71e..16ab51e 100644
|
||||
{
|
||||
m_data.setSelectedNameFilter(f); // Dialog cannot be updated at run-time.
|
||||
diff --git a/src/plugins/platforms/windows/qwindowskeymapper.cpp b/src/plugins/platforms/windows/qwindowskeymapper.cpp
|
||||
index 1e58b9b..1741c21 100644
|
||||
index 1e58b9b3d4..1741c21a1c 100644
|
||||
--- a/src/plugins/platforms/windows/qwindowskeymapper.cpp
|
||||
+++ b/src/plugins/platforms/windows/qwindowskeymapper.cpp
|
||||
@@ -1268,6 +1268,10 @@ QList<int> QWindowsKeyMapper::possibleKeys(const QKeyEvent *e) const
|
||||
@@ -1178,7 +1207,7 @@ index 1e58b9b..1741c21 100644
|
||||
if (!kbItem.exists)
|
||||
return result;
|
||||
diff --git a/src/plugins/platforms/windows/qwindowsservices.cpp b/src/plugins/platforms/windows/qwindowsservices.cpp
|
||||
index 1d23a9d..640cd42 100644
|
||||
index 1d23a9d9b9..640cd426ed 100644
|
||||
--- a/src/plugins/platforms/windows/qwindowsservices.cpp
|
||||
+++ b/src/plugins/platforms/windows/qwindowsservices.cpp
|
||||
@@ -127,6 +127,10 @@ static inline bool launchMail(const QUrl &url)
|
||||
@@ -1193,7 +1222,7 @@ index 1d23a9d..640cd42 100644
|
||||
// but that cannot handle a Windows command line [yet].
|
||||
command.replace(QStringLiteral("%1"), url.toString(QUrl::FullyEncoded));
|
||||
diff --git a/src/plugins/platforms/windows/qwindowswindow.cpp b/src/plugins/platforms/windows/qwindowswindow.cpp
|
||||
index b38d7c2..34f19c4 100644
|
||||
index b38d7c29ae..34f19c4efa 100644
|
||||
--- a/src/plugins/platforms/windows/qwindowswindow.cpp
|
||||
+++ b/src/plugins/platforms/windows/qwindowswindow.cpp
|
||||
@@ -1020,7 +1020,8 @@ void QWindowsWindow::destroyWindow()
|
||||
@@ -1247,7 +1276,7 @@ index b38d7c2..34f19c4 100644
|
||||
break;
|
||||
}
|
||||
diff --git a/src/plugins/platforms/windows/qwindowswindow.h b/src/plugins/platforms/windows/qwindowswindow.h
|
||||
index 6fffa1e..cb1c9c1 100644
|
||||
index 6fffa1e6e9..cb1c9c1161 100644
|
||||
--- a/src/plugins/platforms/windows/qwindowswindow.h
|
||||
+++ b/src/plugins/platforms/windows/qwindowswindow.h
|
||||
@@ -265,6 +265,10 @@ private:
|
||||
@@ -1262,7 +1291,7 @@ index 6fffa1e..cb1c9c1 100644
|
||||
inline bool isDropSiteEnabled() const { return m_dropTarget != 0; }
|
||||
void setDropSiteEnabled(bool enabled);
|
||||
diff --git a/src/plugins/platforms/xcb/qxcbnativeinterface.cpp b/src/plugins/platforms/xcb/qxcbnativeinterface.cpp
|
||||
index 09e7ecf..c0f15a4 100644
|
||||
index 09e7ecf3a3..c0f15a4242 100644
|
||||
--- a/src/plugins/platforms/xcb/qxcbnativeinterface.cpp
|
||||
+++ b/src/plugins/platforms/xcb/qxcbnativeinterface.cpp
|
||||
@@ -79,7 +79,10 @@ static int resourceType(const QByteArray &key)
|
||||
@@ -1292,7 +1321,7 @@ index 09e7ecf..c0f15a4 100644
|
||||
break;
|
||||
}
|
||||
diff --git a/src/plugins/platforms/xcb/qxcbnativeinterface.h b/src/plugins/platforms/xcb/qxcbnativeinterface.h
|
||||
index f88b710..6f818a5 100644
|
||||
index f88b710864..6f818a5a72 100644
|
||||
--- a/src/plugins/platforms/xcb/qxcbnativeinterface.h
|
||||
+++ b/src/plugins/platforms/xcb/qxcbnativeinterface.h
|
||||
@@ -68,7 +68,10 @@ public:
|
||||
@@ -1308,7 +1337,7 @@ index f88b710..6f818a5 100644
|
||||
|
||||
QXcbNativeInterface();
|
||||
diff --git a/src/widgets/dialogs/qfiledialog.cpp b/src/widgets/dialogs/qfiledialog.cpp
|
||||
index bc2de89..aa8f8df 100644
|
||||
index bc2de899f5..aa8f8df4ad 100644
|
||||
--- a/src/widgets/dialogs/qfiledialog.cpp
|
||||
+++ b/src/widgets/dialogs/qfiledialog.cpp
|
||||
@@ -1200,6 +1200,15 @@ QList<QUrl> QFileDialogPrivate::userSelectedFiles() const
|
||||
@@ -1343,7 +1372,7 @@ index bc2de89..aa8f8df 100644
|
||||
Returns a list of urls containing the selected files in the dialog.
|
||||
If no files are selected, or the mode is not ExistingFiles or
|
||||
diff --git a/src/widgets/dialogs/qfiledialog.h b/src/widgets/dialogs/qfiledialog.h
|
||||
index ffe49a2..42dc563 100644
|
||||
index ffe49a2dd2..42dc563c8a 100644
|
||||
--- a/src/widgets/dialogs/qfiledialog.h
|
||||
+++ b/src/widgets/dialogs/qfiledialog.h
|
||||
@@ -108,6 +108,9 @@ public:
|
||||
@@ -1357,7 +1386,7 @@ index ffe49a2..42dc563 100644
|
||||
QList<QUrl> selectedUrls() const;
|
||||
|
||||
diff --git a/src/widgets/dialogs/qfiledialog_p.h b/src/widgets/dialogs/qfiledialog_p.h
|
||||
index f610e46..547a646 100644
|
||||
index f610e46f83..547a64695a 100644
|
||||
--- a/src/widgets/dialogs/qfiledialog_p.h
|
||||
+++ b/src/widgets/dialogs/qfiledialog_p.h
|
||||
@@ -123,6 +123,10 @@ public:
|
||||
@@ -1398,7 +1427,7 @@ index f610e46..547a646 100644
|
||||
{
|
||||
if (QPlatformFileDialogHelper *helper = platformFileDialogHelper())
|
||||
diff --git a/src/widgets/kernel/qwidget.cpp b/src/widgets/kernel/qwidget.cpp
|
||||
index b1d80d7..42e32fd 100644
|
||||
index b1d80d7b8f..42e32fd404 100644
|
||||
--- a/src/widgets/kernel/qwidget.cpp
|
||||
+++ b/src/widgets/kernel/qwidget.cpp
|
||||
@@ -5138,6 +5138,17 @@ void QWidget::render(QPainter *painter, const QPoint &targetOffset,
|
||||
@@ -1451,7 +1480,7 @@ index b1d80d7..42e32fd 100644
|
||||
|| (k->key() == Qt::Key_Tab && (k->modifiers() & Qt::ShiftModifier)))
|
||||
res = focusNextPrevChild(false);
|
||||
diff --git a/src/widgets/util/qsystemtrayicon.cpp b/src/widgets/util/qsystemtrayicon.cpp
|
||||
index 704142f..7c4340e 100644
|
||||
index 704142fe5c..7c4340e459 100644
|
||||
--- a/src/widgets/util/qsystemtrayicon.cpp
|
||||
+++ b/src/widgets/util/qsystemtrayicon.cpp
|
||||
@@ -709,6 +709,10 @@ void QSystemTrayIconPrivate::updateMenu_sys_qpa()
|
||||
@@ -1466,7 +1495,7 @@ index 704142f..7c4340e 100644
|
||||
}
|
||||
|
||||
diff --git a/src/widgets/widgets/qabstractscrollarea.cpp b/src/widgets/widgets/qabstractscrollarea.cpp
|
||||
index 2e2a042..472e377 100644
|
||||
index 2e2a042bf1..472e37722b 100644
|
||||
--- a/src/widgets/widgets/qabstractscrollarea.cpp
|
||||
+++ b/src/widgets/widgets/qabstractscrollarea.cpp
|
||||
@@ -640,15 +640,22 @@ scrolling range.
|
||||
@@ -1497,7 +1526,7 @@ index 2e2a042..472e377 100644
|
||||
}
|
||||
|
||||
diff --git a/src/widgets/widgets/qwidgetlinecontrol.cpp b/src/widgets/widgets/qwidgetlinecontrol.cpp
|
||||
index daf9f00..57499dc 100644
|
||||
index daf9f00c46..57499dc4a4 100644
|
||||
--- a/src/widgets/widgets/qwidgetlinecontrol.cpp
|
||||
+++ b/src/widgets/widgets/qwidgetlinecontrol.cpp
|
||||
@@ -40,6 +40,11 @@
|
||||
@@ -1539,7 +1568,7 @@ index daf9f00..57499dc 100644
|
||||
#ifndef QT_NO_COMPLETER
|
||||
complete(event->key());
|
||||
diff --git a/src/widgets/widgets/qwidgettextcontrol.cpp b/src/widgets/widgets/qwidgettextcontrol.cpp
|
||||
index deca002..8a2023f 100644
|
||||
index deca002bf5..8a2023f503 100644
|
||||
--- a/src/widgets/widgets/qwidgettextcontrol.cpp
|
||||
+++ b/src/widgets/widgets/qwidgettextcontrol.cpp
|
||||
@@ -71,6 +71,11 @@
|
||||
|
||||
@@ -92,7 +92,7 @@ msgServiceFont: semiboldFont;
|
||||
msgServiceNameFont: semiboldFont;
|
||||
msgServicePhotoWidth: 100px;
|
||||
msgDateFont: font(13px);
|
||||
msgMinWidth: 190px;
|
||||
msgMinWidth: 160px;
|
||||
msgPhotoSize: 33px;
|
||||
msgPhotoSkip: 40px;
|
||||
msgPadding: margins(13px, 7px, 13px, 8px);
|
||||
@@ -258,19 +258,6 @@ videoIcon: icon {
|
||||
};
|
||||
locationSize: size(320px, 240px);
|
||||
|
||||
webPageLeft: 10px;
|
||||
webPageBar: 2px;
|
||||
webPageTitleFont: semiboldFont;
|
||||
webPageTitleStyle: semiboldTextStyle;
|
||||
webPageTitleOutFg: historyTextOutFg;
|
||||
webPageTitleInFg: historyTextInFg;
|
||||
webPageDescriptionOutFg: historyTextOutFg;
|
||||
webPageDescriptionInFg: historyTextInFg;
|
||||
webPageDescriptionFont: normalFont;
|
||||
webPageDescriptionStyle: defaultTextStyle;
|
||||
webPagePhotoSize: 100px;
|
||||
webPagePhotoDelta: 8px;
|
||||
|
||||
mediaPlayerSuppressDuration: 150;
|
||||
|
||||
botDescSkip: 8px;
|
||||
@@ -307,4 +294,7 @@ notifyFadeRight: icon {{ "fade_horizontal", notificationBg }};
|
||||
stickerIconLeft: icon {{ "fade_horizontal-flip_horizontal", emojiPanCategories }};
|
||||
stickerIconRight: icon {{ "fade_horizontal", emojiPanCategories }};
|
||||
|
||||
emojiSuggestionsFadeLeft: icon {{ "fade_horizontal-flip_horizontal", boxBg }};
|
||||
emojiSuggestionsFadeRight: icon {{ "fade_horizontal", boxBg }};
|
||||
|
||||
transparentPlaceholderSize: 4px;
|
||||
|
||||
@@ -193,6 +193,7 @@ dialogsSentIconFg: #5dc452; // chat list sent message tick / double tick icon
|
||||
dialogsUnreadBg: windowBgActive; // chat list unread badge background for not muted chat
|
||||
dialogsUnreadBgMuted: #bbbbbb; // chat list unread badge background for muted chat
|
||||
dialogsUnreadFg: windowFgActive; // chat list unread badge text
|
||||
dialogsArchiveFg: #525252 | dialogsNameFg; // chat list archive name text
|
||||
|
||||
dialogsBgOver: windowBgOver; // chat list background with mouse over
|
||||
dialogsNameFgOver: windowBoldFgOver; // chat list name text with mouse over
|
||||
@@ -208,6 +209,7 @@ dialogsSentIconFgOver: dialogsSentIconFg; // chat list sent message tick / doubl
|
||||
dialogsUnreadBgOver: dialogsUnreadBg; // chat list unread badge background for not muted chat with mouse over
|
||||
dialogsUnreadBgMutedOver: dialogsUnreadBgMuted; // chat list unread badge background for muted chat with mouse over
|
||||
dialogsUnreadFgOver: dialogsUnreadFg; // chat list unread badge text with mouse over
|
||||
dialogsArchiveFgOver: #525252 | dialogsNameFgOver; // chat list archive name text
|
||||
|
||||
dialogsBgActive: #419fd9; // chat list background for current (active) chat
|
||||
dialogsNameFgActive: windowFgActive; // chat list name text for current (active) chat
|
||||
@@ -304,6 +306,7 @@ historyPeer8NameFgSelected: historyPeer8NameFg; // orange group member name in a
|
||||
historyPeer8UserpicBg: #faa774; // orange userpic background
|
||||
historyPeerUserpicFg: windowFgActive; // default userpic initials
|
||||
historyPeerSavedMessagesBg: historyPeer4UserpicBg; // saved messages userpic background
|
||||
historyPeerArchiveUserpicBg: dialogsUnreadBgMuted; // archive folder userpic background
|
||||
|
||||
// Some values are marked as (adjusted), it means they're adjusted by
|
||||
// hue and saturation of the average background color if user chooses
|
||||
@@ -550,3 +553,7 @@ callBarFg: dialogsNameFgActive; // phone call bar text and icons
|
||||
importantTooltipBg: toastBg;
|
||||
importantTooltipFg: toastFg;
|
||||
importantTooltipFgLink: mediaviewTextLinkFg;
|
||||
|
||||
outdatedFg: #ffffff;
|
||||
outdateSoonBg: #e08543;
|
||||
outdatedBg: #e05745;
|
||||
|
||||
BIN
Telegram/Resources/emoji/set0_preview.webp
Normal file
|
After Width: | Height: | Size: 13 KiB |
BIN
Telegram/Resources/emoji/set1_preview.webp
Normal file
|
After Width: | Height: | Size: 14 KiB |
BIN
Telegram/Resources/emoji/set2_preview.webp
Normal file
|
After Width: | Height: | Size: 10 KiB |
BIN
Telegram/Resources/emoji/set3_preview.webp
Normal file
|
After Width: | Height: | Size: 13 KiB |
@@ -311,7 +311,8 @@ div.selected {
|
||||
background-position: 12px 12px;
|
||||
background-size: 24px 24px;
|
||||
}
|
||||
.default .media .title {
|
||||
.default .media .title,
|
||||
.default .media_poll .question {
|
||||
padding-top: 4px;
|
||||
font-size: 14px;
|
||||
}
|
||||
|
||||
BIN
Telegram/Resources/icons/archive_userpic.png
Normal file
|
After Width: | Height: | Size: 449 B |
BIN
Telegram/Resources/icons/archive_userpic@2x.png
Normal file
|
After Width: | Height: | Size: 814 B |
BIN
Telegram/Resources/icons/archive_userpic@3x.png
Normal file
|
After Width: | Height: | Size: 1.3 KiB |
BIN
Telegram/Resources/icons/dialogs_bot.png
Normal file
|
After Width: | Height: | Size: 277 B |
BIN
Telegram/Resources/icons/dialogs_bot@2x.png
Normal file
|
After Width: | Height: | Size: 482 B |
BIN
Telegram/Resources/icons/dialogs_bot@3x.png
Normal file
|
After Width: | Height: | Size: 715 B |
|
Before Width: | Height: | Size: 307 B After Width: | Height: | Size: 387 B |
|
Before Width: | Height: | Size: 541 B After Width: | Height: | Size: 638 B |
|
Before Width: | Height: | Size: 792 B After Width: | Height: | Size: 907 B |
|
Before Width: | Height: | Size: 343 B After Width: | Height: | Size: 367 B |
|
Before Width: | Height: | Size: 660 B After Width: | Height: | Size: 1013 B |
|
Before Width: | Height: | Size: 838 B After Width: | Height: | Size: 1.1 KiB |
|
Before Width: | Height: | Size: 807 B After Width: | Height: | Size: 327 B |
|
Before Width: | Height: | Size: 1.7 KiB After Width: | Height: | Size: 655 B |
|
Before Width: | Height: | Size: 2.1 KiB After Width: | Height: | Size: 946 B |
BIN
Telegram/Resources/icons/history_audio_cancel.png
Normal file
|
After Width: | Height: | Size: 153 B |
BIN
Telegram/Resources/icons/history_audio_cancel@2x.png
Normal file
|
After Width: | Height: | Size: 251 B |
BIN
Telegram/Resources/icons/history_audio_cancel@3x.png
Normal file
|
After Width: | Height: | Size: 487 B |
BIN
Telegram/Resources/icons/history_audio_download.png
Normal file
|
After Width: | Height: | Size: 160 B |
BIN
Telegram/Resources/icons/history_audio_download@2x.png
Normal file
|
After Width: | Height: | Size: 221 B |
BIN
Telegram/Resources/icons/history_audio_download@3x.png
Normal file
|
After Width: | Height: | Size: 453 B |
|
Before Width: | Height: | Size: 572 B After Width: | Height: | Size: 456 B |
|
Before Width: | Height: | Size: 1.2 KiB After Width: | Height: | Size: 1.1 KiB |
|
Before Width: | Height: | Size: 1.5 KiB After Width: | Height: | Size: 1.3 KiB |
|
Before Width: | Height: | Size: 551 B After Width: | Height: | Size: 399 B |
|
Before Width: | Height: | Size: 1.2 KiB After Width: | Height: | Size: 829 B |
|
Before Width: | Height: | Size: 1.5 KiB After Width: | Height: | Size: 1.2 KiB |
|
Before Width: | Height: | Size: 1.1 KiB After Width: | Height: | Size: 1.0 KiB |
|
Before Width: | Height: | Size: 1.4 KiB After Width: | Height: | Size: 1.4 KiB |
|
Before Width: | Height: | Size: 225 B After Width: | Height: | Size: 341 B |
|
Before Width: | Height: | Size: 424 B After Width: | Height: | Size: 650 B |
|
Before Width: | Height: | Size: 680 B After Width: | Height: | Size: 1.0 KiB |
|
Before Width: | Height: | Size: 1.1 KiB After Width: | Height: | Size: 872 B |
|
Before Width: | Height: | Size: 1.1 KiB After Width: | Height: | Size: 1.2 KiB |
|
Before Width: | Height: | Size: 337 B After Width: | Height: | Size: 395 B |
|
Before Width: | Height: | Size: 486 B After Width: | Height: | Size: 737 B |
|
Before Width: | Height: | Size: 933 B After Width: | Height: | Size: 1.2 KiB |
|
Before Width: | Height: | Size: 234 B After Width: | Height: | Size: 364 B |
|
Before Width: | Height: | Size: 458 B After Width: | Height: | Size: 763 B |
|
Before Width: | Height: | Size: 923 B After Width: | Height: | Size: 1.2 KiB |
|
Before Width: | Height: | Size: 512 B After Width: | Height: | Size: 833 B |
|
Before Width: | Height: | Size: 1.2 KiB After Width: | Height: | Size: 1.6 KiB |
|
Before Width: | Height: | Size: 1.5 KiB After Width: | Height: | Size: 2.1 KiB |
BIN
Telegram/Resources/icons/info_permissions.png
Normal file
|
After Width: | Height: | Size: 672 B |
BIN
Telegram/Resources/icons/info_permissions@2x.png
Normal file
|
After Width: | Height: | Size: 1.4 KiB |
BIN
Telegram/Resources/icons/info_permissions@3x.png
Normal file
|
After Width: | Height: | Size: 2.1 KiB |
|
Before Width: | Height: | Size: 354 B |
|
Before Width: | Height: | Size: 737 B |
|
Before Width: | Height: | Size: 1.1 KiB |
BIN
Telegram/Resources/icons/info_rights_lock.png
Normal file
|
After Width: | Height: | Size: 280 B |
BIN
Telegram/Resources/icons/info_rights_lock@2x.png
Normal file
|
After Width: | Height: | Size: 519 B |
BIN
Telegram/Resources/icons/info_rights_lock@3x.png
Normal file
|
After Width: | Height: | Size: 721 B |
|
Before Width: | Height: | Size: 444 B After Width: | Height: | Size: 452 B |
|
Before Width: | Height: | Size: 855 B After Width: | Height: | Size: 884 B |
|
Before Width: | Height: | Size: 1.3 KiB After Width: | Height: | Size: 1.3 KiB |
|
Before Width: | Height: | Size: 714 B After Width: | Height: | Size: 781 B |
|
Before Width: | Height: | Size: 1.5 KiB After Width: | Height: | Size: 1.5 KiB |
|
Before Width: | Height: | Size: 2.4 KiB After Width: | Height: | Size: 2.3 KiB |
|
Before Width: | Height: | Size: 557 B After Width: | Height: | Size: 812 B |
|
Before Width: | Height: | Size: 1.3 KiB After Width: | Height: | Size: 1.5 KiB |
|
Before Width: | Height: | Size: 1.7 KiB After Width: | Height: | Size: 1.9 KiB |
|
Before Width: | Height: | Size: 716 B After Width: | Height: | Size: 1.0 KiB |
|
Before Width: | Height: | Size: 1.7 KiB After Width: | Height: | Size: 2.2 KiB |
|
Before Width: | Height: | Size: 2.7 KiB After Width: | Height: | Size: 2.5 KiB |
BIN
Telegram/Resources/icons/menu_shadow.png
Normal file
|
After Width: | Height: | Size: 1.2 KiB |
BIN
Telegram/Resources/icons/menu_shadow@2x.png
Normal file
|
After Width: | Height: | Size: 1.6 KiB |
BIN
Telegram/Resources/icons/menu_shadow@3x.png
Normal file
|
After Width: | Height: | Size: 2.2 KiB |
BIN
Telegram/Resources/icons/overview_video_download.png
Normal file
|
After Width: | Height: | Size: 156 B |
BIN
Telegram/Resources/icons/overview_video_download@2x.png
Normal file
|
After Width: | Height: | Size: 221 B |
BIN
Telegram/Resources/icons/overview_video_download@3x.png
Normal file
|
After Width: | Height: | Size: 438 B |
BIN
Telegram/Resources/icons/overview_video_play.png
Normal file
|
After Width: | Height: | Size: 175 B |
BIN
Telegram/Resources/icons/overview_video_play@2x.png
Normal file
|
After Width: | Height: | Size: 321 B |
BIN
Telegram/Resources/icons/overview_video_play@3x.png
Normal file
|
After Width: | Height: | Size: 422 B |
|
Before Width: | Height: | Size: 438 B After Width: | Height: | Size: 251 B |
|
Before Width: | Height: | Size: 747 B After Width: | Height: | Size: 528 B |
|
Before Width: | Height: | Size: 1.4 KiB After Width: | Height: | Size: 722 B |
|
Before Width: | Height: | Size: 517 B After Width: | Height: | Size: 401 B |
|
Before Width: | Height: | Size: 905 B After Width: | Height: | Size: 877 B |
|
Before Width: | Height: | Size: 1.2 KiB After Width: | Height: | Size: 1.3 KiB |
BIN
Telegram/Resources/icons/settings_emoji.png
Normal file
|
After Width: | Height: | Size: 939 B |
BIN
Telegram/Resources/icons/settings_emoji@2x.png
Normal file
|
After Width: | Height: | Size: 1.7 KiB |