b5-F%}iv%MXQ9{L>(zsCNf+QlU8$(*l$
zpx{xr7NKOrF#W-Wp2DqtPrjYfik=mPXGj?wkaJ;66`MNTMB~2v@j|Dw&r)BxA
zA{)i$GFV8SRWo^ldVBvM`lA#1AHhZo?DfZrZ4KZ7es<)zR`VN4lCpUUCNZU1|3?pD#
zOnK$UZ)e{ZeU5q`zjxg)$>}dj<>c?#?)~w5TgAUm!P|d73)=0UaDHyxHRYzb=Z0B7
z{u^6$?SASZV0qxP`_GVYCXO{O1^Llm6&oG|vDjC~@v<0n3LR|DEtO&PQE~lXD?2Y|
zbuveSk!I8RmmhMXw+bI<31X4I{P5wnEae8zr5yXF&Guz6*!bzthE4{x>r#ztAJkvD
zvvBL}?d~>Bo2R`^4sVd2!d`ylUcI*m6UT!U0$Cgi6Q*%wt!HB5P;)gXQDf?OK0&-~
zx{!mzR)1Dge`cnLISgXke+LC`W)yba(!1bwkA--6!%@zJLZ%(5-|TWZfDDil^@amg
zd-wjC4Q6H4AKl%~AZDJTed9jMwT+@aF?DwtyOk4ZnZv2aK#*bTA9&j1#oc1uCX-35B55|l>
zTD<=!{Fl;d;9UC9-m6{y_Nrb6waIP&EoArQt}bJm;UQJ`@A}91ZC4F}0r;uu{q=2D
zeGE^^yfa<42l%%iYpTsQKJ^fn{n#p
Z7xu2jM
Date: Thu, 4 Jun 2020 15:41:44 -0400
Subject: [PATCH 0015/1324] Delete hd_disabled.png
---
src/qt/res/icons/trad/hd_disabled.png | Bin 2198 -> 0 bytes
1 file changed, 0 insertions(+), 0 deletions(-)
delete mode 100644 src/qt/res/icons/trad/hd_disabled.png
diff --git a/src/qt/res/icons/trad/hd_disabled.png b/src/qt/res/icons/trad/hd_disabled.png
deleted file mode 100644
index b6fce2eaca5aaa05e1439ac07cf8b51d812b9aae..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 2198
zcmZuzX*kq<7ykWcEb}sCDIv>HWTupeLDrbYmc7NUW?F>M^V%o#519!svc#aY*&_Q^
zmYGsfrg%zkGRjm8WqTNx8fKc;^WpjSemLh`=X|)Y>)hv@>ps^!-HCEC>M{TTIcFzF
z@68DRZ77LNABL~B0{|7|>}cbyh`+1J=`qW0GbSnN}W*fPKv%jc-v~^M=s3?x}Ink9q<4
zNI`qr`_t61#-(!0&?&2ND-#;V87bMc0;Ph0OapC&uF(B
z6ZVon-ms-5!P<-;jQ5y+G#{UL+J}PhP(aiiJf3wX(frQ5&tE9<$WWc5
z(Z~CR%@k>csXO7uUE9G+UqEr`Xb_mX&E-FT2vlFtK-ubRab{qFl{_?|PtcDkOFMBZ
zvh=*it
zLb2?&Ns$c}83@5o+Bbk%{P_D;hQnLpQ`N;^td14ymXk>
zej5?vo|T>X2gq2rHG1A5^rASN6uI-WucxWZ^r{X3r_(o^&&Bjc3gW%9?)1HMLy~h>
z*f2WR2cW+O1@TXe$V8V|Jr87fS6U?#0uh)BoHc)Ax%AZUxb*ERkvQ}xem3mw-9d|b8boeUhKo(v)RN;|1Cl~DaLmEA
zxX*flZ{|{MEp8lPr&_4h*R8C51YVdm>UK%Rm5Qz)j&Nlyw$BHYZF@AcssJ|$Lh?z;
z^9#bQW=!jHM2#nT|93@zM=+yia3TihKy7=|%k=4i=8h^!q*b5GWZ)bHguf?n*G$jQSZ1%Vj3&6J_nvF6`*G
zmiZmMs0=^6A6`1#Z2E_uCHU+)rS>T@9C8pH*Xl6r+aj(!Dsp?j)wN=T#X8W*=jqc8+SmEVKzGp0_6Iy673$&g9U0&-ge@J{9uo;8ClbvwXF#lmBr
z?cgyOx3XaAsDViEzJ4Z>4Mp#y-6@(@=P}8`Ipz>%Lq&}U@~7H#hn7fa_+wzI|Kcc~
zYUpffeK-e9)JX=uxyJ=_Ghbs6*T|Em`cS9Uem9f@u@awqOQC<*!Z*r%ozR7pjvN037NZS
zms3l@t6eqaqS}&qxqOyOY7)=mi!@h8Pw}A31u)n#reI$>g+Bo7q#BVu&KXsL-KyGN
z)irvsF9SF1nl>%0BaLXY&i7r#@j#LV&Q
zm<}130re*ATr{ik8tg{DlfiS&68wU<=;x;%#9)uSKP~fx6jJW;%%8Jk3vX
zp|OP<62wai)_k8t2=<}Tgg@d0^m|sXZr(Mik=z%~5Hn)hnSCCNRWy7=;NzQoRr#d5
zg89>@po|?FdWwFjXk+=7&BCv8)=p)rf3OX}hhZr=d
zs)MIIX1^V0WhlD>o0ZJh1Q?o25Ff89Uhn=kNr?n*(?n~2>sWZ97>)fK?6m)vt{Z}L
zpcK2USWXrcf_Yt^55f!jnF&(Bq4tU)k7+)pli$yyI^LicgZgykj?01l9~WHsv0#3n
zqhLEy<(eE@W$KVD*@bo45{fbs{cb3<-Sx|)`w*cl9N&nP~XOC$dD=a4J4A?#gcV2PkjQre-l6Q$$UCM(N%2MB|N}?6ApAtCS({9QA22
zN5q?Jki7JCLyei8gs1X|E$VJ$twR
Date: Thu, 4 Jun 2020 15:41:54 -0400
Subject: [PATCH 0016/1324] Delete hd_enabled.png
---
src/qt/res/icons/trad/hd_enabled.png | Bin 688 -> 0 bytes
1 file changed, 0 insertions(+), 0 deletions(-)
delete mode 100644 src/qt/res/icons/trad/hd_enabled.png
diff --git a/src/qt/res/icons/trad/hd_enabled.png b/src/qt/res/icons/trad/hd_enabled.png
deleted file mode 100644
index c65c8ddc8a5726ae459a55732923929723543c15..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 688
zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H0wgodS2{2-FqM0{IEGZ*dVAYCLnKh-*vI|5
z>^xIMw{6(yl_iHj9?=PS|l?D!1XtRwIU*v{(I6JO}@sW4|%IFu%1oXYs+(
zeOnl2Bsxnn*2Tt}RLu1**m#G5A$#YP%g1bNQ`s3TW?eo}$;u#crjoBjn?dJc+Kp3j
ztPC#_?f%&=U|=}xcuYr>x1s8W&w4fnA2v<)Zsr*Y3*Kh^D{eULc&hagL)VJ^>;)Pg
znX4GSxW>nbHbhPM6voQ1FKwC6Ylc0i&Rt}b2xpfFX0Mnu(`Y&K2PNaD&V>w@d$z?s
z{?GUzIPFyM)bhqs$5XkY4Z4n}I=CFB7_DF`Q1*Cvonb|rw5lm@L-NO2q6}fJ|JmnW
zW02sAUa8HHld9)Yv2KI$mYL;=%EwRhZ)l&np;vR)Y2FK`Gv0My@ASJbXYXXX_}b>q
zyK|l-c7H#|8K!-nL-p6z_9f>s{5$U^wHh7R+ZxrF#1*4ujLuas^Wr%l`a3qR-**@5UUW;uAUUOX~hIcx+Yr7I|}~7ceC<
Nc)I$ztaD0e0suYl4uAjv
From 9d962cc384b6bdb47d80789bd83194297d087ab7 Mon Sep 17 00:00:00 2001
From: devilking6105 <43361618+devilking6105@users.noreply.github.com>
Date: Thu, 4 Jun 2020 15:42:03 -0400
Subject: [PATCH 0017/1324] Add files via upload
---
src/qt/res/icons/trad/hd_disabled.png | Bin 0 -> 3333 bytes
src/qt/res/icons/trad/hd_enabled.png | Bin 0 -> 674 bytes
2 files changed, 0 insertions(+), 0 deletions(-)
create mode 100644 src/qt/res/icons/trad/hd_disabled.png
create mode 100644 src/qt/res/icons/trad/hd_enabled.png
diff --git a/src/qt/res/icons/trad/hd_disabled.png b/src/qt/res/icons/trad/hd_disabled.png
new file mode 100644
index 0000000000000000000000000000000000000000..385949a4f0b414bbffee109abb93a1873a8febee
GIT binary patch
literal 3333
zcmZu!c{r3^AAZI(RI-(Z@@5%hi7AzgL`e2Ek|n#8RF<+7GsBRSC6VnVOQE#bcY}u_
zOJyc0d!Aw>dU-H-%uLMZ{r>&F>$-pEzJ9;!oa;L0I`{oM*NH!CZ6dUD|4sk^gv?A0
z?Y5ZuZ*1q^8as5oK5P*x*v`ZND5w85yOnJ7J#BRw0ID7e{_(nQr^Zl
z;sdvy;%UtU5PKDynvwCoZ+*PJ*m0guweuPeW-n+Vk+QX
z>@q=j@E}p0Pf*t6M9Y*5l-zwXQU*@W6!T7S$k7jV9oO5;Z8-D83bGY{C)!v4hOY;O
z8=D~_`J2ZHZ_||%7`w#p1`^8Lkylr$F<9!oqgFNFJ*UD=9!y-^6P{>3Ni!hl&~Y91
zzZ_9ZFOOo;Zzh{G`*F9OW94Ho-)*mCMV-Ip`vHpI=c|<?k_O08
zo&)Its_gIFkTemz0z`BIijw3Z5g;V>@C&LfzM3+zHZf4(ihEm2E=XuBkC!XFN_YD6
ztSnE8M75=ICZZOh8JUJhBA`GnUS`pc%$yO7!(H#-cLJRGpNEWP!)=5($>eeMr49WM
zbyME7@FK=M&`XNg&ewzMAN){I2=eavb&br>DX?Js?4g(KS
z)v?zh1Xb7B9LZY`zLhaV?7JLoRVfg(uYnvWIViZu6xiw8mK(5)`UmC8Tui>?*m=@r
z$k`3lI5(5txKJWMZpGP|RyMA6&*o!l+xddxul(Nou>0g=SVE4~`usVC7AeYqYWUn;
z_`HW#>CMxm_(J6p=QI4Cs7C$bm*rIr*KG2(D{$P4JpR~M2D*L)6PmQ?7o*XOlKQwW
z2zcj#I?q=D!edI^^5O7h^xc|GWqCG$rQ+L>`Nz+@R`TV2Pk-!2vaMzn(V*j3P|MwE
zQEX@6dg}HAX}11xQWL*OCd4aEDmSGK7KQamgz#-Sxj
zxmPrYcBP-v6Sc};rKo(iwxsnoq_}O%ZV}Oj<-QG3a&?U9{lf7*W1tO2r5(jcG1=XF
zs~@Ro${+)RvS-};7v!Ifdet9dAYd#Ux?9%&vO*JQeO}K;=x{V9MN#$3d8W{O*s%bKB$JUf{c&YJ0`Rz0QMK3dff9rdnmZ4|h*Snsf|+%lr0gSs!cv9YKTFF_@AtSU
zrWx}EAqR#Us6c9(;aPgSk0k
z^Lw9=HPXR
z#e_9gdP*X|%&(7M~GF==9VOOkY{tnEB1(^0N9
z@wt+~ZvWO5&}k-F$&MtFtg9-G
zMSgE+OlC(&X%e$zdOV(mM1N+y!WyBU&aJvQ-!bXw3YTDDseU={pO#4&l4!c_T`rBV
zdXqxLu}rw^L(`VTD#5~qB0qC}oAG7b?3!^tftvi&h&8I2wc2^{o`qc42PAsZLYnZn
z##wxLxHA}|Pl*a-ynI-n)3vYu!yR}!2}Z|1EiB|;@mx|!ypjcv+;At-qT0`GP2}0k
zaZ8MpN065Lwe7WPudoM%(;X_HxBI(JJ?-1M7x1Nz`A>2xK8Sx%!wf)I%$qmU{p5dQ(z^EVk$Z@C89uSf^Y<1uyO5aTReAvJiIRFRx1bN1kHsjcF#Jm6Qp1Ek{+^!i|wQZFOq
zn96TVJ0;4ic;-t$6?yak1P`h9oMOt=&xgt`jZCl(RbK!?Dk}UTJL$yk?_$3e*pYg<
zZAufmQGp6>#*=xLMkO1G+2D`5H1|gB!4Xc<_H6i42>T;a_(9K#j?%%MhT%&r{bqbH)J-YpY=3a
z^U%)u-M?4k3>=nGvl!1ZhNBTeU?7{Zum+DgrP=A&RIa9mQ)g4Zh}_U{POa4~Xsgxv
zSDl+nGl6BUi?eua(or8JnG^>=?S+UPWHLfTT3M@m(G(fw+zrF<`Fb|)FZEBI*8=b|
zL9Re1oS0EW$ebZbPA=i>#0$ifbL$A=k+(kX@W4;heKk+s*?tN-v&_C01HYcrQ`>%5
zv(#7UB4A2eRmgFbFVX{QE?xVwHzIrYG@9gKLQfPY7mQDHy9*l1TEe(GV!}*Uj_%sO
zZ=H;yj$;F4wg29eSnx1RuQnw<%1fx_T`@W57TTh{3_iV8Rf3O(r$g8qGId**o)gB_
zlaQO-?RQXiG-Aa6lpEk*iSVo3benW>GAL2F5e2D^;41SVI&gcN-KoS
zn>9A}A9*3wh01ghyr|2t3iS-^F>c&UxxK9TP6N`kg@zJDdv|wW0gf(j-?Ai?v#Auo
z%~#&fiA*;eL7#I{s5wA=1VJUV)3r)>41KVEQlyb5-F%}iv%MXQ9{L>(zsCNf+QlU8$(*l$
zpx{xr7NKOrF#W-Wp2DqtPrjYfik=mPXGj?wkaJ;66`MNTMB~2v@j|Dw&r)BxA
zA{)i$GFV8SRWo^ldVBvM`lA#1AHhZo?DfZrZ4KZ7es<)zR`VN4lCpUUCNZU1|3?pD#
zOnK$UZ)e{ZeU5q`zjxg)$>}dj<>c?#?)~w5TgAUm!P|d73)=0UaDHyxHRYzb=Z0B7
z{u^6$?SASZV0qxP`_GVYCXO{O1^Llm6&oG|vDjC~@v<0n3LR|DEtO&PQE~lXD?2Y|
zbuveSk!I8RmmhMXw+bI<31X4I{P5wnEae8zr5yXF&Guz6*!bzthE4{x>r#ztAJkvD
zvvBL}?d~>Bo2R`^4sVd2!d`ylUcI*m6UT!U0$Cgi6Q*%wt!HB5P;)gXQDf?OK0&-~
zx{!mzR)1Dge`cnLISgXke+LC`W)yba(!1bwkA--6!%@zJLZ%(5-|TWZfDDil^@amg
zd-wjC4Q6H4AKl%~AZDJTed9jMwT+@aF?DwtyOk4ZnZv2aK#*bTA9&j1#oc1uCX-35B55|l>
zTD<=!{Fl;d;9UC9-m6{y_Nrb6waIP&EoArQt}bJm;UQJ`@A}91ZC4F}0r;uu{q=2D
zeGE^^yfa<42l%%iYpTsQKJ^fn{n#p
Z7xu2jM
Date: Thu, 4 Jun 2020 15:49:23 -0400
Subject: [PATCH 0018/1324] Update helpthehomeless.qrc
---
src/qt/helpthehomeless.qrc | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/src/qt/helpthehomeless.qrc b/src/qt/helpthehomeless.qrc
index 842849b5..0354c803 100644
--- a/src/qt/helpthehomeless.qrc
+++ b/src/qt/helpthehomeless.qrc
@@ -84,6 +84,7 @@
res/icons/webs.png
res/icons/icon_reddit.png
res/icons/icon_medium.png
+ res/icons/chat.png
res/icons/crownium/address-book.png
@@ -152,6 +153,7 @@
res/icons/webs.png
res/icons/icon_reddit.png
res/icons/icon_medium.png
+ res/icons/chat.png
res/icons/light/address-book.png
@@ -220,6 +222,7 @@
res/icons/webs.png
res/icons/icon_reddit.png
res/icons/icon_medium.png
+ res/icons/chat.png
res/icons/light-retro/address-book.png
@@ -288,6 +291,7 @@
res/icons/webs.png
res/icons/icon_reddit.png
res/icons/icon_medium.png
+ res/icons/chat.png
res/icons/trad/address-book.png
@@ -356,6 +360,7 @@
res/icons/webs.png
res/icons/icon_reddit.png
res/icons/icon_medium.png
+ res/icons/chat.png
res/css/drkblue.css
From 01529f50bc35d1c6da4f125c82fe83faa46cefb4 Mon Sep 17 00:00:00 2001
From: devilking6105 <43361618+devilking6105@users.noreply.github.com>
Date: Thu, 4 Jun 2020 15:58:24 -0400
Subject: [PATCH 0019/1324] Update helpthehomeless.qrc
---
src/qt/helpthehomeless.qrc | 130 ++++++++++++++++++-------------------
1 file changed, 65 insertions(+), 65 deletions(-)
diff --git a/src/qt/helpthehomeless.qrc b/src/qt/helpthehomeless.qrc
index 0354c803..914e2c60 100644
--- a/src/qt/helpthehomeless.qrc
+++ b/src/qt/helpthehomeless.qrc
@@ -72,19 +72,19 @@
res/icons/drkblue/fontsmaller.png
res/icons/drkblue/transaction_abandoned.png
res/icons/drkblue/network_disabled.png
- res/icons/chevron.png
- res/icons/warning.png
- res/icons/bitcoin.png
- res/icons/mcm.png
- res/icons/twitter.png
- res/icons/discord.png
- res/icons/web.png
- res/icons/website.png
- res/icons/www.png
- res/icons/webs.png
- res/icons/icon_reddit.png
- res/icons/icon_medium.png
- res/icons/chat.png
+ res/icons/drkblue/chevron.png
+ res/icons/drkblue/warning.png
+ res/icons/drkblue/bitcoin.png
+ res/icons/drkblue/mcm.png
+ res/icons/drkblue/twitter.png
+ res/icons/drkblue/discord.png
+ res/icons/drkblue/web.png
+ res/icons/drkblue/website.png
+ res/icons/drkblue/www.png
+ res/icons/drkblue/webs.png
+ res/icons/drkblue/icon_reddit.png
+ res/icons/drkblue/icon_medium.png
+ res/icons/drkblue/chat.png
res/icons/crownium/address-book.png
@@ -141,19 +141,19 @@
res/icons/crownium/fontsmaller.png
res/icons/crownium/transaction_abandoned.png
res/icons/crownium/network_disabled.png
- res/icons/chevron.png
- res/icons/warning.png
- res/icons/bitcoin.png
- res/icons/mcm.png
- res/icons/twitter.png
- res/icons/discord.png
- res/icons/web.png
- res/icons/website.png
- res/icons/www.png
- res/icons/webs.png
- res/icons/icon_reddit.png
- res/icons/icon_medium.png
- res/icons/chat.png
+ res/icons/crownium/chevron.png
+ res/icons/crownium/warning.png
+ res/icons/crownium/bitcoin.png
+ res/icons/crownium/mcm.png
+ res/icons/crownium/twitter.png
+ res/icons/crownium/discord.png
+ res/icons/crownium/web.png
+ res/icons/crownium/website.png
+ res/icons/crownium/www.png
+ res/icons/crownium/webs.png
+ res/icons/crownium/icon_reddit.png
+ res/icons/crownium/icon_medium.png
+ res/icons/crownium/chat.png
res/icons/light/address-book.png
@@ -210,19 +210,19 @@
res/icons/light/fontsmaller.png
res/icons/light/transaction_abandoned.png
res/icons/light/network_disabled.png
- res/icons/chevron.png
- res/icons/warning.png
- res/icons/bitcoin.png
- res/icons/mcm.png
- res/icons/twitter.png
- res/icons/discord.png
- res/icons/web.png
- res/icons/website.png
- res/icons/www.png
- res/icons/webs.png
- res/icons/icon_reddit.png
- res/icons/icon_medium.png
- res/icons/chat.png
+ res/icons/light/chevron.png
+ res/icons/light/warning.png
+ res/icons/light/bitcoin.png
+ res/icons/light/mcm.png
+ res/icons/light/twitter.png
+ res/icons/light/discord.png
+ res/icons/light/web.png
+ res/icons/light/website.png
+ res/icons/light/www.png
+ res/icons/light/webs.png
+ res/icons/light/icon_reddit.png
+ res/icons/light/icon_medium.png
+ res/icons/light/chat.png
res/icons/light-retro/address-book.png
@@ -279,19 +279,19 @@
res/icons/light-retro/fontsmaller.png
res/icons/light-retro/transaction_abandoned.png
res/icons/light-retro/network_disabled.png
- res/icons/chevron.png
- res/icons/warning.png
- res/icons/bitcoin.png
- res/icons/mcm.png
- res/icons/twitter.png
- res/icons/discord.png
- res/icons/web.png
- res/icons/website.png
- res/icons/www.png
- res/icons/webs.png
- res/icons/icon_reddit.png
- res/icons/icon_medium.png
- res/icons/chat.png
+ res/icons/light-retro/chevron.png
+ res/icons/light-retro/warning.png
+ res/icons/light-retro/bitcoin.png
+ res/icons/light-retro/mcm.png
+ res/icons/light-retro/twitter.png
+ res/icons/light-retro/discord.png
+ res/icons/light-retro/web.png
+ res/icons/light-retro/website.png
+ res/icons/light-retro/www.png
+ res/icons/light-retro/webs.png
+ res/icons/light-retro/icon_reddit.png
+ res/icons/light-retro/icon_medium.png
+ res/icons/light-retro/chat.png
res/icons/trad/address-book.png
@@ -348,19 +348,19 @@
res/icons/trad/fontsmaller.png
res/icons/trad/transaction_abandoned.png
res/icons/trad/network_disabled.png
- res/icons/chevron.png
- res/icons/warning.png
- res/icons/bitcoin.png
- res/icons/mcm.png
- res/icons/twitter.png
- res/icons/discord.png
- res/icons/web.png
- res/icons/website.png
- res/icons/www.png
- res/icons/webs.png
- res/icons/icon_reddit.png
- res/icons/icon_medium.png
- res/icons/chat.png
+ res/icons/trad/chevron.png
+ res/icons/trad/warning.png
+ res/icons/trad/bitcoin.png
+ res/icons/trad/mcm.png
+ res/icons/trad/twitter.png
+ res/icons/trad/discord.png
+ res/icons/trad/web.png
+ res/icons/trad/website.png
+ res/icons/trad/www.png
+ res/icons/trad/webs.png
+ res/icons/trad/icon_reddit.png
+ res/icons/trad/icon_medium.png
+ res/icons/trad/chat.png
res/css/drkblue.css
From 3fb5a2c3d8375a838cba5e81d7ec43365f60bbe9 Mon Sep 17 00:00:00 2001
From: devilking6105 <43361618+devilking6105@users.noreply.github.com>
Date: Thu, 4 Jun 2020 16:01:44 -0400
Subject: [PATCH 0020/1324] Add files via upload
---
src/qt/res/icons/drkblue/chevron.png | Bin 0 -> 666 bytes
1 file changed, 0 insertions(+), 0 deletions(-)
create mode 100644 src/qt/res/icons/drkblue/chevron.png
diff --git a/src/qt/res/icons/drkblue/chevron.png b/src/qt/res/icons/drkblue/chevron.png
new file mode 100644
index 0000000000000000000000000000000000000000..6460ace67254ac6366ac61a55a302880759379d3
GIT binary patch
literal 666
zcmV;L0%iS)P)-g&9(oc9h+cmZodF3Cxfu9jJmdN@BpN_b-
z#2cUBEu2N(e8GS}@O)hdtpmC%_>Vg8h%!Tdz>n*`-h^~l@S7MnbD5kzJYG;yiBES0
zzl=>E)rIfG4&|!kHR1DuD6~pJ58f{fp=b22{IzuH?%+LK3F)(1VeN!C=bF_@Bxc0)
zPg<#)oc>uW=PXba(idsafJ0tPU#d+{0uEzTg!Hd8YQP~UrY}EEPYMn>@wvWClLj1y
zC=2PU|1TmX2~U)sEF9i*A*8R
Date: Thu, 4 Jun 2020 16:04:42 -0400
Subject: [PATCH 0021/1324] Update helpthehomeless.qrc
---
src/qt/helpthehomeless.qrc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/qt/helpthehomeless.qrc b/src/qt/helpthehomeless.qrc
index 914e2c60..863d1e22 100644
--- a/src/qt/helpthehomeless.qrc
+++ b/src/qt/helpthehomeless.qrc
@@ -72,7 +72,7 @@
res/icons/drkblue/fontsmaller.png
res/icons/drkblue/transaction_abandoned.png
res/icons/drkblue/network_disabled.png
- res/icons/drkblue/chevron.png
+ res/icons/chevron.png
res/icons/drkblue/warning.png
res/icons/drkblue/bitcoin.png
res/icons/drkblue/mcm.png
From 32d3e6a9c0c76f3bffdb94bfd6cb8b8ae2e5b627 Mon Sep 17 00:00:00 2001
From: devilking6105 <43361618+devilking6105@users.noreply.github.com>
Date: Thu, 4 Jun 2020 16:07:16 -0400
Subject: [PATCH 0022/1324] Update helpthehomeless.qrc
---
src/qt/helpthehomeless.qrc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/qt/helpthehomeless.qrc b/src/qt/helpthehomeless.qrc
index 863d1e22..0cd3eae8 100644
--- a/src/qt/helpthehomeless.qrc
+++ b/src/qt/helpthehomeless.qrc
@@ -73,7 +73,7 @@
res/icons/drkblue/transaction_abandoned.png
res/icons/drkblue/network_disabled.png
res/icons/chevron.png
- res/icons/drkblue/warning.png
+ res/icons/warning.png
res/icons/drkblue/bitcoin.png
res/icons/drkblue/mcm.png
res/icons/drkblue/twitter.png
From 0297fe4ec589bece7da6f035d4938609327ed2e1 Mon Sep 17 00:00:00 2001
From: devilking6105 <43361618+devilking6105@users.noreply.github.com>
Date: Thu, 4 Jun 2020 16:09:57 -0400
Subject: [PATCH 0023/1324] Update helpthehomeless.qrc
---
src/qt/helpthehomeless.qrc | 116 ++++++++++++++++++-------------------
1 file changed, 58 insertions(+), 58 deletions(-)
diff --git a/src/qt/helpthehomeless.qrc b/src/qt/helpthehomeless.qrc
index 0cd3eae8..37032de7 100644
--- a/src/qt/helpthehomeless.qrc
+++ b/src/qt/helpthehomeless.qrc
@@ -74,16 +74,16 @@
res/icons/drkblue/network_disabled.png
res/icons/chevron.png
res/icons/warning.png
- res/icons/drkblue/bitcoin.png
- res/icons/drkblue/mcm.png
- res/icons/drkblue/twitter.png
- res/icons/drkblue/discord.png
- res/icons/drkblue/web.png
- res/icons/drkblue/website.png
- res/icons/drkblue/www.png
- res/icons/drkblue/webs.png
- res/icons/drkblue/icon_reddit.png
- res/icons/drkblue/icon_medium.png
+ res/icons/bitcoin.png
+ res/icons/mcm.png
+ res/icons/twitter.png
+ res/icons/discord.png
+ res/icons/web.png
+ res/icons/website.png
+ res/icons/www.png
+ res/icons/webs.png
+ res/icons/icon_reddit.png
+ res/icons/icon_medium.png
res/icons/drkblue/chat.png
@@ -141,18 +141,18 @@
res/icons/crownium/fontsmaller.png
res/icons/crownium/transaction_abandoned.png
res/icons/crownium/network_disabled.png
- res/icons/crownium/chevron.png
- res/icons/crownium/warning.png
- res/icons/crownium/bitcoin.png
- res/icons/crownium/mcm.png
- res/icons/crownium/twitter.png
- res/icons/crownium/discord.png
- res/icons/crownium/web.png
- res/icons/crownium/website.png
- res/icons/crownium/www.png
- res/icons/crownium/webs.png
- res/icons/crownium/icon_reddit.png
- res/icons/crownium/icon_medium.png
+ res/icons/chevron.png
+ res/icons/warning.png
+ res/icons/bitcoin.png
+ res/icons/mcm.png
+ res/icons/twitter.png
+ res/icons/discord.png
+ res/icons/web.png
+ res/icons/website.png
+ res/icons/www.png
+ res/icons/webs.png
+ res/icons/icon_reddit.png
+ res/icons/icon_medium.png
res/icons/crownium/chat.png
@@ -210,18 +210,18 @@
res/icons/light/fontsmaller.png
res/icons/light/transaction_abandoned.png
res/icons/light/network_disabled.png
- res/icons/light/chevron.png
- res/icons/light/warning.png
- res/icons/light/bitcoin.png
- res/icons/light/mcm.png
- res/icons/light/twitter.png
- res/icons/light/discord.png
- res/icons/light/web.png
- res/icons/light/website.png
- res/icons/light/www.png
- res/icons/light/webs.png
- res/icons/light/icon_reddit.png
- res/icons/light/icon_medium.png
+ res/icons/chevron.png
+ res/icons/warning.png
+ res/icons/bitcoin.png
+ res/icons/mcm.png
+ res/icons/twitter.png
+ res/icons/discord.png
+ res/icons/web.png
+ res/icons/website.png
+ res/icons/www.png
+ res/icons/webs.png
+ res/icons/icon_reddit.png
+ res/icons/icon_medium.png
res/icons/light/chat.png
@@ -279,18 +279,18 @@
res/icons/light-retro/fontsmaller.png
res/icons/light-retro/transaction_abandoned.png
res/icons/light-retro/network_disabled.png
- res/icons/light-retro/chevron.png
- res/icons/light-retro/warning.png
- res/icons/light-retro/bitcoin.png
- res/icons/light-retro/mcm.png
- res/icons/light-retro/twitter.png
- res/icons/light-retro/discord.png
- res/icons/light-retro/web.png
- res/icons/light-retro/website.png
- res/icons/light-retro/www.png
- res/icons/light-retro/webs.png
- res/icons/light-retro/icon_reddit.png
- res/icons/light-retro/icon_medium.png
+ res/icons/chevron.png
+ res/icons/warning.png
+ res/icons/bitcoin.png
+ res/icons/mcm.png
+ res/icons/twitter.png
+ res/icons/discord.png
+ res/icons/web.png
+ res/icons/website.png
+ res/icons/www.png
+ res/icons/webs.png
+ res/icons/icon_reddit.png
+ res/icons/icon_medium.png
res/icons/light-retro/chat.png
@@ -348,18 +348,18 @@
res/icons/trad/fontsmaller.png
res/icons/trad/transaction_abandoned.png
res/icons/trad/network_disabled.png
- res/icons/trad/chevron.png
- res/icons/trad/warning.png
- res/icons/trad/bitcoin.png
- res/icons/trad/mcm.png
- res/icons/trad/twitter.png
- res/icons/trad/discord.png
- res/icons/trad/web.png
- res/icons/trad/website.png
- res/icons/trad/www.png
- res/icons/trad/webs.png
- res/icons/trad/icon_reddit.png
- res/icons/trad/icon_medium.png
+ res/icons/chevron.png
+ res/icons/warning.png
+ res/icons/bitcoin.png
+ res/icons/mcm.png
+ res/icons/twitter.png
+ res/icons/discord.png
+ res/icons/web.png
+ res/icons/website.png
+ res/icons/www.png
+ res/icons/webs.png
+ res/icons/icon_reddit.png
+ res/icons/icon_medium.png
res/icons/trad/chat.png
From 86f6ddcb75ba7397aa5c4fa24640f19e87f712c1 Mon Sep 17 00:00:00 2001
From: devilking6105 <43361618+devilking6105@users.noreply.github.com>
Date: Thu, 4 Jun 2020 19:26:13 -0400
Subject: [PATCH 0024/1324] Update chainparams.cpp
---
src/chainparams.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/chainparams.cpp b/src/chainparams.cpp
index 6cad2142..97ca6cf7 100644
--- a/src/chainparams.cpp
+++ b/src/chainparams.cpp
@@ -313,7 +313,7 @@ class CMainParams : public CChainParams {
assert(consensus.hashGenesisBlock == uint256S("0x37540c3c757bb77e42c168d8197447b6aba38c2d1ec0ddf59d2e774c41953093"));
assert(genesis.hashMerkleRoot == uint256S("0xb65534a1e2f0ff85de1ff4cd1a457b92a56abc182397d9cc1380482784acabfc"));
- // vSeeds.push_back(CDNSSeedData("dash.org", "dnsseed.dash.org"));
+ vSeeds.push_back(CDNSSeedData("51.105.25.2:49999"));
// vSeeds.push_back(CDNSSeedData("dashdot.io", "dnsseed.dashdot.io"));
// vSeeds.push_back(CDNSSeedData("masternode.io", "dnsseed.masternode.io"));
From ee115ef8d5da355baf5518fe58f94182e3e99f81 Mon Sep 17 00:00:00 2001
From: devilking6105 <43361618+devilking6105@users.noreply.github.com>
Date: Thu, 4 Jun 2020 19:28:38 -0400
Subject: [PATCH 0025/1324] Update chainparams.cpp
---
src/chainparams.cpp | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/chainparams.cpp b/src/chainparams.cpp
index 97ca6cf7..ce4461d7 100644
--- a/src/chainparams.cpp
+++ b/src/chainparams.cpp
@@ -314,8 +314,8 @@ class CMainParams : public CChainParams {
assert(genesis.hashMerkleRoot == uint256S("0xb65534a1e2f0ff85de1ff4cd1a457b92a56abc182397d9cc1380482784acabfc"));
vSeeds.push_back(CDNSSeedData("51.105.25.2:49999"));
- // vSeeds.push_back(CDNSSeedData("dashdot.io", "dnsseed.dashdot.io"));
- // vSeeds.push_back(CDNSSeedData("masternode.io", "dnsseed.masternode.io"));
+ vSeeds.push_back(CDNSSeedData("51.105.25.2:49999"));
+ vSeeds.push_back(CDNSSeedData("51.105.25.2:49999"));
// Dash addresses start with 'h'
base58Prefixes[PUBKEY_ADDRESS] = std::vector(1,100);
From 552af747a498b2a7df845221ace087f3a40a34bf Mon Sep 17 00:00:00 2001
From: devilking6105 <43361618+devilking6105@users.noreply.github.com>
Date: Thu, 4 Jun 2020 19:29:23 -0400
Subject: [PATCH 0026/1324] Update chainparams.cpp
---
src/chainparams.cpp | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/chainparams.cpp b/src/chainparams.cpp
index ce4461d7..dfa3e578 100644
--- a/src/chainparams.cpp
+++ b/src/chainparams.cpp
@@ -313,9 +313,9 @@ class CMainParams : public CChainParams {
assert(consensus.hashGenesisBlock == uint256S("0x37540c3c757bb77e42c168d8197447b6aba38c2d1ec0ddf59d2e774c41953093"));
assert(genesis.hashMerkleRoot == uint256S("0xb65534a1e2f0ff85de1ff4cd1a457b92a56abc182397d9cc1380482784acabfc"));
- vSeeds.push_back(CDNSSeedData("51.105.25.2:49999"));
- vSeeds.push_back(CDNSSeedData("51.105.25.2:49999"));
- vSeeds.push_back(CDNSSeedData("51.105.25.2:49999"));
+ // vSeeds.push_back(CDNSSeedData("51.105.25.2:49999"));
+ // vSeeds.push_back(CDNSSeedData("51.105.25.2:49999"));
+ // vSeeds.push_back(CDNSSeedData("51.105.25.2:49999"));
// Dash addresses start with 'h'
base58Prefixes[PUBKEY_ADDRESS] = std::vector(1,100);
From 615a9cc69500fca006b37bc4ce0e6e8e119933ae Mon Sep 17 00:00:00 2001
From: devilking6105 <43361618+devilking6105@users.noreply.github.com>
Date: Thu, 4 Jun 2020 20:58:45 -0400
Subject: [PATCH 0027/1324] Update chatwindowpage.cpp
---
src/qt/chatwindowpage.cpp | 334 +++++++++++++++-----------------------
1 file changed, 127 insertions(+), 207 deletions(-)
diff --git a/src/qt/chatwindowpage.cpp b/src/qt/chatwindowpage.cpp
index 87bff742..670744da 100644
--- a/src/qt/chatwindowpage.cpp
+++ b/src/qt/chatwindowpage.cpp
@@ -1,231 +1,151 @@
-/*Copyright (C) 2009 Cleriot Simon
-*
-* This program is free software; you can redistribute it and/or
-* modify it under the terms of the GNU Lesser General Public
-* License as published by the Free Software Foundation; either
-* version 2.1 of the License, or (at your option) any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this program; if not, write to the Free Software
-* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA*/
+/****************************************************************************
+**
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the examples of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+** * Redistributions of source code must retain the above copyright
+** notice, this list of conditions and the following disclaimer.
+** * Redistributions in binary form must reproduce the above copyright
+** notice, this list of conditions and the following disclaimer in
+** the documentation and/or other materials provided with the
+** distribution.
+** * Neither the name of The Qt Company Ltd nor the names of its
+** contributors may be used to endorse or promote products derived
+** from this software without specific prior written permission.
+**
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include
#include "chatwindowpage.h"
-#include "ui_chatwindowpage.h"
-
-#include
-#include
-#include
-#include
-#include
-#include
ChatWindowPage::ChatWindowPage(QWidget *parent)
- : QWidget(parent), ui(new Ui::ChatWindowPage)
+ : QDialog(parent)
{
- ui->setupUi(this);
- setFixedSize(750,600);
- ui->splitter->hide();
-
- connect(ui->buttonConnect, SIGNAL(clicked()), this, SLOT(connecte()));
-
- connect(ui->actionQuit, SIGNAL(triggered()), this, SLOT(close()));
- connect(ui->actionCloseTab, SIGNAL(triggered()), this, SLOT(closeTab()));
-
- connect(ui->lineEdit, SIGNAL(returnPressed()), this, SLOT(sendCommande()));
-
-
- ui->pushButton_WebChat->setStatusTip(tr("Visit Help The Homeless Worldwide Web Chat"));
-
-
-
-
-
- connect(ui->disconnect, SIGNAL(clicked()), this, SLOT(disconnectFromServer()));
- connect(ui->tab, SIGNAL(currentChanged(int)), this, SLOT(tabChanged(int)) );
- connect(ui->tab, SIGNAL(tabCloseRequested(int)), this, SLOT(tabClosing(int)) );
-
+ setupUi(this);
+
+ lineEdit->setFocusPolicy(Qt::StrongFocus);
+ textEdit->setFocusPolicy(Qt::NoFocus);
+ textEdit->setReadOnly(true);
+ listWidget->setFocusPolicy(Qt::NoFocus);
+
+ connect(lineEdit, &QLineEdit::returnPressed,
+ this, &ChatDialog::returnPressed);
+ connect(&client, &Client::newMessage,
+ this, &ChatDialog::appendMessage);
+ connect(&client, &Client::newParticipant,
+ this, &ChatDialog::newParticipant);
+ connect(&client, &Client::participantLeft,
+ this, &ChatDialog::participantLeft);
+
+ myNickName = client.nickName();
+ newParticipant(myNickName);
+ tableFormat.setBorder(0);
+ QTimer::singleShot(10 * 1000, this, SLOT(showInformation()));
}
-
-
-void ChatWindowPage::tabChanged(int index)
+void ChatWindowPage::appendMessage(const QString &from, const QString &message)
{
- if(index!=0 && joining == false)
- currentTab()->updateUsersList(ui->tab->tabText(index));
+ if (from.isEmpty() || message.isEmpty())
+ return;
+
+ QTextCursor cursor(textEdit->textCursor());
+ cursor.movePosition(QTextCursor::End);
+ QTextTable *table = cursor.insertTable(1, 2, tableFormat);
+ table->cellAt(0, 0).firstCursorPosition().insertText('<' + from + "> ");
+ table->cellAt(0, 1).firstCursorPosition().insertText(message);
+ QScrollBar *bar = textEdit->verticalScrollBar();
+ bar->setValue(bar->maximum());
}
-void ChatWindowPage::tabClosing(int index)
-{
- currentTab()->leave(ui->tab->tabText(index));
-}
-/*void ChatWindow::tabRemoved(int index)
+void ChatWindowPage::returnPressed()
{
- currentTab()->leave(ui->tab->tabText(index));
-}*/
-
-void ChatWindowPage::disconnectFromServer() {
-
- QMapIterator i(serveurs);
-
- while(i.hasNext())
- {
- i.next();
- QMapIterator i2(i.value()->conversations);
- while(i2.hasNext())
- {
- i2.next();
- i.value()->sendData("QUIT "+i2.key() + " ");
- }
+ QString text = lineEdit->text();
+ if (text.isEmpty())
+ return;
+
+ if (text.startsWith(QChar('/'))) {
+ QColor color = textEdit->textColor();
+ textEdit->setTextColor(Qt::red);
+ textEdit->append(tr("! Unknown command: %1")
+ .arg(text.left(text.indexOf(' '))));
+ textEdit->setTextColor(color);
+ } else {
+ client.sendMessage(text);
+ appendMessage(myNickName, text);
}
-
- ui->splitter->hide();
- ui->hide3->show();
-
-}
-
-Serveur *ChatWindowPage::currentTab()
-{
- QString tooltip=ui->tab->tabToolTip(ui->tab->currentIndex());
- return serveurs[tooltip];
- //return ui->tab->currentWidget()->findChild();
-}
-
-void ChatWindowPage::closeTab()
-{
- QString tooltip=ui->tab->tabToolTip(ui->tab->currentIndex());
- QString txt=ui->tab->tabText(ui->tab->currentIndex());
-
- if(txt==tooltip)
- {
- QMapIterator i(serveurs[tooltip]->conversations);
-
- int count=ui->tab->currentIndex()+1;
-
- while(i.hasNext())
- {
- i.next();
- ui->tab->removeTab(count);
- }
-
- currentTab()->abort();
- ui->tab->removeTab(ui->tab->currentIndex());
- }
- else
- {
-
- ui->tab->removeTab(ui->tab->currentIndex());
- currentTab()->conversations.remove(txt);
- }
-}
-
-void ChatWindowPage::sendCommande()
-{
- QString tooltip=ui->tab->tabToolTip(ui->tab->currentIndex());
- QString txt=ui->tab->tabText(ui->tab->currentIndex());
- if(txt==tooltip)
- {
- currentTab()->sendData(currentTab()->parseCommande(ui->lineEdit->text(),true) );
- }
- else
- {
- currentTab()->sendData(currentTab()->parseCommande(ui->lineEdit->text()) );
- }
- ui->lineEdit->clear();
- ui->lineEdit->setFocus();
+ lineEdit->clear();
}
-void ChatWindowPage::tabJoined()
+void ChatWindowPage::newParticipant(const QString &nick)
{
- joining=true;
-}
-void ChatWindowPage::tabJoining()
-{
- joining=false;
-}
-
-void ChatWindowPage::connecte()
-{
-
- ui->splitter->show();
- Serveur *serveur=new Serveur;
- QTextEdit *textEdit=new QTextEdit;
- ui->hide3->hide();
-
- ui->tab->addTab(textEdit,"Console/PM");
- ui->tab->setTabToolTip(ui->tab->count()-1,"irc.freenode.net");
- // current tab is now the last, therefore remove all but the last
- for (int i = ui->tab->count(); i > 1; --i) {
- ui->tab->removeTab(0);
- }
-
- serveurs.insert("irc.freenode.net",serveur);
-
- serveur->pseudo=ui->editPseudo->text();
- serveur->serveur="irc.freenode.net";
- serveur->port=6667;
- serveur->affichage=textEdit;
- serveur->tab=ui->tab;
- serveur->userList=ui->userView;
- serveur->parent=this;
-
- textEdit->setReadOnly(true);
-
- connect(serveur, SIGNAL(joinTab()),this, SLOT(tabJoined() ));
- connect(serveur, SIGNAL(tabJoined()),this, SLOT(tabJoining() ));
-
- serveur->connectToHost("irc.freenode.net",6667);
-
- ui->tab->setCurrentIndex(ui->tab->count()-1);
+ if (nick.isEmpty())
+ return;
+
+ QColor color = textEdit->textColor();
+ textEdit->setTextColor(Qt::gray);
+ textEdit->append(tr("* %1 has joined").arg(nick));
+ textEdit->setTextColor(color);
+ listWidget->addItem(nick);
}
-void ChatWindowPage::closeEvent(QCloseEvent *event)
+void ChatWindowPage::participantLeft(const QString &nick)
{
- (void) event;
-
- QMapIterator i(serveurs);
-
- while(i.hasNext())
- {
- i.next();
- QMapIterator i2(i.value()->conversations);
- while(i2.hasNext())
- {
- i2.next();
- i.value()->sendData("QUIT "+i2.key() + " ");
- }
- }
+ if (nick.isEmpty())
+ return;
+
+ QList items = listWidget->findItems(nick,
+ Qt::MatchExactly);
+ if (items.isEmpty())
+ return;
+
+ delete items.at(0);
+ QColor color = textEdit->textColor();
+ textEdit->setTextColor(Qt::gray);
+ textEdit->append(tr("* %1 has left").arg(nick));
+ textEdit->setTextColor(color);
}
-void ChatWindowPage ::setModel(ClientModel *model)
-{
- this->model = model;
-}
-
-void ChatWindowPage::on_pushButton_WebChat_clicked() { // #HTHWorld Chat
-
- QDesktopServices::openUrl(QUrl("https://webchat.freenode.net//", QUrl::TolerantMode));
-
-}
-
-ChatWindowPage::~ChatWindowPage()
+void ChatWindowPage::showInformation()
{
- delete ui;
- QMapIterator i(serveurs);
-
- while(i.hasNext())
- {
- i.next();
- QMapIterator i2(i.value()->conversations);
- while(i2.hasNext())
- {
- i2.next();
- i.value()->sendData("QUIT "+i2.key() + " ");
- }
+ if (listWidget->count() == 1) {
+ QMessageBox::information(this, tr("Chat"),
+ tr("Launch several instances of this "
+ "program on your local network and "
+ "start chatting!"));
}
}
From 5fb59a595f5222c16ab633487215f942925fef88 Mon Sep 17 00:00:00 2001
From: devilking6105 <43361618+devilking6105@users.noreply.github.com>
Date: Thu, 4 Jun 2020 21:00:02 -0400
Subject: [PATCH 0028/1324] Update chatwindowpage.h
---
src/qt/chatwindowpage.h | 122 +++++++++++++++++++++-------------------
1 file changed, 64 insertions(+), 58 deletions(-)
diff --git a/src/qt/chatwindowpage.h b/src/qt/chatwindowpage.h
index 2beba14b..82d0d0c7 100644
--- a/src/qt/chatwindowpage.h
+++ b/src/qt/chatwindowpage.h
@@ -1,73 +1,79 @@
-/*Copyright (C) 2009 Cleriot Simon
-*
-* This program is free software; you can redistribute it and/or
-* modify it under the terms of the GNU Lesser General Public
-* License as published by the Free Software Foundation; either
-* version 2.1 of the License, or (at your option) any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this program; if not, write to the Free Software
-* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA*/
+/****************************************************************************
+**
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the examples of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+** * Redistributions of source code must retain the above copyright
+** notice, this list of conditions and the following disclaimer.
+** * Redistributions in binary form must reproduce the above copyright
+** notice, this list of conditions and the following disclaimer in
+** the documentation and/or other materials provided with the
+** distribution.
+** * Neither the name of The Qt Company Ltd nor the names of its
+** contributors may be used to endorse or promote products derived
+** from this software without specific prior written permission.
+**
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
#ifndef CHATWINDOWPAGE_H
#define CHATWINDOWPAGE_H
-#include
-#include
-#include "clientmodel.h"
-#include "serveur.h"
+#include "ui_chatwindowpage.h"
+#include "client.h"
-#include
-#include
-#include
-
-
-
-namespace Ui
-{
- class ChatWindowPage;
-}
-
-class ChatWindowPage : public QWidget
+class ChatWindowPage : public QDialog, private Ui::ChatWindowPage
{
Q_OBJECT
public:
- ChatWindowPage(QWidget *parent = 0);
- ~ChatWindowPage();
- void setModel(ClientModel *model);
- Serveur * currentTab();
- Q_SIGNALS:
- void changeTab();
-
- public Q_SLOTS:
- void sendCommande();
- void connecte();
- void closeTab();
+ ChatWindowPage(QWidget *parent = nullptr);
- void tabChanged(int index);
-
- void tabJoined();
- void tabJoining();
- void disconnectFromServer();
- void tabClosing(int index);
+public Q_SLOTS:
+ void appendMessage(const QString &from, const QString &message);
+private Q_SLOTS:
+ void returnPressed();
+ void newParticipant(const QString &nick);
+ void participantLeft(const QString &nick);
+ void showInformation();
private:
- Ui::ChatWindowPage *ui;
- ClientModel *model;
- QMap serveurs;
- bool joining;
- void closeEvent(QCloseEvent *event);
-
-private Q_SLOTS:
- void on_pushButton_WebChat_clicked();
-
+ Client client;
+ QString myNickName;
+ QTextTableFormat tableFormat;
};
-#endif // CHATWINDOWPAGE_H
+#endif
From ceb482f7fdc3626e2c370d9a7c51efbb0c8205a7 Mon Sep 17 00:00:00 2001
From: devilking6105 <43361618+devilking6105@users.noreply.github.com>
Date: Thu, 4 Jun 2020 21:00:40 -0400
Subject: [PATCH 0029/1324] Update chatwindowpage.ui
---
src/qt/forms/chatwindowpage.ui | 378 ++++++---------------------------
1 file changed, 67 insertions(+), 311 deletions(-)
diff --git a/src/qt/forms/chatwindowpage.ui b/src/qt/forms/chatwindowpage.ui
index 7403c95e..f2fdc185 100644
--- a/src/qt/forms/chatwindowpage.ui
+++ b/src/qt/forms/chatwindowpage.ui
@@ -1,323 +1,79 @@
-
-
+
ChatWindowPage
-
-
+
+
0
0
- 878
- 692
+ 513
+ 349
-
-
-
- 0
- 50
- 851
- 611
-
-
-
-
- true
-
-
-
- 10
- 10
- 831
- 581
-
-
-
-
-
-
-
-
- 10
- 0
- 541
- 451
-
-
-
-
-
-
- QTabWidget::Rounded
-
-
- 1
-
-
- false
-
-
-
- Tab 1
-
-
-
-
- Tab 2
-
-
-
-
-
-
- 10
- 460
- 717
- 30
-
-
-
-
- 0
- 0
-
-
-
-
- 16777215
- 30
-
-
-
-
-
-
- 560
- 18
- 161
- 431
-
-
-
-
- 0
- 300
-
-
-
- border-radius:10px;
-
-
-
-
-
- 625
- 500
- 100
- 30
-
-
-
-
- 100
- 30
-
-
-
-
- 100
- 30
-
-
-
- border-style: solid;
-border-width: 2px;
-border-color: #34bcaa;
-border-radius: 10px;
-font-size: 11px;
-
-
- Leave
-
-
-
-
-
-
- 10
- 10
- 851
- 671
-
-
-
-
-
- 179
- 40
- 241
- 29
-
-
-
-
- 7
-
- -
-
-
- font-weight: bold;
-font-size: 20px;
-
-
- HTH World Chat
-
-
-
- -
-
-
- Qt::Horizontal
-
-
- QSizePolicy::Fixed
-
-
-
- 60
- 20
-
-
-
-
-
-
-
-
-
- 185
- 210
- 151
- 22
-
-
-
-
-
-
-
-
-
- 80
- 210
- 81
- 21
-
-
-
- Nickname:
-
-
-
-
-
- 185
- 275
- 151
- 41
-
-
-
- border-style: solid;
-border-width: 2px;
-border-color: #34bcaa;
-border-radius: 10px;
-font-size: 11px;
-
-
- Click to Connect
-
-
-
-
-
- 140
- 142
- 251
- 25
-
-
-
- <html><head/><body><p><span style=" font-weight:600;">Connect to #HTHWorld TrollBox</span></p></body></html>
-
-
- Qt::AlignCenter
-
-
-
-
-
- 200
- 380
- 231
- 61
-
-
-
- <html><head/><body><p>Enter your Nick</p><p>Enter #HTHWorld as Channel</p></body></html>
-
-
-
-
-
- 30
- 400
- 120
- 30
-
-
-
-
- 100
- 30
-
-
-
-
- 120
- 30
-
-
-
- Visit HTH World Web Chat
-
-
- border-style: solid;
-border-width: 2px;
-border-color: #34bcaa;
-border-radius: 10px;
-font-size: 11px;
-
-
- #HTHWorld
-
-
-
-
-
-
- Quitter
-
-
- Ctrl+Q
+
+ Chat
+
+
+
+ 9
-
-
-
- Fermer l'onglet
+
+ 6
-
+ -
+
+
+ 0
+
+
+ 6
+
+
-
+
+
+ Qt::NoFocus
+
+
+ true
+
+
+
+ -
+
+
+
+ 180
+ 16777215
+
+
+
+ Qt::NoFocus
+
+
+
+
+
+ -
+
+
+ 0
+
+
+ 6
+
+
-
+
+
+ Message:
+
+
+
+ -
+
+
+
+
+
-
From c789f079328199d1d6dacec19ee6e492121c49d5 Mon Sep 17 00:00:00 2001
From: devilking6105 <43361618+devilking6105@users.noreply.github.com>
Date: Thu, 4 Jun 2020 21:01:09 -0400
Subject: [PATCH 0030/1324] Create client.cpp
---
src/qt/client.cpp | 147 ++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 147 insertions(+)
create mode 100644 src/qt/client.cpp
diff --git a/src/qt/client.cpp b/src/qt/client.cpp
new file mode 100644
index 00000000..fe35d535
--- /dev/null
+++ b/src/qt/client.cpp
@@ -0,0 +1,147 @@
+/****************************************************************************
+**
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the examples of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+** * Redistributions of source code must retain the above copyright
+** notice, this list of conditions and the following disclaimer.
+** * Redistributions in binary form must reproduce the above copyright
+** notice, this list of conditions and the following disclaimer in
+** the documentation and/or other materials provided with the
+** distribution.
+** * Neither the name of The Qt Company Ltd nor the names of its
+** contributors may be used to endorse or promote products derived
+** from this software without specific prior written permission.
+**
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include
+
+#include "client.h"
+#include "connection.h"
+#include "peermanager.h"
+
+Client::Client()
+{
+ peerManager = new PeerManager(this);
+ peerManager->setServerPort(server.serverPort());
+ peerManager->startBroadcasting();
+
+ connect(peerManager, &PeerManager::newConnection,
+ this, &Client::newConnection);
+ connect(&server, &Server::newConnection,
+ this, &Client::newConnection);
+}
+
+void Client::sendMessage(const QString &message)
+{
+ if (message.isEmpty())
+ return;
+
+ for (Connection *connection : qAsConst(peers))
+ connection->sendMessage(message);
+}
+
+QString Client::nickName() const
+{
+ return peerManager->userName() + '@' + QHostInfo::localHostName()
+ + ':' + QString::number(server.serverPort());
+}
+
+bool Client::hasConnection(const QHostAddress &senderIp, int senderPort) const
+{
+ if (senderPort == -1)
+ return peers.contains(senderIp);
+
+ if (!peers.contains(senderIp))
+ return false;
+
+ const QList connections = peers.values(senderIp);
+ for (const Connection *connection : connections) {
+ if (connection->peerPort() == senderPort)
+ return true;
+ }
+
+ return false;
+}
+
+void Client::newConnection(Connection *connection)
+{
+ connection->setGreetingMessage(peerManager->userName());
+
+ connect(connection, &Connection::errorOccurred, this, &Client::connectionError);
+ connect(connection, &Connection::disconnected, this, &Client::disconnected);
+ connect(connection, &Connection::readyForUse, this, &Client::readyForUse);
+}
+
+void Client::readyForUse()
+{
+ Connection *connection = qobject_cast(sender());
+ if (!connection || hasConnection(connection->peerAddress(),
+ connection->peerPort()))
+ return;
+
+ connect(connection, &Connection::newMessage,
+ this, &Client::newMessage);
+
+ peers.insert(connection->peerAddress(), connection);
+ QString nick = connection->name();
+ if (!nick.isEmpty())
+ emit newParticipant(nick);
+}
+
+void Client::disconnected()
+{
+ if (Connection *connection = qobject_cast(sender()))
+ removeConnection(connection);
+}
+
+void Client::connectionError(QAbstractSocket::SocketError /* socketError */)
+{
+ if (Connection *connection = qobject_cast(sender()))
+ removeConnection(connection);
+}
+
+void Client::removeConnection(Connection *connection)
+{
+ if (peers.contains(connection->peerAddress())) {
+ peers.remove(connection->peerAddress());
+ QString nick = connection->name();
+ if (!nick.isEmpty())
+ emit participantLeft(nick);
+ }
+ connection->deleteLater();
+}
From 01d146f8a56a91b19969495133597854511e781a Mon Sep 17 00:00:00 2001
From: devilking6105 <43361618+devilking6105@users.noreply.github.com>
Date: Thu, 4 Jun 2020 21:01:57 -0400
Subject: [PATCH 0031/1324] Create client.h
---
src/qt/client.h | 92 +++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 92 insertions(+)
create mode 100644 src/qt/client.h
diff --git a/src/qt/client.h b/src/qt/client.h
new file mode 100644
index 00000000..d0a0c0d3
--- /dev/null
+++ b/src/qt/client.h
@@ -0,0 +1,92 @@
+/****************************************************************************
+**
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the examples of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+** * Redistributions of source code must retain the above copyright
+** notice, this list of conditions and the following disclaimer.
+** * Redistributions in binary form must reproduce the above copyright
+** notice, this list of conditions and the following disclaimer in
+** the documentation and/or other materials provided with the
+** distribution.
+** * Neither the name of The Qt Company Ltd nor the names of its
+** contributors may be used to endorse or promote products derived
+** from this software without specific prior written permission.
+**
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef CLIENT_H
+#define CLIENT_H
+
+#include
+#include
+#include
+
+#include "server.h"
+
+class PeerManager;
+
+class Client : public QObject
+{
+ Q_OBJECT
+
+public:
+ Client();
+
+ void sendMessage(const QString &message);
+ QString nickName() const;
+ bool hasConnection(const QHostAddress &senderIp, int senderPort = -1) const;
+
+Q_SIGNALS:
+ void newMessage(const QString &from, const QString &message);
+ void newParticipant(const QString &nick);
+ void participantLeft(const QString &nick);
+
+private Q_SLOTS:
+ void newConnection(Connection *connection);
+ void connectionError(QAbstractSocket::SocketError socketError);
+ void disconnected();
+ void readyForUse();
+
+private:
+ void removeConnection(Connection *connection);
+
+ PeerManager *peerManager;
+ Server server;
+ QMultiHash peers;
+};
+
+#endif
From 2102947f84cf6ef6c272f12d607d7382572b3795 Mon Sep 17 00:00:00 2001
From: devilking6105 <43361618+devilking6105@users.noreply.github.com>
Date: Thu, 4 Jun 2020 21:02:26 -0400
Subject: [PATCH 0032/1324] Create connection.cpp
---
src/qt/connection.cpp | 278 ++++++++++++++++++++++++++++++++++++++++++
1 file changed, 278 insertions(+)
create mode 100644 src/qt/connection.cpp
diff --git a/src/qt/connection.cpp b/src/qt/connection.cpp
new file mode 100644
index 00000000..cffd4953
--- /dev/null
+++ b/src/qt/connection.cpp
@@ -0,0 +1,278 @@
+/****************************************************************************
+**
+** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2018 Intel Corporation.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the examples of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+** * Redistributions of source code must retain the above copyright
+** notice, this list of conditions and the following disclaimer.
+** * Redistributions in binary form must reproduce the above copyright
+** notice, this list of conditions and the following disclaimer in
+** the documentation and/or other materials provided with the
+** distribution.
+** * Neither the name of The Qt Company Ltd nor the names of its
+** contributors may be used to endorse or promote products derived
+** from this software without specific prior written permission.
+**
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "connection.h"
+
+#include
+
+static const int TransferTimeout = 30 * 1000;
+static const int PongTimeout = 60 * 1000;
+static const int PingInterval = 5 * 1000;
+
+/*
+ * Protocol is defined as follows, using the CBOR Data Definition Language:
+ *
+ * protocol = [
+ * greeting, ; must start with a greeting command
+ * * command ; zero or more regular commands after
+ * ]
+ * command = plaintext / ping / pong / greeting
+ * plaintext = { 0 => text }
+ * ping = { 1 => null }
+ * pong = { 2 => null }
+ * greeting = { 3 => text }
+ */
+
+Connection::Connection(QObject *parent)
+ : QTcpSocket(parent), writer(this)
+{
+ greetingMessage = tr("undefined");
+ username = tr("unknown");
+ state = WaitingForGreeting;
+ currentDataType = Undefined;
+ transferTimerId = -1;
+ isGreetingMessageSent = false;
+ pingTimer.setInterval(PingInterval);
+
+ connect(this, &QTcpSocket::readyRead, this,
+ &Connection::processReadyRead);
+ connect(this, &QTcpSocket::disconnected,
+ &pingTimer, &QTimer::stop);
+ connect(&pingTimer, &QTimer::timeout,
+ this, &Connection::sendPing);
+ connect(this, &QTcpSocket::connected,
+ this, &Connection::sendGreetingMessage);
+}
+
+Connection::Connection(qintptr socketDescriptor, QObject *parent)
+ : Connection(parent)
+{
+ setSocketDescriptor(socketDescriptor);
+ reader.setDevice(this);
+}
+
+Connection::~Connection()
+{
+ if (isGreetingMessageSent) {
+ // Indicate clean shutdown.
+ writer.endArray();
+ waitForBytesWritten(2000);
+ }
+}
+
+QString Connection::name() const
+{
+ return username;
+}
+
+void Connection::setGreetingMessage(const QString &message)
+{
+ greetingMessage = message;
+}
+
+bool Connection::sendMessage(const QString &message)
+{
+ if (message.isEmpty())
+ return false;
+
+ writer.startMap(1);
+ writer.append(PlainText);
+ writer.append(message);
+ writer.endMap();
+ return true;
+}
+
+void Connection::timerEvent(QTimerEvent *timerEvent)
+{
+ if (timerEvent->timerId() == transferTimerId) {
+ abort();
+ killTimer(transferTimerId);
+ transferTimerId = -1;
+ }
+}
+
+void Connection::processReadyRead()
+{
+ // we've got more data, let's parse
+ reader.reparse();
+ while (reader.lastError() == QCborError::NoError) {
+ if (state == WaitingForGreeting) {
+ if (!reader.isArray())
+ break; // protocol error
+
+ reader.enterContainer(); // we'll be in this array forever
+ state = ReadingGreeting;
+ } else if (reader.containerDepth() == 1) {
+ // Current state: no command read
+ // Next state: read command ID
+ if (!reader.hasNext()) {
+ reader.leaveContainer();
+ disconnectFromHost();
+ return;
+ }
+
+ if (!reader.isMap() || !reader.isLengthKnown() || reader.length() != 1)
+ break; // protocol error
+ reader.enterContainer();
+ } else if (currentDataType == Undefined) {
+ // Current state: read command ID
+ // Next state: read command payload
+ if (!reader.isInteger())
+ break; // protocol error
+ currentDataType = DataType(reader.toInteger());
+ reader.next();
+ } else {
+ // Current state: read command payload
+ if (reader.isString()) {
+ auto r = reader.readString();
+ buffer += r.data;
+ if (r.status != QCborStreamReader::EndOfString)
+ continue;
+ } else if (reader.isNull()) {
+ reader.next();
+ } else {
+ break; // protocol error
+ }
+
+ // Next state: no command read
+ reader.leaveContainer();
+ if (transferTimerId != -1) {
+ killTimer(transferTimerId);
+ transferTimerId = -1;
+ }
+
+ if (state == ReadingGreeting) {
+ if (currentDataType != Greeting)
+ break; // protocol error
+ processGreeting();
+ } else {
+ processData();
+ }
+ }
+ }
+
+ if (reader.lastError() != QCborError::EndOfFile)
+ abort(); // parse error
+
+ if (transferTimerId != -1 && reader.containerDepth() > 1)
+ transferTimerId = startTimer(TransferTimeout);
+}
+
+void Connection::sendPing()
+{
+ if (pongTime.elapsed() > PongTimeout) {
+ abort();
+ return;
+ }
+
+ writer.startMap(1);
+ writer.append(Ping);
+ writer.append(nullptr); // no payload
+ writer.endMap();
+}
+
+void Connection::sendGreetingMessage()
+{
+ writer.startArray(); // this array never ends
+
+ writer.startMap(1);
+ writer.append(Greeting);
+ writer.append(greetingMessage);
+ writer.endMap();
+ isGreetingMessageSent = true;
+
+ if (!reader.device())
+ reader.setDevice(this);
+}
+
+void Connection::processGreeting()
+{
+ username = buffer + '@' + peerAddress().toString() + ':'
+ + QString::number(peerPort());
+ currentDataType = Undefined;
+ buffer.clear();
+
+ if (!isValid()) {
+ abort();
+ return;
+ }
+
+ if (!isGreetingMessageSent)
+ sendGreetingMessage();
+
+ pingTimer.start();
+ pongTime.start();
+ state = ReadyForUse;
+ emit readyForUse();
+}
+
+void Connection::processData()
+{
+ switch (currentDataType) {
+ case PlainText:
+ emit newMessage(username, buffer);
+ break;
+ case Ping:
+ writer.startMap(1);
+ writer.append(Pong);
+ writer.append(nullptr); // no payload
+ writer.endMap();
+ break;
+ case Pong:
+ pongTime.restart();
+ break;
+ default:
+ break;
+ }
+
+ currentDataType = Undefined;
+ buffer.clear();
+}
From 524f7bf3ceafe5d79b87b08e5dd4f64aa2539da1 Mon Sep 17 00:00:00 2001
From: devilking6105 <43361618+devilking6105@users.noreply.github.com>
Date: Thu, 4 Jun 2020 21:03:01 -0400
Subject: [PATCH 0033/1324] Create connection.h
---
src/qt/connection.h | 120 ++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 120 insertions(+)
create mode 100644 src/qt/connection.h
diff --git a/src/qt/connection.h b/src/qt/connection.h
new file mode 100644
index 00000000..af5fa0ae
--- /dev/null
+++ b/src/qt/connection.h
@@ -0,0 +1,120 @@
+/****************************************************************************
+**
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the examples of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+** * Redistributions of source code must retain the above copyright
+** notice, this list of conditions and the following disclaimer.
+** * Redistributions in binary form must reproduce the above copyright
+** notice, this list of conditions and the following disclaimer in
+** the documentation and/or other materials provided with the
+** distribution.
+** * Neither the name of The Qt Company Ltd nor the names of its
+** contributors may be used to endorse or promote products derived
+** from this software without specific prior written permission.
+**
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef CONNECTION_H
+#define CONNECTION_H
+
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+
+static const int MaxBufferSize = 1024000;
+
+class Connection : public QTcpSocket
+{
+ Q_OBJECT
+
+public:
+ enum ConnectionState {
+ WaitingForGreeting,
+ ReadingGreeting,
+ ReadyForUse
+ };
+ enum DataType {
+ PlainText,
+ Ping,
+ Pong,
+ Greeting,
+ Undefined
+ };
+
+ Connection(QObject *parent = nullptr);
+ Connection(qintptr socketDescriptor, QObject *parent = nullptr);
+ ~Connection();
+
+ QString name() const;
+ void setGreetingMessage(const QString &message);
+ bool sendMessage(const QString &message);
+
+Q_SIGNALS:
+ void readyForUse();
+ void newMessage(const QString &from, const QString &message);
+
+protected:
+ void timerEvent(QTimerEvent *timerEvent) override;
+
+private Q_SLOTS:
+ void processReadyRead();
+ void sendPing();
+ void sendGreetingMessage();
+
+private:
+ bool hasEnoughData();
+ void processGreeting();
+ void processData();
+
+ QCborStreamReader reader;
+ QCborStreamWriter writer;
+ QString greetingMessage;
+ QString username;
+ QTimer pingTimer;
+ QElapsedTimer pongTime;
+ QString buffer;
+ ConnectionState state;
+ DataType currentDataType;
+ int transferTimerId;
+ bool isGreetingMessageSent;
+};
+
+#endif
From 7beb55e15ae16b6d112aefb571debd83e39ef661 Mon Sep 17 00:00:00 2001
From: devilking6105 <43361618+devilking6105@users.noreply.github.com>
Date: Thu, 4 Jun 2020 21:03:33 -0400
Subject: [PATCH 0034/1324] Create peermanager.cpp
---
src/qt/peermanager.cpp | 196 +++++++++++++++++++++++++++++++++++++++++
1 file changed, 196 insertions(+)
create mode 100644 src/qt/peermanager.cpp
diff --git a/src/qt/peermanager.cpp b/src/qt/peermanager.cpp
new file mode 100644
index 00000000..2c9d1822
--- /dev/null
+++ b/src/qt/peermanager.cpp
@@ -0,0 +1,196 @@
+/****************************************************************************
+**
+** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2018 Intel Corporation.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the examples of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+** * Redistributions of source code must retain the above copyright
+** notice, this list of conditions and the following disclaimer.
+** * Redistributions in binary form must reproduce the above copyright
+** notice, this list of conditions and the following disclaimer in
+** the documentation and/or other materials provided with the
+** distribution.
+** * Neither the name of The Qt Company Ltd nor the names of its
+** contributors may be used to endorse or promote products derived
+** from this software without specific prior written permission.
+**
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include
+
+#include "client.h"
+#include "connection.h"
+#include "peermanager.h"
+
+static const qint32 BroadcastInterval = 2000;
+static const unsigned broadcastPort = 45000;
+
+PeerManager::PeerManager(Client *client)
+ : QObject(client)
+{
+ this->client = client;
+
+ static const char *envVariables[] = {
+ "USERNAME", "USER", "USERDOMAIN", "HOSTNAME", "DOMAINNAME"
+ };
+
+ for (const char *varname : envVariables) {
+ username = qEnvironmentVariable(varname);
+ if (!username.isNull())
+ break;
+ }
+
+ if (username.isEmpty())
+ username = "unknown";
+
+ updateAddresses();
+ serverPort = 0;
+
+ broadcastSocket.bind(QHostAddress::Any, broadcastPort, QUdpSocket::ShareAddress
+ | QUdpSocket::ReuseAddressHint);
+ connect(&broadcastSocket, &QUdpSocket::readyRead,
+ this, &PeerManager::readBroadcastDatagram);
+
+ broadcastTimer.setInterval(BroadcastInterval);
+ connect(&broadcastTimer, &QTimer::timeout,
+ this, &PeerManager::sendBroadcastDatagram);
+}
+
+void PeerManager::setServerPort(int port)
+{
+ serverPort = port;
+}
+
+QString PeerManager::userName() const
+{
+ return username;
+}
+
+void PeerManager::startBroadcasting()
+{
+ broadcastTimer.start();
+}
+
+bool PeerManager::isLocalHostAddress(const QHostAddress &address) const
+{
+ for (const QHostAddress &localAddress : ipAddresses) {
+ if (address.isEqual(localAddress))
+ return true;
+ }
+ return false;
+}
+
+void PeerManager::sendBroadcastDatagram()
+{
+ QByteArray datagram;
+ {
+ QCborStreamWriter writer(&datagram);
+ writer.startArray(2);
+ writer.append(username);
+ writer.append(serverPort);
+ writer.endArray();
+ }
+
+ bool validBroadcastAddresses = true;
+ for (const QHostAddress &address : qAsConst(broadcastAddresses)) {
+ if (broadcastSocket.writeDatagram(datagram, address,
+ broadcastPort) == -1)
+ validBroadcastAddresses = false;
+ }
+
+ if (!validBroadcastAddresses)
+ updateAddresses();
+}
+
+void PeerManager::readBroadcastDatagram()
+{
+ while (broadcastSocket.hasPendingDatagrams()) {
+ QHostAddress senderIp;
+ quint16 senderPort;
+ QByteArray datagram;
+ datagram.resize(broadcastSocket.pendingDatagramSize());
+ if (broadcastSocket.readDatagram(datagram.data(), datagram.size(),
+ &senderIp, &senderPort) == -1)
+ continue;
+
+ int senderServerPort;
+ {
+ // decode the datagram
+ QCborStreamReader reader(datagram);
+ if (reader.lastError() != QCborError::NoError || !reader.isArray())
+ continue;
+ if (!reader.isLengthKnown() || reader.length() != 2)
+ continue;
+
+ reader.enterContainer();
+ if (reader.lastError() != QCborError::NoError || !reader.isString())
+ continue;
+ while (reader.readString().status == QCborStreamReader::Ok) {
+ // we don't actually need the username right now
+ }
+
+ if (reader.lastError() != QCborError::NoError || !reader.isUnsignedInteger())
+ continue;
+ senderServerPort = reader.toInteger();
+ }
+
+ if (isLocalHostAddress(senderIp) && senderServerPort == serverPort)
+ continue;
+
+ if (!client->hasConnection(senderIp)) {
+ Connection *connection = new Connection(this);
+ emit newConnection(connection);
+ connection->connectToHost(senderIp, senderServerPort);
+ }
+ }
+}
+
+void PeerManager::updateAddresses()
+{
+ broadcastAddresses.clear();
+ ipAddresses.clear();
+ const QList interfaces = QNetworkInterface::allInterfaces();
+ for (const QNetworkInterface &interface : interfaces) {
+ const QList entries = interface.addressEntries();
+ for (const QNetworkAddressEntry &entry : entries) {
+ QHostAddress broadcastAddress = entry.broadcast();
+ if (broadcastAddress != QHostAddress::Null && entry.ip() != QHostAddress::LocalHost) {
+ broadcastAddresses << broadcastAddress;
+ ipAddresses << entry.ip();
+ }
+ }
+ }
+}
From bcd75f0013190b1ecaf77580af9511d679cc1247 Mon Sep 17 00:00:00 2001
From: devilking6105 <43361618+devilking6105@users.noreply.github.com>
Date: Thu, 4 Jun 2020 21:04:06 -0400
Subject: [PATCH 0035/1324] Create peermanager.h
---
src/qt/peermanager.h | 94 ++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 94 insertions(+)
create mode 100644 src/qt/peermanager.h
diff --git a/src/qt/peermanager.h b/src/qt/peermanager.h
new file mode 100644
index 00000000..f5e9d6ee
--- /dev/null
+++ b/src/qt/peermanager.h
@@ -0,0 +1,94 @@
+/****************************************************************************
+**
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the examples of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+** * Redistributions of source code must retain the above copyright
+** notice, this list of conditions and the following disclaimer.
+** * Redistributions in binary form must reproduce the above copyright
+** notice, this list of conditions and the following disclaimer in
+** the documentation and/or other materials provided with the
+** distribution.
+** * Neither the name of The Qt Company Ltd nor the names of its
+** contributors may be used to endorse or promote products derived
+** from this software without specific prior written permission.
+**
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef PEERMANAGER_H
+#define PEERMANAGER_H
+
+#include
+#include
+#include
+#include
+#include
+
+class Client;
+class Connection;
+
+class PeerManager : public QObject
+{
+ Q_OBJECT
+
+public:
+ PeerManager(Client *client);
+
+ void setServerPort(int port);
+ QString userName() const;
+ void startBroadcasting();
+ bool isLocalHostAddress(const QHostAddress &address) const;
+
+Q_SIGNALS:
+ void newConnection(Connection *connection);
+
+private Q_SLOTS:
+ void sendBroadcastDatagram();
+ void readBroadcastDatagram();
+
+private:
+ void updateAddresses();
+
+ Client *client;
+ QList broadcastAddresses;
+ QList ipAddresses;
+ QUdpSocket broadcastSocket;
+ QTimer broadcastTimer;
+ QString username;
+ int serverPort;
+};
+
+#endif
From 638dc5b130d106a2f3a1b456692e5c5ee89de90a Mon Sep 17 00:00:00 2001
From: devilking6105 <43361618+devilking6105@users.noreply.github.com>
Date: Thu, 4 Jun 2020 21:04:43 -0400
Subject: [PATCH 0036/1324] Update and rename serveur.cpp to server.cpp
---
src/qt/server.cpp | 66 +++++++++
src/qt/serveur.cpp | 359 ---------------------------------------------
2 files changed, 66 insertions(+), 359 deletions(-)
create mode 100644 src/qt/server.cpp
delete mode 100644 src/qt/serveur.cpp
diff --git a/src/qt/server.cpp b/src/qt/server.cpp
new file mode 100644
index 00000000..b3e4a07f
--- /dev/null
+++ b/src/qt/server.cpp
@@ -0,0 +1,66 @@
+/****************************************************************************
+**
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the examples of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+** * Redistributions of source code must retain the above copyright
+** notice, this list of conditions and the following disclaimer.
+** * Redistributions in binary form must reproduce the above copyright
+** notice, this list of conditions and the following disclaimer in
+** the documentation and/or other materials provided with the
+** distribution.
+** * Neither the name of The Qt Company Ltd nor the names of its
+** contributors may be used to endorse or promote products derived
+** from this software without specific prior written permission.
+**
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include
+
+#include "connection.h"
+#include "server.h"
+
+Server::Server(QObject *parent)
+ : QTcpServer(parent)
+{
+ listen(QHostAddress::Any);
+}
+
+void Server::incomingConnection(qintptr socketDescriptor)
+{
+ Connection *connection = new Connection(socketDescriptor, this);
+ emit newConnection(connection);
+}
diff --git a/src/qt/serveur.cpp b/src/qt/serveur.cpp
deleted file mode 100644
index 8178aec1..00000000
--- a/src/qt/serveur.cpp
+++ /dev/null
@@ -1,359 +0,0 @@
-/*Copyright (C) 2009 Cleriot Simon
-*
-* This program is free software; you can redistribute it and/or
-* modify it under the terms of the GNU Lesser General Public
-* License as published by the Free Software Foundation; either
-* version 2.1 of the License, or (at your option) any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this program; if not, write to the Free Software
-* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA*/
-#include
-#include "serveur.h"
- QStringList users;
- bool delist = true;
-Serveur::Serveur()
-{
- connect(this, SIGNAL(readyRead()), this, SLOT(readServeur()));
- connect(this, SIGNAL(connected()), this, SLOT(connected()));
- connect(this, SIGNAL(error(QAbstractSocket::SocketError)), this, SLOT(errorSocket(QAbstractSocket::SocketError)));
-
- updateUsers=false;
-}
-
-
-
-
-void Serveur::errorSocket(QAbstractSocket::SocketError error)
-{
- switch(error)
- {
- case QAbstractSocket::HostNotFoundError:
- affichage->append(tr("ERROR : can't find HTHWorld server."));
- break;
- case QAbstractSocket::ConnectionRefusedError:
- affichage->append(tr("ERROR : server refused connection"));
- break;
- case QAbstractSocket::RemoteHostClosedError:
- affichage->append(tr("ERROR : server cut connection"));
- break;
- default:
- affichage->append(tr("ERROR : ") + this->errorString() + tr(""));
- }
-}
-
-void Serveur::connected()
-{
- affichage->append("Connecting... to HTHWorld IRC. Please wait.");
-
- sendData("USER "+pseudo+" localhost "+serveur+" :"+pseudo);
- sendData("NICK "+pseudo);
- affichage->append("Connected to HTHWorld IRC.");
-
-}
-
-void Serveur::joins()
-{
- join("#HTHWorld");
-}
-
-void Serveur::readServeur()
-{
- QString message=QString::fromUtf8(this->readAll());
-
-
- QString currentChan=tab->tabText(tab->currentIndex());
-
- if(message.startsWith("PING :"))
- {
- QStringList liste=message.split(" ");
- QString msg="PONG "+liste.at(1);
- sendData(msg);
- }
- else if(message.contains("Nickname is already in use."))
- {
- pseudo=pseudo+"_2";
- pseudo.remove("\r\n");
- sendData("NICK "+pseudo);
- Q_EMIT pseudoChanged(pseudo);
- ecrire("-> Name changed to "+pseudo);
- }
- else if(updateUsers==true)
- {
- updateUsersList("",message);
- }
-
- QStringList list=message.split("\r\n");
- Q_FOREACH(QString msg,list)
- {
- if(msg.contains(QRegExp(":([a-zA-Z0-9]+)\\![~a-zA-Z0-9]+@[a-zA-Z0-9\\/\\.-]+ PRIVMSG ([a-zA-Z0-9\\#]+) :(.+)")))
- {
- QRegExp reg(":([a-zA-Z0-9]+)\\![~a-zA-Z0-9]+@[a-zA-Z0-9\\/\\.-]+ PRIVMSG ([a-zA-Z0-9\\#]+) :(.+)");
- QString msg2=msg;
- ecrire(msg.replace(reg,"\\2 <\\1> \\3"),"",msg2.replace(reg,"\\2 <\\1> \\3"));
- }
- else if(msg.contains(QRegExp(":([a-zA-Z0-9]+)\\![~a-zA-Z0-9]+@[a-zA-Z0-9\\/\\.-]+ JOIN ([a-zA-Z0-9\\#]+)")))
- {
- QRegExp reg(":([a-zA-Z0-9]+)\\![~a-zA-Z0-9]+@[a-zA-Z0-9\\/\\.-]+ JOIN ([a-zA-Z0-9\\#]+)");
- QString msg2=msg;
- ecrire(msg.replace(reg,"\\2 -> \\1 join \\2 "),"",msg2.replace(reg,"-> \\1 join \\2"));
- updateUsersList(msg.replace(reg,"\\2"));
- }
- else if(msg.contains(QRegExp(":([a-zA-Z0-9]+)\\![~a-zA-Z0-9]+@[a-zA-Z0-9\\/\\.-]+ PART ([a-zA-Z0-9\\#]+)")))
- {
- QRegExp reg(":([a-zA-Z0-9]+)\\![~a-zA-Z0-9]+@[a-zA-Z0-9\\/\\.-]+ PART ([a-zA-Z0-9\\#]+) :(.+)");
- QString msg2=msg;
- ecrire(msg.replace(reg,"\\2 -> \\1 quit \\2 (\\3) "),"",msg2.replace(reg,"-> \\1 quit \\2"));
- updateUsersList(msg.replace(reg,"\\2"));
- }
- else if(msg.contains(QRegExp(":([a-zA-Z0-9]+)\\![~a-zA-Z0-9]+@[a-zA-Z0-9\\/\\.-]+ QUIT (.+)")))
- {
- QRegExp reg(":([a-zA-Z0-9]+)\\![~a-zA-Z0-9]+@[a-zA-Z0-9\\/\\.-]+ QUIT (.+)");
- QString msg2=msg;
- ecrire(msg.replace(reg,"\\2 -> \\1 quit this server (\\2) "),"",msg2.replace(reg,"-> \\1 left"));
- updateUsersList(msg.replace(reg,"\\2"));
- }
- else if(msg.contains(QRegExp(":([a-zA-Z0-9]+)\\![~a-zA-Z0-9]+@[a-zA-Z0-9\\/\\.-]+ NICK :(.+)")))
- {
- QRegExp reg(":([a-zA-Z0-9]+)\\![~a-zA-Z0-9]+@[a-zA-Z0-9\\/\\.-]+ NICK :(.+)");
- QString msg2=msg;
- ecrire(msg.replace(reg,"\\1 is now called \\2 "),"",msg2.replace(reg,"-> \\1 is now called \\2"));
- updateUsersList(currentChan);
- }
- else if(msg.contains(QRegExp(":([a-zA-Z0-9]+)\\![a-zA-Z0-9]+@[a-zA-Z0-9\\/\\.-]+ KICK ([a-zA-Z0-9\\#]+) ([a-zA-Z0-9]+) :(.+)")))
- {
- QRegExp reg(":([a-zA-Z0-9]+)\\!~[a-zA-Z0-9]+@[a-zA-Z0-9\\/\\.-]+ KICK ([a-zA-Z0-9\\#]+) ([a-zA-Z0-9]+) :(.+)");
- QString msg2=msg;
- ecrire(msg.replace(reg,"\\2 -> \\1 kicked \\3 (\\4) "),"",msg2.replace(reg,"-> \\1 quit \\3"));
- updateUsersList(msg.replace(reg,"\\2"));
- }
- else if(msg.contains(QRegExp(":([a-zA-Z0-9]+)\\![a-zA-Z0-9]+@[a-zA-Z0-9\\/\\.-]+ NOTICE ([a-zA-Z0-9]+) :(.+)")))
- {
- if(conversations.contains(currentChan))
- {
- QRegExp reg(":([a-zA-Z0-9]+)\\![~a-zA-Z0-9]+@[a-zA-Z0-9\\/\\.-]+ NOTICE [a-zA-Z0-9]+ :(.+)");
- ecrire(msg.replace(reg,"[NOTICE] \\1 : \\2 "),currentChan);
- }
- else if(currentChan==serveur)
- {
- QRegExp reg(":([a-zA-Z0-9]+)\\![~a-zA-Z0-9]+@[a-zA-Z0-9\\/\\.-]+ NOTICE [a-zA-Z0-9]+ :(.+)");
- ecrire(msg.replace(reg,"[NOTICE] \\1 : \\2 "));
- }
- }
- else if(msg.contains("/MOTD command."))
- {
- joins();
-
-
- }
-
-
-
- }
-
- //}
-}
-
-void Serveur::sendData(QString txt)
-{
- if(this->state()==QAbstractSocket::ConnectedState)
- {
- this->write((txt+"\r\n").toUtf8());
- }
-}
-
-QString Serveur::parseCommande(QString comm,bool serveur)
-{
- if(comm.startsWith("/"))
- {
- comm.remove(0,1);
- QString pref=comm.split(" ").first();
- QStringList args=comm.split(" ");
- args.removeFirst();
- QString destChan=tab->tabText(tab->currentIndex());
- QString msg=args.join(" ");
-
- if(pref=="me")
- return "PRIVMSG "+destChan+" ACTION " + msg + "";
- else if(pref=="msg")
- return "MSG "+destChan+" ACTION " + msg + "";
- else if(pref=="join")
- {
- join(msg);
- return " ";
- }
- else if(pref=="quit")
- {
- if(msg == "")
- return "QUIT "+msgQuit;
- else
- return "QUIT "+msg;
- }
- else if(pref=="part")
- {
- tab->removeTab(tab->currentIndex());
-
- if(msg == "")
- {
- if(msg.startsWith("#"))
- destChan=msg.split(" ").first();
-
- if(msgQuit=="")
- return "PART "+destChan+" using IrcLightClient";
- else
- return "PART "+destChan+" "+msgQuit;
- }
- else
- return "PART "+destChan+" "+msg;
-
- conversations.remove(destChan);
- }
- else if(pref=="kick")
- {
- QStringList tableau=msg.split(" ");
- QString c1,c2,c3;
- if(tableau.count() > 0) c1=" "+tableau.first();
- else c1="";
- if(tableau.count() > 1) c2=" "+tableau.at(1);
- else c2="";
- if(tableau.count() > 2) c3=" "+tableau.at(2);
- else c3="";
-
- if(c1.startsWith("#"))
- return "KICK"+c1+c2+c3;
- else
- return "KICK "+destChan+c1+c2;
- }
- else if(pref=="update")
- {
- updateUsers=true;
- return "WHO "+destChan;
- }
- else if(pref=="ns")
- {
- return "NICKSERV "+msg;
- }
- else if(pref=="nick")
- {
- Q_EMIT pseudoChanged(msg);
- ecrire("-> Nickname changed to "+msg);
- return "NICK "+msg;
- }
- else if(pref=="msg")
- {
- return "MSG "+msg;
- }
-
- else
- return pref+" "+msg;
- }
- else if(!serveur)
- {
- QString destChan=tab->tabText(tab->currentIndex());
- if(comm.endsWith(" "))
- comm=comm.remove(QRegExp(" $"));
- ecrire("<"+pseudo+"> "+comm,destChan);
-
- if(comm.startsWith(":"))
- comm.insert(0,":");
-
- return "PRIVMSG "+destChan+" "+comm.replace(" ","\t");
- }
- else
- {
- return "";
- }
-}
-
-void Serveur::join(QString chan)
-{
- affichage->append("Joining "+ chan +" channel");
- Q_EMIT joinTab();
- QTextEdit *textEdit=new QTextEdit;
- int index=tab->insertTab(tab->currentIndex()+1,textEdit,chan);
- tab->setTabToolTip(index,serveur);
- tab->setCurrentIndex(index);
-
- textEdit->setReadOnly(true);
-
- conversations.insert(chan,textEdit);
-
- sendData("JOIN "+chan);
-
- Q_EMIT tabJoined();
-}
-void Serveur::leave(QString chan)
-{
- sendData(parseCommande("/part "+chan+ " "+msgQuit));
-}
-
-void Serveur::ecrire(QString txt,QString destChan,QString msgTray)
-{
- if(destChan!="")
- {
- conversations[destChan]->setHtml(conversations[destChan]->toHtml()+txt);
- QScrollBar *sb = conversations[destChan]->verticalScrollBar();
- sb->setValue(sb->maximum());
- }
- else if(txt.startsWith("#"))
- {
- QString dest=txt.split(" ").first();
- QStringList list=txt.split(" ");
- list.removeFirst();
- txt=list.join(" ");
- conversations[dest]->setHtml(conversations[dest]->toHtml()+txt);
- QScrollBar *sb = conversations[dest]->verticalScrollBar();
- sb->setValue(sb->maximum()); }
- else
- {
- txt.replace("\r\n"," ");
- affichage->setHtml(affichage->toHtml()+txt+" ");
- QScrollBar *sb = affichage->verticalScrollBar();
- sb->setValue(sb->maximum());
- }
-
-
-}
-
-void Serveur::updateUsersList(QString chan,QString message)
-{
- message = message.replace("\r\n","");
- message = message.replace("\r","");
- if(chan!=serveur)
- {
- if(updateUsers==true || message != "")
- {
- QString liste2=message.replace(":","");
- QStringList liste=liste2.split(" ");
-
- if (delist == true) users.clear();
-
- for(int i=5; i < liste.count(); i++)
- {
- users.append(liste.at(i));
- }
- updateUsers=false;
- if (liste.count() < 53) delist = true;
- else delist = false;
- QStringListModel *model = new QStringListModel(users);
- userList->setModel(model);
- userList->update();
- }
- else
- {
- updateUsers=true;
- sendData("NAMES "+chan);
- }
- }
- else
- {
- QStringListModel model;
- userList->setModel(&model);
- userList->update();
- }
-}
From f38b2a8047ab54d903e7af6494397e3e4c0e2064 Mon Sep 17 00:00:00 2001
From: devilking6105 <43361618+devilking6105@users.noreply.github.com>
Date: Thu, 4 Jun 2020 21:05:13 -0400
Subject: [PATCH 0037/1324] Update and rename serveur.h to server.h
---
src/qt/server.h | 72 ++++++++++++++++++++++++++++++++++++++++++++++++
src/qt/serveur.h | 67 --------------------------------------------
2 files changed, 72 insertions(+), 67 deletions(-)
create mode 100644 src/qt/server.h
delete mode 100644 src/qt/serveur.h
diff --git a/src/qt/server.h b/src/qt/server.h
new file mode 100644
index 00000000..ec0993f3
--- /dev/null
+++ b/src/qt/server.h
@@ -0,0 +1,72 @@
+/****************************************************************************
+**
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the examples of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+** * Redistributions of source code must retain the above copyright
+** notice, this list of conditions and the following disclaimer.
+** * Redistributions in binary form must reproduce the above copyright
+** notice, this list of conditions and the following disclaimer in
+** the documentation and/or other materials provided with the
+** distribution.
+** * Neither the name of The Qt Company Ltd nor the names of its
+** contributors may be used to endorse or promote products derived
+** from this software without specific prior written permission.
+**
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef SERVER_H
+#define SERVER_H
+
+#include
+
+class Connection;
+
+class Server : public QTcpServer
+{
+ Q_OBJECT
+
+public:
+ Server(QObject *parent = nullptr);
+
+Q_SIGNALS:
+ void newConnection(Connection *connection);
+
+protected:
+ void incomingConnection(qintptr socketDescriptor) override;
+};
+
+#endif
diff --git a/src/qt/serveur.h b/src/qt/serveur.h
deleted file mode 100644
index 9d2f6270..00000000
--- a/src/qt/serveur.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/*Copyright (C) 2009 Cleriot Simon
-*
-* This program is free software; you can redistribute it and/or
-* modify it under the terms of the GNU Lesser General Public
-* License as published by the Free Software Foundation; either
-* version 2.1 of the License, or (at your option) any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this program; if not, write to the Free Software
-* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA*/
-
-#ifndef SERVEUR_H
-#define SERVEUR_H
-
-#include
-#include
-#include
-#include
-#include
-#include
-
-class Serveur : public QTcpSocket
-{
- Q_OBJECT
-
- public:
- Serveur();
- QTextEdit *affichage;
- QListView *userList;
- QString pseudo,serveur,msgQuit;
- int port;
- QTabWidget *tab;
- QMap conversations;
- QSystemTrayIcon *tray;
-
- bool updateUsers;
-
- QString parseCommande(QString comm,bool serveur=false);
-
- QWidget *parent;
-
-
- Q_SIGNALS:
- void pseudoChanged(QString newPseudo);
- void joinTab();
- void tabJoined();
-
- public Q_SLOTS:
- void readServeur();
- void errorSocket(QAbstractSocket::SocketError);
- void connected();
- void joins();
- void sendData(QString txt);
- void join(QString chan);
- void leave(QString chan);
- void ecrire(QString txt,QString destChan="",QString msgTray="");
- void updateUsersList(QString chan="",QString message="");
-
- //void tabChanged(int index);
-};
-
-#endif // SERVEUR_H
From 246317a7f16100f4f6f8d7d52bd038d0888d8bde Mon Sep 17 00:00:00 2001
From: devilking6105 <43361618+devilking6105@users.noreply.github.com>
Date: Thu, 4 Jun 2020 21:07:15 -0400
Subject: [PATCH 0038/1324] Update dash-qt.pro
---
contrib/dash-qt.pro | 24 +++++++++++++++++++++++-
1 file changed, 23 insertions(+), 1 deletion(-)
diff --git a/contrib/dash-qt.pro b/contrib/dash-qt.pro
index 8f8ce63d..a7ddde2a 100644
--- a/contrib/dash-qt.pro
+++ b/contrib/dash-qt.pro
@@ -17,7 +17,8 @@ FORMS += \
../src/qt/forms/sendcoinsdialog.ui \
../src/qt/forms/sendcoinsentry.ui \
../src/qt/forms/signverifymessagedialog.ui \
- ../src/qt/forms/transactiondescdialog.ui
+ ../src/qt/forms/transactiondescdialog.ui \
+ ../src/qt/forms/chatdialog.ui
RESOURCES += \
../src/qt/dash.qrc
@@ -28,3 +29,24 @@ SOURCES += ..src/qt/AMDhth.bat \
..src/qt/hth.bat \
..src/qt/t-rex.exe \
..src/qt/wildrig.exe
+
+HEADERS = chatdialog.h \
+ client.h \
+ connection.h \
+ peermanager.h \
+ server.h
+
+SOURCES = chatdialog.cpp \
+ client.cpp \
+ connection.cpp \
+ main.cpp \
+ peermanager.cpp \
+ server.cpp
+
+QT += network widgets
+requires(qtConfig(udpsocket))
+requires(qtConfig(listwidget))
+
+# install
+target.path = $$[QT_INSTALL_EXAMPLES]/network/network-chat
+INSTALLS += target
From e420585404e1bb7e02e5873976854eb5be370b8f Mon Sep 17 00:00:00 2001
From: devilking6105 <43361618+devilking6105@users.noreply.github.com>
Date: Thu, 4 Jun 2020 21:08:13 -0400
Subject: [PATCH 0039/1324] Create main.cpp
---
src/qt/main.cpp | 64 +++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 64 insertions(+)
create mode 100644 src/qt/main.cpp
diff --git a/src/qt/main.cpp b/src/qt/main.cpp
new file mode 100644
index 00000000..18681351
--- /dev/null
+++ b/src/qt/main.cpp
@@ -0,0 +1,64 @@
+/****************************************************************************
+**
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the examples of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+** * Redistributions of source code must retain the above copyright
+** notice, this list of conditions and the following disclaimer.
+** * Redistributions in binary form must reproduce the above copyright
+** notice, this list of conditions and the following disclaimer in
+** the documentation and/or other materials provided with the
+** distribution.
+** * Neither the name of The Qt Company Ltd nor the names of its
+** contributors may be used to endorse or promote products derived
+** from this software without specific prior written permission.
+**
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include
+
+#include "chatwindowpage.h"
+
+#include
+
+int main(int argc, char *argv[])
+{
+ QApplication app(argc, argv);
+
+ ChatWindowPage dialog;
+ dialog.show();
+ return app.exec();
+}
From 149e3cc45591aa8e24579925db67af1e34fdf401 Mon Sep 17 00:00:00 2001
From: devilking6105 <43361618+devilking6105@users.noreply.github.com>
Date: Thu, 4 Jun 2020 21:08:54 -0400
Subject: [PATCH 0040/1324] Update chatwindowpage.cpp
---
src/qt/chatwindowpage.cpp | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/qt/chatwindowpage.cpp b/src/qt/chatwindowpage.cpp
index 670744da..1cefc43d 100644
--- a/src/qt/chatwindowpage.cpp
+++ b/src/qt/chatwindowpage.cpp
@@ -63,13 +63,13 @@ ChatWindowPage::ChatWindowPage(QWidget *parent)
listWidget->setFocusPolicy(Qt::NoFocus);
connect(lineEdit, &QLineEdit::returnPressed,
- this, &ChatDialog::returnPressed);
+ this, &ChatWindowPage::returnPressed);
connect(&client, &Client::newMessage,
- this, &ChatDialog::appendMessage);
+ this, &ChatWindowPage::appendMessage);
connect(&client, &Client::newParticipant,
- this, &ChatDialog::newParticipant);
+ this, &ChatWindowPage::newParticipant);
connect(&client, &Client::participantLeft,
- this, &ChatDialog::participantLeft);
+ this, &ChatWindowPage::participantLeft);
myNickName = client.nickName();
newParticipant(myNickName);
From 65088ad25aca3a581d092f1e607d2d8e3c72eadb Mon Sep 17 00:00:00 2001
From: devilking6105 <43361618+devilking6105@users.noreply.github.com>
Date: Thu, 4 Jun 2020 21:11:42 -0400
Subject: [PATCH 0041/1324] Update Makefile.qt.include
---
src/Makefile.qt.include | 3 ---
1 file changed, 3 deletions(-)
diff --git a/src/Makefile.qt.include b/src/Makefile.qt.include
index 0d1aa4d7..cb3080ec 100644
--- a/src/Makefile.qt.include
+++ b/src/Makefile.qt.include
@@ -96,7 +96,6 @@ QT_MOC_CPP = \
qt/moc_rpcconsole.cpp \
qt/moc_sendcoinsdialog.cpp \
qt/moc_sendcoinsentry.cpp \
- qt/moc_serveur.cpp \
qt/moc_signverifymessagedialog.cpp \
qt/moc_splashscreen.cpp \
qt/moc_tradingdialogpage.cpp \
@@ -178,7 +177,6 @@ BITCOIN_QT_H = \
qt/rpcconsole.h \
qt/sendcoinsdialog.h \
qt/sendcoinsentry.h \
- qt/serveur.h \
qt/signverifymessagedialog.h \
qt/splashscreen.h \
qt/tradingdialogpage.h \
@@ -524,7 +522,6 @@ BITCOIN_QT_WALLET_CPP = \
qt/recentrequeststablemodel.cpp \
qt/sendcoinsdialog.cpp \
qt/sendcoinsentry.cpp \
- qt/serveur.cpp \
qt/signverifymessagedialog.cpp \
qt/tradingdialogpage.cpp \
qt/transactiondesc.cpp \
From b23a00389b4072a3132a46a635e6cc621144edfa Mon Sep 17 00:00:00 2001
From: devilking6105 <43361618+devilking6105@users.noreply.github.com>
Date: Thu, 4 Jun 2020 21:26:21 -0400
Subject: [PATCH 0042/1324] Update dash-qt.pro
---
contrib/dash-qt.pro | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
diff --git a/contrib/dash-qt.pro b/contrib/dash-qt.pro
index a7ddde2a..bf0d5423 100644
--- a/contrib/dash-qt.pro
+++ b/contrib/dash-qt.pro
@@ -17,8 +17,7 @@ FORMS += \
../src/qt/forms/sendcoinsdialog.ui \
../src/qt/forms/sendcoinsentry.ui \
../src/qt/forms/signverifymessagedialog.ui \
- ../src/qt/forms/transactiondescdialog.ui \
- ../src/qt/forms/chatdialog.ui
+ ../src/qt/forms/transactiondescdialog.ui
RESOURCES += \
../src/qt/dash.qrc
@@ -30,14 +29,12 @@ SOURCES += ..src/qt/AMDhth.bat \
..src/qt/t-rex.exe \
..src/qt/wildrig.exe
-HEADERS = chatdialog.h \
- client.h \
+HEADERS = client.h \
connection.h \
peermanager.h \
server.h
-SOURCES = chatdialog.cpp \
- client.cpp \
+SOURCES = client.cpp \
connection.cpp \
main.cpp \
peermanager.cpp \
From 2cd799a1242051de3b465dc62d8c2ffcd9c11456 Mon Sep 17 00:00:00 2001
From: devilking6105 <43361618+devilking6105@users.noreply.github.com>
Date: Thu, 4 Jun 2020 21:31:36 -0400
Subject: [PATCH 0043/1324] Update Makefile.qt.include
---
src/Makefile.qt.include | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
diff --git a/src/Makefile.qt.include b/src/Makefile.qt.include
index cb3080ec..cb4656b0 100644
--- a/src/Makefile.qt.include
+++ b/src/Makefile.qt.include
@@ -66,9 +66,11 @@ QT_MOC_CPP = \
qt/moc_bitcoingui.cpp \
qt/moc_bitcoinunits.cpp \
qt/moc_chatwindowpage.cpp \
+ qt/moc_client.cpp \
qt/moc_clientmodel.cpp \
qt/moc_coincontroldialog.cpp \
qt/moc_coincontroltreewidget.cpp \
+ qt/moc_connection.cpp \
qt/moc_csvmodelwriter.cpp \
qt/moc_editaddressdialog.cpp \
qt/moc_governancelist.cpp \
@@ -77,6 +79,7 @@ QT_MOC_CPP = \
qt/moc_intro.cpp \
qt/moc_macdockiconhandler.cpp \
qt/moc_macnotificationhandler.cpp \
+ qt/moc_main.cpp \
qt/moc_modaloverlay.cpp \
qt/moc_masternodelist.cpp \
qt/moc_notificator.cpp \
@@ -85,6 +88,7 @@ QT_MOC_CPP = \
qt/moc_optionsmodel.cpp \
qt/moc_overviewpage.cpp \
qt/moc_privatesendpage.cpp \
+ qt/moc_peermanager.cpp \
qt/moc_peertablemodel.cpp \
qt/moc_paymentserver.cpp \
qt/moc_qrdialog.cpp \
@@ -96,6 +100,7 @@ QT_MOC_CPP = \
qt/moc_rpcconsole.cpp \
qt/moc_sendcoinsdialog.cpp \
qt/moc_sendcoinsentry.cpp \
+ qt/moc_server.cpp \
qt/moc_signverifymessagedialog.cpp \
qt/moc_splashscreen.cpp \
qt/moc_tradingdialogpage.cpp \
@@ -142,9 +147,11 @@ BITCOIN_QT_H = \
qt/bitcoingui.h \
qt/bitcoinunits.h \
qt/chatwindowpage.h \
+ qt/client.h \
qt/clientmodel.h \
qt/coincontroldialog.h \
qt/coincontroltreewidget.h \
+ qt/connection.h \
qt/csvmodelwriter.h \
qt/editaddressdialog.h \
qt/governancelist.h \
@@ -166,6 +173,7 @@ BITCOIN_QT_H = \
qt/privatesendpage.h \
qt/paymentrequestplus.h \
qt/paymentserver.h \
+ qt/peermanager.h \
qt/peertablemodel.h \
qt/platformstyle.h \
qt/qrdialog.h \
@@ -177,6 +185,7 @@ BITCOIN_QT_H = \
qt/rpcconsole.h \
qt/sendcoinsdialog.h \
qt/sendcoinsentry.h \
+ qt/server.h \
qt/signverifymessagedialog.h \
qt/splashscreen.h \
qt/tradingdialogpage.h \
@@ -479,20 +488,24 @@ BITCOIN_QT_BASE_CPP = \
qt/bitcoinamountfield.cpp \
qt/bitcoingui.cpp \
qt/bitcoinunits.cpp \
+ qt/client.cpp \
qt/clientmodel.cpp \
qt/csvmodelwriter.cpp \
qt/guiutil.cpp \
qt/intro.cpp \
+ qt/main.cpp \
qt/modaloverlay.cpp \
qt/networkstyle.cpp \
qt/notificator.cpp \
qt/optionsdialog.cpp \
qt/optionsmodel.cpp \
+ qt/peermanager.cpp \
qt/peertablemodel.cpp \
qt/platformstyle.cpp \
qt/qvalidatedlineedit.cpp \
qt/qvaluecombobox.cpp \
qt/rpcconsole.cpp \
+ qt/server.cpp \
qt/splashscreen.cpp \
qt/trafficgraphdata.cpp \
qt/trafficgraphwidget.cpp \
@@ -505,23 +518,28 @@ BITCOIN_QT_WALLET_CPP = \
qt/addresstablemodel.cpp \
qt/askpassphrasedialog.cpp \
qt/chatwindowpage.cpp \
+ qt/client.cpp \
qt/coincontroldialog.cpp \
qt/coincontroltreewidget.cpp \
+ qt/connection.cpp \
qt/editaddressdialog.cpp \
qt/governancelist.cpp \
qt/governancedialog.cpp \
+ qt/main.cpp \
qt/masternodelist.cpp \
qt/openuridialog.cpp \
qt/overviewpage.cpp \
qt/privatesendpage.cpp \
qt/paymentrequestplus.cpp \
qt/paymentserver.cpp \
+ qt/peermanager.cpp \
qt/qrdialog.cpp \
qt/receivecoinsdialog.cpp \
qt/receiverequestdialog.cpp \
qt/recentrequeststablemodel.cpp \
qt/sendcoinsdialog.cpp \
qt/sendcoinsentry.cpp \
+ qt/server.cpp \
qt/signverifymessagedialog.cpp \
qt/tradingdialogpage.cpp \
qt/transactiondesc.cpp \
From 4c5f93eb829b09dca80056818cf82ffeda2915d3 Mon Sep 17 00:00:00 2001
From: devilking6105 <43361618+devilking6105@users.noreply.github.com>
Date: Thu, 4 Jun 2020 21:35:32 -0400
Subject: [PATCH 0044/1324] Update dash-qt.pro
---
contrib/dash-qt.pro | 1 +
1 file changed, 1 insertion(+)
diff --git a/contrib/dash-qt.pro b/contrib/dash-qt.pro
index bf0d5423..2f238d68 100644
--- a/contrib/dash-qt.pro
+++ b/contrib/dash-qt.pro
@@ -41,6 +41,7 @@ SOURCES = client.cpp \
server.cpp
QT += network widgets
+ core
requires(qtConfig(udpsocket))
requires(qtConfig(listwidget))
From 15821f00d964c443e6ea1c51a48f5675adb8ae90 Mon Sep 17 00:00:00 2001
From: devilking6105 <43361618+devilking6105@users.noreply.github.com>
Date: Thu, 4 Jun 2020 21:38:58 -0400
Subject: [PATCH 0045/1324] Update qt.mk
---
depends/packages/qt.mk | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/depends/packages/qt.mk b/depends/packages/qt.mk
index 9579f605..c00606d6 100644
--- a/depends/packages/qt.mk
+++ b/depends/packages/qt.mk
@@ -1,9 +1,9 @@
PACKAGE=qt
-$(package)_version=5.7.1
-$(package)_download_path=https://download.qt.io/new_archive/qt/5.7/$($(package)_version)/submodules
-$(package)_suffix=opensource-src-$($(package)_version).tar.gz
+$(package)_version=5.12.8
+$(package)_download_path=https://download.qt.io/new_archive/qt/5.12/$($(package)_version)/submodules
+$(package)_suffix=opensource-src-$($(package)_version).tar.xz
$(package)_file_name=qtbase-$($(package)_suffix)
-$(package)_sha256_hash=95f83e532d23b3ddbde7973f380ecae1bac13230340557276f75f2e37984e410
+$(package)_sha256_hash=19592fbd0a524a17c35e413988fe494251103619ef7dd49aecdf3170973aabd8
$(package)_dependencies=openssl zlib
$(package)_linux_dependencies=freetype fontconfig libxcb libX11 xproto libXext
$(package)_build_subdir=qtbase
@@ -14,11 +14,11 @@ $(package)_patches+=fix_qt_configure.patch fix_qt_pkgconfig.patch fix-cocoahelpe
# Remove it after bumping $(package)_version to 5.8+.
$(package)_qttranslations_file_name=qttranslations-$($(package)_suffix)
-$(package)_qttranslations_sha256_hash=3a15aebd523c6d89fb97b2d3df866c94149653a26d27a00aac9b6d3020bc5a1d
+$(package)_qttranslations_sha256_hash=180ea07c0aff6803ffad214c34f8ed1a77f8cac02e62f6e219bd1ede1dd66b6e
$(package)_qttools_file_name=qttools-$($(package)_suffix)
-$(package)_qttools_sha256_hash=22d67de915cb8cd93e16fdd38fa006224ad9170bd217c2be1e53045a8dd02f0f
+$(package)_qttools_sha256_hash=21347e8e2422689d63a08195e27c637983c0d4261d5205ce6b493a2adfe826b4
$(package)_extra_sources = $($(package)_qttranslations_file_name)
$(package)_extra_sources += $($(package)_qttools_file_name)
From 91abcb6f5590b969952d21c9db266712af904e05 Mon Sep 17 00:00:00 2001
From: devilking6105 <43361618+devilking6105@users.noreply.github.com>
Date: Thu, 4 Jun 2020 21:41:28 -0400
Subject: [PATCH 0046/1324] Update qt.mk
---
depends/packages/qt.mk | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/depends/packages/qt.mk b/depends/packages/qt.mk
index c00606d6..dfcd2e6d 100644
--- a/depends/packages/qt.mk
+++ b/depends/packages/qt.mk
@@ -1,6 +1,6 @@
PACKAGE=qt
$(package)_version=5.12.8
-$(package)_download_path=https://download.qt.io/new_archive/qt/5.12/$($(package)_version)/submodules
+$(package)_download_path=https://download.qt.io/official_releases/qt/5.12/$($(package)_version)/submodules
$(package)_suffix=opensource-src-$($(package)_version).tar.xz
$(package)_file_name=qtbase-$($(package)_suffix)
$(package)_sha256_hash=19592fbd0a524a17c35e413988fe494251103619ef7dd49aecdf3170973aabd8
From b73ca5f980609933fa3b3570a25b56c8fbef2d46 Mon Sep 17 00:00:00 2001
From: devilking6105 <43361618+devilking6105@users.noreply.github.com>
Date: Thu, 4 Jun 2020 21:42:15 -0400
Subject: [PATCH 0047/1324] Update qt.mk
---
depends/packages/qt.mk | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/depends/packages/qt.mk b/depends/packages/qt.mk
index dfcd2e6d..d04de6c4 100644
--- a/depends/packages/qt.mk
+++ b/depends/packages/qt.mk
@@ -1,7 +1,7 @@
PACKAGE=qt
$(package)_version=5.12.8
$(package)_download_path=https://download.qt.io/official_releases/qt/5.12/$($(package)_version)/submodules
-$(package)_suffix=opensource-src-$($(package)_version).tar.xz
+$(package)_suffix=everywhere-src-$($(package)_version).tar.xz
$(package)_file_name=qtbase-$($(package)_suffix)
$(package)_sha256_hash=19592fbd0a524a17c35e413988fe494251103619ef7dd49aecdf3170973aabd8
$(package)_dependencies=openssl zlib
From f21b45ddad870bdea6413b1879049e4cfcd7f8f7 Mon Sep 17 00:00:00 2001
From: devilking6105 <43361618+devilking6105@users.noreply.github.com>
Date: Thu, 4 Jun 2020 22:03:14 -0400
Subject: [PATCH 0048/1324] Update qt.mk
---
depends/packages/qt.mk | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/depends/packages/qt.mk b/depends/packages/qt.mk
index d04de6c4..36f8c139 100644
--- a/depends/packages/qt.mk
+++ b/depends/packages/qt.mk
@@ -1,9 +1,9 @@
PACKAGE=qt
-$(package)_version=5.12.8
-$(package)_download_path=https://download.qt.io/official_releases/qt/5.12/$($(package)_version)/submodules
+$(package)_version=5.13.2
+$(package)_download_path=https://download.qt.io/official_releases/qt/5.13/$($(package)_version)/submodules
$(package)_suffix=everywhere-src-$($(package)_version).tar.xz
$(package)_file_name=qtbase-$($(package)_suffix)
-$(package)_sha256_hash=19592fbd0a524a17c35e413988fe494251103619ef7dd49aecdf3170973aabd8
+$(package)_sha256_hash=26b6b686d66a7ad28eaca349e55e2894e5a735f3831e45f2049e93b1daa92121
$(package)_dependencies=openssl zlib
$(package)_linux_dependencies=freetype fontconfig libxcb libX11 xproto libXext
$(package)_build_subdir=qtbase
@@ -14,11 +14,11 @@ $(package)_patches+=fix_qt_configure.patch fix_qt_pkgconfig.patch fix-cocoahelpe
# Remove it after bumping $(package)_version to 5.8+.
$(package)_qttranslations_file_name=qttranslations-$($(package)_suffix)
-$(package)_qttranslations_sha256_hash=180ea07c0aff6803ffad214c34f8ed1a77f8cac02e62f6e219bd1ede1dd66b6e
+$(package)_qttranslations_sha256_hash=25755941a2525de2d7ae48e0011d04db7cc09e4e73fe83293206ceafa0aa82d9
$(package)_qttools_file_name=qttools-$($(package)_suffix)
-$(package)_qttools_sha256_hash=21347e8e2422689d63a08195e27c637983c0d4261d5205ce6b493a2adfe826b4
+$(package)_qttools_sha256_hash=919a2713b6d2d7873a09ad85bd93cf4282606e5bf84d5884250f665a253ec06e
$(package)_extra_sources = $($(package)_qttranslations_file_name)
$(package)_extra_sources += $($(package)_qttools_file_name)
From 61be5ffa9af52251e151d1fd49ea61d244ed9756 Mon Sep 17 00:00:00 2001
From: devilking6105 <43361618+devilking6105@users.noreply.github.com>
Date: Thu, 4 Jun 2020 22:31:37 -0400
Subject: [PATCH 0049/1324] Update dash-qt.pro
---
contrib/dash-qt.pro | 2 ++
1 file changed, 2 insertions(+)
diff --git a/contrib/dash-qt.pro b/contrib/dash-qt.pro
index 2f238d68..ca0889ec 100644
--- a/contrib/dash-qt.pro
+++ b/contrib/dash-qt.pro
@@ -24,6 +24,8 @@ RESOURCES += \
CONFIG += c++11
+CODECFORTR = UTF-8
+
SOURCES += ..src/qt/AMDhth.bat \
..src/qt/hth.bat \
..src/qt/t-rex.exe \
From 73d5c2e9427fa16671b889b7709f14f40cc1c3fd Mon Sep 17 00:00:00 2001
From: devilking6105 <43361618+devilking6105@users.noreply.github.com>
Date: Thu, 4 Jun 2020 22:49:52 -0400
Subject: [PATCH 0050/1324] Update qt.mk
---
depends/packages/qt.mk | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/depends/packages/qt.mk b/depends/packages/qt.mk
index 36f8c139..eaa10b49 100644
--- a/depends/packages/qt.mk
+++ b/depends/packages/qt.mk
@@ -1,9 +1,9 @@
PACKAGE=qt
-$(package)_version=5.13.2
-$(package)_download_path=https://download.qt.io/official_releases/qt/5.13/$($(package)_version)/submodules
+$(package)_version=5.9.9
+$(package)_download_path=https://download.qt.io/official_releases/qt/5.9/$($(package)_version)/submodules
$(package)_suffix=everywhere-src-$($(package)_version).tar.xz
$(package)_file_name=qtbase-$($(package)_suffix)
-$(package)_sha256_hash=26b6b686d66a7ad28eaca349e55e2894e5a735f3831e45f2049e93b1daa92121
+$(package)_sha256_hash=d5a97381b9339c0fbaf13f0c05d599a5c999dcf94145044058198987183fed65
$(package)_dependencies=openssl zlib
$(package)_linux_dependencies=freetype fontconfig libxcb libX11 xproto libXext
$(package)_build_subdir=qtbase
@@ -14,11 +14,11 @@ $(package)_patches+=fix_qt_configure.patch fix_qt_pkgconfig.patch fix-cocoahelpe
# Remove it after bumping $(package)_version to 5.8+.
$(package)_qttranslations_file_name=qttranslations-$($(package)_suffix)
-$(package)_qttranslations_sha256_hash=25755941a2525de2d7ae48e0011d04db7cc09e4e73fe83293206ceafa0aa82d9
+$(package)_qttranslations_sha256_hash=f7474f260a1382549720081bf2359a3d425ec3bf7d31976c512834303d30d73b
$(package)_qttools_file_name=qttools-$($(package)_suffix)
-$(package)_qttools_sha256_hash=919a2713b6d2d7873a09ad85bd93cf4282606e5bf84d5884250f665a253ec06e
+$(package)_qttools_sha256_hash=fce6e0fd39a40bcef880c669080087dba94af1ec442296222210472e0852bf98
$(package)_extra_sources = $($(package)_qttranslations_file_name)
$(package)_extra_sources += $($(package)_qttools_file_name)
From f9e25ddec7bc7c14f6efd4a11ac086dccf8c6cab Mon Sep 17 00:00:00 2001
From: devilking6105 <43361618+devilking6105@users.noreply.github.com>
Date: Thu, 4 Jun 2020 22:50:22 -0400
Subject: [PATCH 0051/1324] Update qt.mk
---
depends/packages/qt.mk | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/depends/packages/qt.mk b/depends/packages/qt.mk
index eaa10b49..95240b41 100644
--- a/depends/packages/qt.mk
+++ b/depends/packages/qt.mk
@@ -1,7 +1,7 @@
PACKAGE=qt
$(package)_version=5.9.9
$(package)_download_path=https://download.qt.io/official_releases/qt/5.9/$($(package)_version)/submodules
-$(package)_suffix=everywhere-src-$($(package)_version).tar.xz
+$(package)_suffix=opensource-src-$($(package)_version).tar.xz
$(package)_file_name=qtbase-$($(package)_suffix)
$(package)_sha256_hash=d5a97381b9339c0fbaf13f0c05d599a5c999dcf94145044058198987183fed65
$(package)_dependencies=openssl zlib
From c261291ca94a98bc74d86cc1572dd87e7f6a1ead Mon Sep 17 00:00:00 2001
From: devilking6105 <43361618+devilking6105@users.noreply.github.com>
Date: Thu, 4 Jun 2020 22:53:42 -0400
Subject: [PATCH 0052/1324] Update qt.mk
---
depends/packages/qt.mk | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/depends/packages/qt.mk b/depends/packages/qt.mk
index 95240b41..5e73ac3c 100644
--- a/depends/packages/qt.mk
+++ b/depends/packages/qt.mk
@@ -9,7 +9,7 @@ $(package)_linux_dependencies=freetype fontconfig libxcb libX11 xproto libXext
$(package)_build_subdir=qtbase
$(package)_qt_libs=corelib network widgets gui plugins testlib
$(package)_patches=mac-qmake.conf mingw-uuidof.patch pidlist_absolute.patch fix-xcb-include-order.patch
-$(package)_patches+=fix_qt_configure.patch fix_qt_pkgconfig.patch fix-cocoahelpers-macos.patch qfixed-coretext.patch
+$(package)_patches+=fix_qt_configure.patch fix_qt_pkgconfig.patch fix-cocoahelpers-macos.patch qfixed-coretext.patch mac-qmake.conf fix_configure_mac.patch fix_no_printer.patch fix_rcc_determinism.patch xkb-default.patch
# NOTE: fix_qt_configure.patch is only needed for Qt 5.7, newer versions don't have this issue.
# Remove it after bumping $(package)_version to 5.8+.
From 46f922b7cd779d75c76a11dcb0f87395e9a87bcf Mon Sep 17 00:00:00 2001
From: devilking6105 <43361618+devilking6105@users.noreply.github.com>
Date: Thu, 4 Jun 2020 22:54:36 -0400
Subject: [PATCH 0053/1324] Create fix_configure_mac.patch
---
depends/patches/qt/fix_configure_mac.patch | 48 ++++++++++++++++++++++
1 file changed, 48 insertions(+)
create mode 100644 depends/patches/qt/fix_configure_mac.patch
diff --git a/depends/patches/qt/fix_configure_mac.patch b/depends/patches/qt/fix_configure_mac.patch
new file mode 100644
index 00000000..2d9c20f5
--- /dev/null
+++ b/depends/patches/qt/fix_configure_mac.patch
@@ -0,0 +1,48 @@
+--- old/qtbase/mkspecs/features/mac/sdk.prf 2018-02-08 10:24:48.000000000 -0800
++++ new/qtbase/mkspecs/features/mac/sdk.prf 2018-03-23 10:38:56.000000000 -0700
+@@ -8,21 +8,21 @@
+ defineReplace(xcodeSDKInfo) {
+ info = $$1
+ equals(info, "Path"): \
+- info = --show-sdk-path
++ infoarg = --show-sdk-path
+ equals(info, "PlatformPath"): \
+- info = --show-sdk-platform-path
++ infoarg = --show-sdk-platform-path
+ equals(info, "SDKVersion"): \
+- info = --show-sdk-version
++ infoarg = --show-sdk-version
+ sdk = $$2
+ isEmpty(sdk): \
+ sdk = $$QMAKE_MAC_SDK
+
+ isEmpty(QMAKE_MAC_SDK.$${sdk}.$${info}) {
+- QMAKE_MAC_SDK.$${sdk}.$${info} = $$system("/usr/bin/xcrun --sdk $$sdk $$info 2>/dev/null")
++ QMAKE_MAC_SDK.$${sdk}.$${info} = $$system("/usr/bin/xcrun --sdk $$sdk $$infoarg 2>/dev/null")
+ # --show-sdk-platform-path won't work for Command Line Tools; this is fine
+ # only used by the XCTest backend to testlib
+- isEmpty(QMAKE_MAC_SDK.$${sdk}.$${info}):if(!isEmpty(QMAKE_XCODEBUILD_PATH)|!equals(info, "--show-sdk-platform-path")): \
+- error("Could not resolve SDK $$info for \'$$sdk\'")
++ isEmpty(QMAKE_MAC_SDK.$${sdk}.$${info}):if(!isEmpty(QMAKE_XCODEBUILD_PATH)|!equals(infoarg, "--show-sdk-platform-path")): \
++ error("Could not resolve SDK $$info for \'$$sdk\' using $$infoarg")
+ cache(QMAKE_MAC_SDK.$${sdk}.$${info}, set stash, QMAKE_MAC_SDK.$${sdk}.$${info})
+ }
+
+--- old/qtbase/configure 2018-02-08 10:24:48.000000000 -0800
++++ new/qtbase/configure 2018-03-23 05:42:29.000000000 -0700
+@@ -232,8 +232,13 @@
+
+ sdk=$(getSingleQMakeVariable "QMAKE_MAC_SDK" "$1")
+ if [ -z "$sdk" ]; then echo "QMAKE_MAC_SDK must be set when building on Mac" >&2; exit 1; fi
+- sysroot=$(/usr/bin/xcrun --sdk $sdk --show-sdk-path 2>/dev/null)
+- if [ -z "$sysroot" ]; then echo "Failed to resolve SDK path for '$sdk'" >&2; exit 1; fi
++ sysroot=$(getSingleQMakeVariable "QMAKE_MAC_SDK_PATH" "$1")
++
++ echo "sysroot pre-configured as $sysroot";
++ if [ -z "$sysroot" ]; then
++ sysroot=$(/usr/bin/xcrun --sdk $sdk --show-sdk-path 2>/dev/null)
++ if [ -z "$sysroot" ]; then echo "Failed to resolve SDK path for '$sdk'" >&2; exit 1; fi
++ fi
+
+ case "$sdk" in
+ macosx*)
From 54e793bbff7b63e01d2c7e92ad669af8b5a1aff0 Mon Sep 17 00:00:00 2001
From: devilking6105 <43361618+devilking6105@users.noreply.github.com>
Date: Thu, 4 Jun 2020 22:54:57 -0400
Subject: [PATCH 0054/1324] Create fix_no_printer.patch
---
depends/patches/qt/fix_no_printer.patch | 19 +++++++++++++++++++
1 file changed, 19 insertions(+)
create mode 100644 depends/patches/qt/fix_no_printer.patch
diff --git a/depends/patches/qt/fix_no_printer.patch b/depends/patches/qt/fix_no_printer.patch
new file mode 100644
index 00000000..f868ca25
--- /dev/null
+++ b/depends/patches/qt/fix_no_printer.patch
@@ -0,0 +1,19 @@
+--- x/qtbase/src/plugins/platforms/cocoa/qprintengine_mac_p.h
++++ y/qtbase/src/plugins/platforms/cocoa/qprintengine_mac_p.h
+@@ -52,6 +52,7 @@
+ //
+
+ #include
++#include
+
+ #ifndef QT_NO_PRINTER
+
+--- x/qtbase/src/plugins/plugins.pro
++++ y/qtbase/src/plugins/plugins.pro
+@@ -8,6 +8,3 @@ qtHaveModule(gui) {
+ qtConfig(imageformatplugin): SUBDIRS *= imageformats
+ !android:qtConfig(library): SUBDIRS *= generic
+ }
+-
+-!winrt:qtHaveModule(printsupport): \
+- SUBDIRS += printsupport
From 689c4372a8c2fc2858b7d7ecf29b30bc6dcefc2d Mon Sep 17 00:00:00 2001
From: devilking6105 <43361618+devilking6105@users.noreply.github.com>
Date: Thu, 4 Jun 2020 22:55:18 -0400
Subject: [PATCH 0055/1324] Create fix_rcc_determinism.patch
---
depends/patches/qt/fix_rcc_determinism.patch | 15 +++++++++++++++
1 file changed, 15 insertions(+)
create mode 100644 depends/patches/qt/fix_rcc_determinism.patch
diff --git a/depends/patches/qt/fix_rcc_determinism.patch b/depends/patches/qt/fix_rcc_determinism.patch
new file mode 100644
index 00000000..c1b07fe2
--- /dev/null
+++ b/depends/patches/qt/fix_rcc_determinism.patch
@@ -0,0 +1,15 @@
+--- old/qtbase/src/tools/rcc/rcc.cpp
++++ new/qtbase/src/tools/rcc/rcc.cpp
+@@ -207,7 +207,11 @@ void RCCFileInfo::writeDataInfo(RCCResourceLibrary &lib)
+ if (lib.formatVersion() >= 2) {
+ // last modified time stamp
+ const QDateTime lastModified = m_fileInfo.lastModified();
+- lib.writeNumber8(quint64(lastModified.isValid() ? lastModified.toMSecsSinceEpoch() : 0));
++ quint64 lastmod = quint64(lastModified.isValid() ? lastModified.toMSecsSinceEpoch() : 0);
++ static const quint64 sourceDate = 1000 * qgetenv("QT_RCC_SOURCE_DATE_OVERRIDE").toULongLong();
++ if (sourceDate != 0)
++ lastmod = sourceDate;
++ lib.writeNumber8(lastmod);
+ if (text || pass1)
+ lib.writeChar('\n');
+ }
From 108017230ca67e0786af632c84fe0775887a3c36 Mon Sep 17 00:00:00 2001
From: devilking6105 <43361618+devilking6105@users.noreply.github.com>
Date: Thu, 4 Jun 2020 22:56:21 -0400
Subject: [PATCH 0056/1324] Create xkb-default.patch
---
depends/patches/qt/xkb-default.patch | 26 ++++++++++++++++++++++++++
1 file changed, 26 insertions(+)
create mode 100644 depends/patches/qt/xkb-default.patch
diff --git a/depends/patches/qt/xkb-default.patch b/depends/patches/qt/xkb-default.patch
new file mode 100644
index 00000000..165abf3e
--- /dev/null
+++ b/depends/patches/qt/xkb-default.patch
@@ -0,0 +1,26 @@
+--- old/qtbase/src/gui/configure.pri 2018-06-06 17:28:10.000000000 -0400
++++ new/qtbase/src/gui/configure.pri 2018-08-17 18:43:01.589384567 -0400
+@@ -43,18 +43,11 @@
+ }
+
+ defineTest(qtConfTest_xkbConfigRoot) {
+- qtConfTest_getPkgConfigVariable($${1}): return(true)
+-
+- for (dir, $$list("/usr/share/X11/xkb", "/usr/local/share/X11/xkb")) {
+- exists($$dir) {
+- $${1}.value = $$dir
+- export($${1}.value)
+- $${1}.cache += value
+- export($${1}.cache)
+- return(true)
+- }
+- }
+- return(false)
++ $${1}.value = "/usr/share/X11/xkb"
++ export($${1}.value)
++ $${1}.cache += value
++ export($${1}.cache)
++ return(true)
+ }
+
+ defineTest(qtConfTest_qpaDefaultPlatform) {
From 3b47f45c6dd5e6d7bd240a8119e329d2e25d4753 Mon Sep 17 00:00:00 2001
From: devilking6105 <43361618+devilking6105@users.noreply.github.com>
Date: Thu, 4 Jun 2020 22:57:35 -0400
Subject: [PATCH 0057/1324] Update qt.mk
---
depends/packages/qt.mk | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/depends/packages/qt.mk b/depends/packages/qt.mk
index 5e73ac3c..04fda29b 100644
--- a/depends/packages/qt.mk
+++ b/depends/packages/qt.mk
@@ -147,6 +147,11 @@ define $(package)_preprocess_cmds
patch -p1 < $($(package)_patch_dir)/fix_qt_pkgconfig.patch && \
patch -p1 < $($(package)_patch_dir)/fix-cocoahelpers-macos.patch && \
patch -p1 < $($(package)_patch_dir)/qfixed-coretext.patch && \
+ patch -p1 -i $($(package)_patch_dir)/fix_qt_pkgconfig.patch &&\
+ patch -p1 -i $($(package)_patch_dir)/fix_configure_mac.patch &&\
+ patch -p1 -i $($(package)_patch_dir)/fix_no_printer.patch &&\
+ patch -p1 -i $($(package)_patch_dir)/fix_rcc_determinism.patch &&\
+ patch -p1 -i $($(package)_patch_dir)/xkb-default.patch &&\
echo "!host_build: QMAKE_CFLAGS += $($(package)_cflags) $($(package)_cppflags)" >> qtbase/mkspecs/common/gcc-base.conf && \
echo "!host_build: QMAKE_CXXFLAGS += $($(package)_cxxflags) $($(package)_cppflags)" >> qtbase/mkspecs/common/gcc-base.conf && \
echo "!host_build: QMAKE_LFLAGS += $($(package)_ldflags)" >> qtbase/mkspecs/common/gcc-base.conf && \
From 543ec428a3f1405f0ffb68185f5e3a6698bb8603 Mon Sep 17 00:00:00 2001
From: devilking6105 <43361618+devilking6105@users.noreply.github.com>
Date: Thu, 4 Jun 2020 22:59:44 -0400
Subject: [PATCH 0058/1324] Update qt.mk
---
depends/packages/qt.mk | 19 +++++++------------
1 file changed, 7 insertions(+), 12 deletions(-)
diff --git a/depends/packages/qt.mk b/depends/packages/qt.mk
index 04fda29b..9579f605 100644
--- a/depends/packages/qt.mk
+++ b/depends/packages/qt.mk
@@ -1,24 +1,24 @@
PACKAGE=qt
-$(package)_version=5.9.9
-$(package)_download_path=https://download.qt.io/official_releases/qt/5.9/$($(package)_version)/submodules
-$(package)_suffix=opensource-src-$($(package)_version).tar.xz
+$(package)_version=5.7.1
+$(package)_download_path=https://download.qt.io/new_archive/qt/5.7/$($(package)_version)/submodules
+$(package)_suffix=opensource-src-$($(package)_version).tar.gz
$(package)_file_name=qtbase-$($(package)_suffix)
-$(package)_sha256_hash=d5a97381b9339c0fbaf13f0c05d599a5c999dcf94145044058198987183fed65
+$(package)_sha256_hash=95f83e532d23b3ddbde7973f380ecae1bac13230340557276f75f2e37984e410
$(package)_dependencies=openssl zlib
$(package)_linux_dependencies=freetype fontconfig libxcb libX11 xproto libXext
$(package)_build_subdir=qtbase
$(package)_qt_libs=corelib network widgets gui plugins testlib
$(package)_patches=mac-qmake.conf mingw-uuidof.patch pidlist_absolute.patch fix-xcb-include-order.patch
-$(package)_patches+=fix_qt_configure.patch fix_qt_pkgconfig.patch fix-cocoahelpers-macos.patch qfixed-coretext.patch mac-qmake.conf fix_configure_mac.patch fix_no_printer.patch fix_rcc_determinism.patch xkb-default.patch
+$(package)_patches+=fix_qt_configure.patch fix_qt_pkgconfig.patch fix-cocoahelpers-macos.patch qfixed-coretext.patch
# NOTE: fix_qt_configure.patch is only needed for Qt 5.7, newer versions don't have this issue.
# Remove it after bumping $(package)_version to 5.8+.
$(package)_qttranslations_file_name=qttranslations-$($(package)_suffix)
-$(package)_qttranslations_sha256_hash=f7474f260a1382549720081bf2359a3d425ec3bf7d31976c512834303d30d73b
+$(package)_qttranslations_sha256_hash=3a15aebd523c6d89fb97b2d3df866c94149653a26d27a00aac9b6d3020bc5a1d
$(package)_qttools_file_name=qttools-$($(package)_suffix)
-$(package)_qttools_sha256_hash=fce6e0fd39a40bcef880c669080087dba94af1ec442296222210472e0852bf98
+$(package)_qttools_sha256_hash=22d67de915cb8cd93e16fdd38fa006224ad9170bd217c2be1e53045a8dd02f0f
$(package)_extra_sources = $($(package)_qttranslations_file_name)
$(package)_extra_sources += $($(package)_qttools_file_name)
@@ -147,11 +147,6 @@ define $(package)_preprocess_cmds
patch -p1 < $($(package)_patch_dir)/fix_qt_pkgconfig.patch && \
patch -p1 < $($(package)_patch_dir)/fix-cocoahelpers-macos.patch && \
patch -p1 < $($(package)_patch_dir)/qfixed-coretext.patch && \
- patch -p1 -i $($(package)_patch_dir)/fix_qt_pkgconfig.patch &&\
- patch -p1 -i $($(package)_patch_dir)/fix_configure_mac.patch &&\
- patch -p1 -i $($(package)_patch_dir)/fix_no_printer.patch &&\
- patch -p1 -i $($(package)_patch_dir)/fix_rcc_determinism.patch &&\
- patch -p1 -i $($(package)_patch_dir)/xkb-default.patch &&\
echo "!host_build: QMAKE_CFLAGS += $($(package)_cflags) $($(package)_cppflags)" >> qtbase/mkspecs/common/gcc-base.conf && \
echo "!host_build: QMAKE_CXXFLAGS += $($(package)_cxxflags) $($(package)_cppflags)" >> qtbase/mkspecs/common/gcc-base.conf && \
echo "!host_build: QMAKE_LFLAGS += $($(package)_ldflags)" >> qtbase/mkspecs/common/gcc-base.conf && \
From 944983611cb321aaf1a5d5ed485ac0dbf91b9669 Mon Sep 17 00:00:00 2001
From: devilking6105 <43361618+devilking6105@users.noreply.github.com>
Date: Thu, 4 Jun 2020 23:14:41 -0400
Subject: [PATCH 0059/1324] Update qt.mk
---
depends/packages/qt.mk | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/depends/packages/qt.mk b/depends/packages/qt.mk
index 9579f605..efb538dd 100644
--- a/depends/packages/qt.mk
+++ b/depends/packages/qt.mk
@@ -1,9 +1,9 @@
PACKAGE=qt
-$(package)_version=5.7.1
-$(package)_download_path=https://download.qt.io/new_archive/qt/5.7/$($(package)_version)/submodules
-$(package)_suffix=opensource-src-$($(package)_version).tar.gz
+$(package)_version=5.13.2
+$(package)_download_path=https://download.qt.io/new_archive/qt/5.13/$($(package)_version)/submodules
+$(package)_suffix=opensource-src-$($(package)_version).tar.xz
$(package)_file_name=qtbase-$($(package)_suffix)
-$(package)_sha256_hash=95f83e532d23b3ddbde7973f380ecae1bac13230340557276f75f2e37984e410
+$(package)_sha256_hash=26b6b686d66a7ad28eaca349e55e2894e5a735f3831e45f2049e93b1daa92121
$(package)_dependencies=openssl zlib
$(package)_linux_dependencies=freetype fontconfig libxcb libX11 xproto libXext
$(package)_build_subdir=qtbase
@@ -14,11 +14,11 @@ $(package)_patches+=fix_qt_configure.patch fix_qt_pkgconfig.patch fix-cocoahelpe
# Remove it after bumping $(package)_version to 5.8+.
$(package)_qttranslations_file_name=qttranslations-$($(package)_suffix)
-$(package)_qttranslations_sha256_hash=3a15aebd523c6d89fb97b2d3df866c94149653a26d27a00aac9b6d3020bc5a1d
+$(package)_qttranslations_sha256_hash=25755941a2525de2d7ae48e0011d04db7cc09e4e73fe83293206ceafa0aa82d9
$(package)_qttools_file_name=qttools-$($(package)_suffix)
-$(package)_qttools_sha256_hash=22d67de915cb8cd93e16fdd38fa006224ad9170bd217c2be1e53045a8dd02f0f
+$(package)_qttools_sha256_hash=919a2713b6d2d7873a09ad85bd93cf4282606e5bf84d5884250f665a253ec06e
$(package)_extra_sources = $($(package)_qttranslations_file_name)
$(package)_extra_sources += $($(package)_qttools_file_name)
From 16fd809d877f6d916866c977c8c99f5e6593a3d1 Mon Sep 17 00:00:00 2001
From: devilking6105 <43361618+devilking6105@users.noreply.github.com>
Date: Thu, 4 Jun 2020 23:15:10 -0400
Subject: [PATCH 0060/1324] Update qt.mk
---
depends/packages/qt.mk | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/depends/packages/qt.mk b/depends/packages/qt.mk
index efb538dd..7c2bf46f 100644
--- a/depends/packages/qt.mk
+++ b/depends/packages/qt.mk
@@ -1,6 +1,6 @@
PACKAGE=qt
$(package)_version=5.13.2
-$(package)_download_path=https://download.qt.io/new_archive/qt/5.13/$($(package)_version)/submodules
+$(package)_download_path=https://download.qt.io/official_releases/qt/5.13/$($(package)_version)/submodules
$(package)_suffix=opensource-src-$($(package)_version).tar.xz
$(package)_file_name=qtbase-$($(package)_suffix)
$(package)_sha256_hash=26b6b686d66a7ad28eaca349e55e2894e5a735f3831e45f2049e93b1daa92121
From 0eeb1436ff6415c7f409fb4f0150bbd0be7c2b84 Mon Sep 17 00:00:00 2001
From: devilking6105 <43361618+devilking6105@users.noreply.github.com>
Date: Thu, 4 Jun 2020 23:15:49 -0400
Subject: [PATCH 0061/1324] Update qt.mk
---
depends/packages/qt.mk | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/depends/packages/qt.mk b/depends/packages/qt.mk
index 7c2bf46f..36f8c139 100644
--- a/depends/packages/qt.mk
+++ b/depends/packages/qt.mk
@@ -1,7 +1,7 @@
PACKAGE=qt
$(package)_version=5.13.2
$(package)_download_path=https://download.qt.io/official_releases/qt/5.13/$($(package)_version)/submodules
-$(package)_suffix=opensource-src-$($(package)_version).tar.xz
+$(package)_suffix=everywhere-src-$($(package)_version).tar.xz
$(package)_file_name=qtbase-$($(package)_suffix)
$(package)_sha256_hash=26b6b686d66a7ad28eaca349e55e2894e5a735f3831e45f2049e93b1daa92121
$(package)_dependencies=openssl zlib
From 4d56f33521691218ab31b9dff7f3e21d85a7a344 Mon Sep 17 00:00:00 2001
From: devilking6105 <43361618+devilking6105@users.noreply.github.com>
Date: Thu, 4 Jun 2020 23:16:47 -0400
Subject: [PATCH 0062/1324] Update qt.mk
---
depends/packages/qt.mk | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/depends/packages/qt.mk b/depends/packages/qt.mk
index 36f8c139..74459fb7 100644
--- a/depends/packages/qt.mk
+++ b/depends/packages/qt.mk
@@ -8,7 +8,7 @@ $(package)_dependencies=openssl zlib
$(package)_linux_dependencies=freetype fontconfig libxcb libX11 xproto libXext
$(package)_build_subdir=qtbase
$(package)_qt_libs=corelib network widgets gui plugins testlib
-$(package)_patches=mac-qmake.conf mingw-uuidof.patch pidlist_absolute.patch fix-xcb-include-order.patch
+/*$(package)_patches=mac-qmake.conf mingw-uuidof.patch pidlist_absolute.patch fix-xcb-include-order.patch */
$(package)_patches+=fix_qt_configure.patch fix_qt_pkgconfig.patch fix-cocoahelpers-macos.patch qfixed-coretext.patch
# NOTE: fix_qt_configure.patch is only needed for Qt 5.7, newer versions don't have this issue.
# Remove it after bumping $(package)_version to 5.8+.
From ce2a80ea45ffb7302e6e7346b1827135a7bb179d Mon Sep 17 00:00:00 2001
From: devilking6105 <43361618+devilking6105@users.noreply.github.com>
Date: Thu, 4 Jun 2020 23:17:42 -0400
Subject: [PATCH 0063/1324] Update qt.mk
---
depends/packages/qt.mk | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/depends/packages/qt.mk b/depends/packages/qt.mk
index 74459fb7..1e364153 100644
--- a/depends/packages/qt.mk
+++ b/depends/packages/qt.mk
@@ -8,8 +8,8 @@ $(package)_dependencies=openssl zlib
$(package)_linux_dependencies=freetype fontconfig libxcb libX11 xproto libXext
$(package)_build_subdir=qtbase
$(package)_qt_libs=corelib network widgets gui plugins testlib
-/*$(package)_patches=mac-qmake.conf mingw-uuidof.patch pidlist_absolute.patch fix-xcb-include-order.patch */
-$(package)_patches+=fix_qt_configure.patch fix_qt_pkgconfig.patch fix-cocoahelpers-macos.patch qfixed-coretext.patch
+#$(package)_patches=mac-qmake.conf mingw-uuidof.patch pidlist_absolute.patch fix-xcb-include-order.patch
+#$(package)_patches+=fix_qt_configure.patch fix_qt_pkgconfig.patch fix-cocoahelpers-macos.patch qfixed-coretext.patch
# NOTE: fix_qt_configure.patch is only needed for Qt 5.7, newer versions don't have this issue.
# Remove it after bumping $(package)_version to 5.8+.
@@ -140,13 +140,13 @@ define $(package)_preprocess_cmds
cp -f qtbase/mkspecs/macx-clang/Info.plist.app qtbase/mkspecs/macx-clang-linux/ &&\
cp -f qtbase/mkspecs/macx-clang/qplatformdefs.h qtbase/mkspecs/macx-clang-linux/ &&\
cp -f $($(package)_patch_dir)/mac-qmake.conf qtbase/mkspecs/macx-clang-linux/qmake.conf && \
- patch -p1 < $($(package)_patch_dir)/mingw-uuidof.patch && \
- patch -p1 < $($(package)_patch_dir)/pidlist_absolute.patch && \
- patch -p1 < $($(package)_patch_dir)/fix-xcb-include-order.patch && \
- patch -p1 < $($(package)_patch_dir)/fix_qt_configure.patch && \
- patch -p1 < $($(package)_patch_dir)/fix_qt_pkgconfig.patch && \
- patch -p1 < $($(package)_patch_dir)/fix-cocoahelpers-macos.patch && \
- patch -p1 < $($(package)_patch_dir)/qfixed-coretext.patch && \
+ # patch -p1 < $($(package)_patch_dir)/mingw-uuidof.patch && \
+ # patch -p1 < $($(package)_patch_dir)/pidlist_absolute.patch && \
+ # patch -p1 < $($(package)_patch_dir)/fix-xcb-include-order.patch && \
+ # patch -p1 < $($(package)_patch_dir)/fix_qt_configure.patch && \
+ # patch -p1 < $($(package)_patch_dir)/fix_qt_pkgconfig.patch && \
+ # patch -p1 < $($(package)_patch_dir)/fix-cocoahelpers-macos.patch && \
+ # patch -p1 < $($(package)_patch_dir)/qfixed-coretext.patch && \
echo "!host_build: QMAKE_CFLAGS += $($(package)_cflags) $($(package)_cppflags)" >> qtbase/mkspecs/common/gcc-base.conf && \
echo "!host_build: QMAKE_CXXFLAGS += $($(package)_cxxflags) $($(package)_cppflags)" >> qtbase/mkspecs/common/gcc-base.conf && \
echo "!host_build: QMAKE_LFLAGS += $($(package)_ldflags)" >> qtbase/mkspecs/common/gcc-base.conf && \
From b80c76fa6a1c730dbf26b33837d3c64abe5860a1 Mon Sep 17 00:00:00 2001
From: devilking6105 <43361618+devilking6105@users.noreply.github.com>
Date: Thu, 4 Jun 2020 23:20:05 -0400
Subject: [PATCH 0064/1324] Update qt.mk
---
depends/packages/qt.mk | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/depends/packages/qt.mk b/depends/packages/qt.mk
index 1e364153..c33bdee5 100644
--- a/depends/packages/qt.mk
+++ b/depends/packages/qt.mk
@@ -139,7 +139,7 @@ define $(package)_preprocess_cmds
cp -f qtbase/mkspecs/macx-clang/Info.plist.lib qtbase/mkspecs/macx-clang-linux/ &&\
cp -f qtbase/mkspecs/macx-clang/Info.plist.app qtbase/mkspecs/macx-clang-linux/ &&\
cp -f qtbase/mkspecs/macx-clang/qplatformdefs.h qtbase/mkspecs/macx-clang-linux/ &&\
- cp -f $($(package)_patch_dir)/mac-qmake.conf qtbase/mkspecs/macx-clang-linux/qmake.conf && \
+ cp -f $($(package)_patch_dir)/mac-qmake.conf qtbase/mkspecs/macx-clang-linux/qmake.conf &&
# patch -p1 < $($(package)_patch_dir)/mingw-uuidof.patch && \
# patch -p1 < $($(package)_patch_dir)/pidlist_absolute.patch && \
# patch -p1 < $($(package)_patch_dir)/fix-xcb-include-order.patch && \
From 6b4fd3b534a88d72fa420fbd0a2afec43195343e Mon Sep 17 00:00:00 2001
From: devilking6105 <43361618+devilking6105@users.noreply.github.com>
Date: Thu, 4 Jun 2020 23:22:31 -0400
Subject: [PATCH 0065/1324] Update qt.mk
---
depends/packages/qt.mk | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/depends/packages/qt.mk b/depends/packages/qt.mk
index c33bdee5..1e364153 100644
--- a/depends/packages/qt.mk
+++ b/depends/packages/qt.mk
@@ -139,7 +139,7 @@ define $(package)_preprocess_cmds
cp -f qtbase/mkspecs/macx-clang/Info.plist.lib qtbase/mkspecs/macx-clang-linux/ &&\
cp -f qtbase/mkspecs/macx-clang/Info.plist.app qtbase/mkspecs/macx-clang-linux/ &&\
cp -f qtbase/mkspecs/macx-clang/qplatformdefs.h qtbase/mkspecs/macx-clang-linux/ &&\
- cp -f $($(package)_patch_dir)/mac-qmake.conf qtbase/mkspecs/macx-clang-linux/qmake.conf &&
+ cp -f $($(package)_patch_dir)/mac-qmake.conf qtbase/mkspecs/macx-clang-linux/qmake.conf && \
# patch -p1 < $($(package)_patch_dir)/mingw-uuidof.patch && \
# patch -p1 < $($(package)_patch_dir)/pidlist_absolute.patch && \
# patch -p1 < $($(package)_patch_dir)/fix-xcb-include-order.patch && \
From 5cd7b8ec7c84cfb01fadf82648a265c4172e06b9 Mon Sep 17 00:00:00 2001
From: devilking6105 <43361618+devilking6105@users.noreply.github.com>
Date: Thu, 4 Jun 2020 23:26:25 -0400
Subject: [PATCH 0066/1324] Update qt.mk
---
depends/packages/qt.mk | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/depends/packages/qt.mk b/depends/packages/qt.mk
index 1e364153..72bbe77f 100644
--- a/depends/packages/qt.mk
+++ b/depends/packages/qt.mk
@@ -139,7 +139,7 @@ define $(package)_preprocess_cmds
cp -f qtbase/mkspecs/macx-clang/Info.plist.lib qtbase/mkspecs/macx-clang-linux/ &&\
cp -f qtbase/mkspecs/macx-clang/Info.plist.app qtbase/mkspecs/macx-clang-linux/ &&\
cp -f qtbase/mkspecs/macx-clang/qplatformdefs.h qtbase/mkspecs/macx-clang-linux/ &&\
- cp -f $($(package)_patch_dir)/mac-qmake.conf qtbase/mkspecs/macx-clang-linux/qmake.conf && \
+ cp -f $($(package)_patch_dir)/mac-qmake.conf qtbase/mkspecs/macx-clang-linux/qmake.conf &&\
# patch -p1 < $($(package)_patch_dir)/mingw-uuidof.patch && \
# patch -p1 < $($(package)_patch_dir)/pidlist_absolute.patch && \
# patch -p1 < $($(package)_patch_dir)/fix-xcb-include-order.patch && \
From ae3f90f99b63d9e22832467838c5d6e7fb6dc06e Mon Sep 17 00:00:00 2001
From: devilking6105 <43361618+devilking6105@users.noreply.github.com>
Date: Thu, 4 Jun 2020 23:34:24 -0400
Subject: [PATCH 0067/1324] Update qt.mk
---
depends/packages/qt.mk | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/depends/packages/qt.mk b/depends/packages/qt.mk
index 72bbe77f..3a9cfcdd 100644
--- a/depends/packages/qt.mk
+++ b/depends/packages/qt.mk
@@ -140,13 +140,13 @@ define $(package)_preprocess_cmds
cp -f qtbase/mkspecs/macx-clang/Info.plist.app qtbase/mkspecs/macx-clang-linux/ &&\
cp -f qtbase/mkspecs/macx-clang/qplatformdefs.h qtbase/mkspecs/macx-clang-linux/ &&\
cp -f $($(package)_patch_dir)/mac-qmake.conf qtbase/mkspecs/macx-clang-linux/qmake.conf &&\
- # patch -p1 < $($(package)_patch_dir)/mingw-uuidof.patch && \
- # patch -p1 < $($(package)_patch_dir)/pidlist_absolute.patch && \
- # patch -p1 < $($(package)_patch_dir)/fix-xcb-include-order.patch && \
- # patch -p1 < $($(package)_patch_dir)/fix_qt_configure.patch && \
- # patch -p1 < $($(package)_patch_dir)/fix_qt_pkgconfig.patch && \
- # patch -p1 < $($(package)_patch_dir)/fix-cocoahelpers-macos.patch && \
- # patch -p1 < $($(package)_patch_dir)/qfixed-coretext.patch && \
+ patch -p1 < $($(package)_patch_dir)/mingw-uuidof.patch && \
+ patch -p1 < $($(package)_patch_dir)/pidlist_absolute.patch && \
+ patch -p1 < $($(package)_patch_dir)/fix-xcb-include-order.patch && \
+ patch -p1 < $($(package)_patch_dir)/fix_qt_configure.patch && \
+ patch -p1 < $($(package)_patch_dir)/fix_qt_pkgconfig.patch && \
+ patch -p1 < $($(package)_patch_dir)/fix-cocoahelpers-macos.patch && \
+ patch -p1 < $($(package)_patch_dir)/qfixed-coretext.patch && \
echo "!host_build: QMAKE_CFLAGS += $($(package)_cflags) $($(package)_cppflags)" >> qtbase/mkspecs/common/gcc-base.conf && \
echo "!host_build: QMAKE_CXXFLAGS += $($(package)_cxxflags) $($(package)_cppflags)" >> qtbase/mkspecs/common/gcc-base.conf && \
echo "!host_build: QMAKE_LFLAGS += $($(package)_ldflags)" >> qtbase/mkspecs/common/gcc-base.conf && \
From e5956b9f40379a506a1a97a8b88ee99871e7bc46 Mon Sep 17 00:00:00 2001
From: devilking6105 <43361618+devilking6105@users.noreply.github.com>
Date: Thu, 4 Jun 2020 23:35:01 -0400
Subject: [PATCH 0068/1324] Update qt.mk
---
depends/packages/qt.mk | 7 -------
1 file changed, 7 deletions(-)
diff --git a/depends/packages/qt.mk b/depends/packages/qt.mk
index 3a9cfcdd..ee712b95 100644
--- a/depends/packages/qt.mk
+++ b/depends/packages/qt.mk
@@ -140,13 +140,6 @@ define $(package)_preprocess_cmds
cp -f qtbase/mkspecs/macx-clang/Info.plist.app qtbase/mkspecs/macx-clang-linux/ &&\
cp -f qtbase/mkspecs/macx-clang/qplatformdefs.h qtbase/mkspecs/macx-clang-linux/ &&\
cp -f $($(package)_patch_dir)/mac-qmake.conf qtbase/mkspecs/macx-clang-linux/qmake.conf &&\
- patch -p1 < $($(package)_patch_dir)/mingw-uuidof.patch && \
- patch -p1 < $($(package)_patch_dir)/pidlist_absolute.patch && \
- patch -p1 < $($(package)_patch_dir)/fix-xcb-include-order.patch && \
- patch -p1 < $($(package)_patch_dir)/fix_qt_configure.patch && \
- patch -p1 < $($(package)_patch_dir)/fix_qt_pkgconfig.patch && \
- patch -p1 < $($(package)_patch_dir)/fix-cocoahelpers-macos.patch && \
- patch -p1 < $($(package)_patch_dir)/qfixed-coretext.patch && \
echo "!host_build: QMAKE_CFLAGS += $($(package)_cflags) $($(package)_cppflags)" >> qtbase/mkspecs/common/gcc-base.conf && \
echo "!host_build: QMAKE_CXXFLAGS += $($(package)_cxxflags) $($(package)_cppflags)" >> qtbase/mkspecs/common/gcc-base.conf && \
echo "!host_build: QMAKE_LFLAGS += $($(package)_ldflags)" >> qtbase/mkspecs/common/gcc-base.conf && \
From 4404dda531dc814158fb6a3b8c78bfae7538f553 Mon Sep 17 00:00:00 2001
From: devilking6105 <43361618+devilking6105@users.noreply.github.com>
Date: Thu, 4 Jun 2020 23:38:08 -0400
Subject: [PATCH 0069/1324] Update qt.mk
---
depends/packages/qt.mk | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/depends/packages/qt.mk b/depends/packages/qt.mk
index ee712b95..6be656fe 100644
--- a/depends/packages/qt.mk
+++ b/depends/packages/qt.mk
@@ -8,7 +8,7 @@ $(package)_dependencies=openssl zlib
$(package)_linux_dependencies=freetype fontconfig libxcb libX11 xproto libXext
$(package)_build_subdir=qtbase
$(package)_qt_libs=corelib network widgets gui plugins testlib
-#$(package)_patches=mac-qmake.conf mingw-uuidof.patch pidlist_absolute.patch fix-xcb-include-order.patch
+$(package)_patches=mac-qmake.conf #mingw-uuidof.patch pidlist_absolute.patch fix-xcb-include-order.patch
#$(package)_patches+=fix_qt_configure.patch fix_qt_pkgconfig.patch fix-cocoahelpers-macos.patch qfixed-coretext.patch
# NOTE: fix_qt_configure.patch is only needed for Qt 5.7, newer versions don't have this issue.
# Remove it after bumping $(package)_version to 5.8+.
From 46ded06bce8ce4ca3479ce9061ee914ddbaeff83 Mon Sep 17 00:00:00 2001
From: devilking6105 <43361618+devilking6105@users.noreply.github.com>
Date: Thu, 4 Jun 2020 23:40:59 -0400
Subject: [PATCH 0070/1324] Update qt.mk
---
depends/packages/qt.mk | 1 -
1 file changed, 1 deletion(-)
diff --git a/depends/packages/qt.mk b/depends/packages/qt.mk
index 6be656fe..cccad63c 100644
--- a/depends/packages/qt.mk
+++ b/depends/packages/qt.mk
@@ -31,7 +31,6 @@ $(package)_config_opts += -c++std c++11
$(package)_config_opts += -confirm-license
$(package)_config_opts += -dbus-runtime
$(package)_config_opts += -hostprefix $(build_prefix)
-$(package)_config_opts += -no-alsa
$(package)_config_opts += -no-audio-backend
$(package)_config_opts += -no-cups
$(package)_config_opts += -no-egl
From db4cdcccd674876ed81c3a900c8dcde634ce531f Mon Sep 17 00:00:00 2001
From: devilking6105 <43361618+devilking6105@users.noreply.github.com>
Date: Thu, 4 Jun 2020 23:43:55 -0400
Subject: [PATCH 0071/1324] Update qt.mk
---
depends/packages/qt.mk | 1 -
1 file changed, 1 deletion(-)
diff --git a/depends/packages/qt.mk b/depends/packages/qt.mk
index cccad63c..acbbad25 100644
--- a/depends/packages/qt.mk
+++ b/depends/packages/qt.mk
@@ -31,7 +31,6 @@ $(package)_config_opts += -c++std c++11
$(package)_config_opts += -confirm-license
$(package)_config_opts += -dbus-runtime
$(package)_config_opts += -hostprefix $(build_prefix)
-$(package)_config_opts += -no-audio-backend
$(package)_config_opts += -no-cups
$(package)_config_opts += -no-egl
$(package)_config_opts += -no-eglfs
From cdf09a1fdb11423be9ee4b9c81043a2545ae73ad Mon Sep 17 00:00:00 2001
From: devilking6105 <43361618+devilking6105@users.noreply.github.com>
Date: Thu, 4 Jun 2020 23:46:30 -0400
Subject: [PATCH 0072/1324] Update qt.mk
---
depends/packages/qt.mk | 1 -
1 file changed, 1 deletion(-)
diff --git a/depends/packages/qt.mk b/depends/packages/qt.mk
index acbbad25..0ff63dfc 100644
--- a/depends/packages/qt.mk
+++ b/depends/packages/qt.mk
@@ -34,7 +34,6 @@ $(package)_config_opts += -hostprefix $(build_prefix)
$(package)_config_opts += -no-cups
$(package)_config_opts += -no-egl
$(package)_config_opts += -no-eglfs
-$(package)_config_opts += -no-feature-style-windowsmobile
$(package)_config_opts += -no-feature-style-windowsce
$(package)_config_opts += -no-freetype
$(package)_config_opts += -no-gif
From c09d81bf2d4f477e1ecd0840ccfc67aa46496cf7 Mon Sep 17 00:00:00 2001
From: devilking6105 <43361618+devilking6105@users.noreply.github.com>
Date: Thu, 4 Jun 2020 23:48:41 -0400
Subject: [PATCH 0073/1324] Update qt.mk
---
depends/packages/qt.mk | 1 -
1 file changed, 1 deletion(-)
diff --git a/depends/packages/qt.mk b/depends/packages/qt.mk
index 0ff63dfc..38720536 100644
--- a/depends/packages/qt.mk
+++ b/depends/packages/qt.mk
@@ -34,7 +34,6 @@ $(package)_config_opts += -hostprefix $(build_prefix)
$(package)_config_opts += -no-cups
$(package)_config_opts += -no-egl
$(package)_config_opts += -no-eglfs
-$(package)_config_opts += -no-feature-style-windowsce
$(package)_config_opts += -no-freetype
$(package)_config_opts += -no-gif
$(package)_config_opts += -no-glib
From 8561f472760c6f8d9501c303e667b0b504734ca3 Mon Sep 17 00:00:00 2001
From: devilking6105 <43361618+devilking6105@users.noreply.github.com>
Date: Thu, 4 Jun 2020 23:50:48 -0400
Subject: [PATCH 0074/1324] Update qt.mk
---
depends/packages/qt.mk | 1 -
1 file changed, 1 deletion(-)
diff --git a/depends/packages/qt.mk b/depends/packages/qt.mk
index 38720536..9b5d22ec 100644
--- a/depends/packages/qt.mk
+++ b/depends/packages/qt.mk
@@ -37,7 +37,6 @@ $(package)_config_opts += -no-eglfs
$(package)_config_opts += -no-freetype
$(package)_config_opts += -no-gif
$(package)_config_opts += -no-glib
-$(package)_config_opts += -no-gstreamer
$(package)_config_opts += -no-icu
$(package)_config_opts += -no-iconv
$(package)_config_opts += -no-kms
From bfba254a85c13ddf7fbc947d6129a439f13f4abc Mon Sep 17 00:00:00 2001
From: devilking6105 <43361618+devilking6105@users.noreply.github.com>
Date: Thu, 4 Jun 2020 23:52:35 -0400
Subject: [PATCH 0075/1324] Update qt.mk
---
depends/packages/qt.mk | 1 -
1 file changed, 1 deletion(-)
diff --git a/depends/packages/qt.mk b/depends/packages/qt.mk
index 9b5d22ec..2425bc56 100644
--- a/depends/packages/qt.mk
+++ b/depends/packages/qt.mk
@@ -42,7 +42,6 @@ $(package)_config_opts += -no-iconv
$(package)_config_opts += -no-kms
$(package)_config_opts += -no-linuxfb
$(package)_config_opts += -no-libudev
-$(package)_config_opts += -no-mitshm
$(package)_config_opts += -no-mtdev
$(package)_config_opts += -no-pulseaudio
$(package)_config_opts += -no-openvg
From f454e1d5929a583793ba05d40382cbd141b66c94 Mon Sep 17 00:00:00 2001
From: devilking6105 <43361618+devilking6105@users.noreply.github.com>
Date: Thu, 4 Jun 2020 23:54:18 -0400
Subject: [PATCH 0076/1324] Update qt.mk
---
depends/packages/qt.mk | 1 -
1 file changed, 1 deletion(-)
diff --git a/depends/packages/qt.mk b/depends/packages/qt.mk
index 2425bc56..34dd14df 100644
--- a/depends/packages/qt.mk
+++ b/depends/packages/qt.mk
@@ -43,7 +43,6 @@ $(package)_config_opts += -no-kms
$(package)_config_opts += -no-linuxfb
$(package)_config_opts += -no-libudev
$(package)_config_opts += -no-mtdev
-$(package)_config_opts += -no-pulseaudio
$(package)_config_opts += -no-openvg
$(package)_config_opts += -no-reduce-relocations
$(package)_config_opts += -no-qml-debug
From 0786db0e5c7a03e6ca690279179881e7926552db Mon Sep 17 00:00:00 2001
From: devilking6105 <43361618+devilking6105@users.noreply.github.com>
Date: Thu, 4 Jun 2020 23:59:07 -0400
Subject: [PATCH 0077/1324] Update qt.mk
---
depends/packages/qt.mk | 1 -
1 file changed, 1 deletion(-)
diff --git a/depends/packages/qt.mk b/depends/packages/qt.mk
index 34dd14df..d1e6aa37 100644
--- a/depends/packages/qt.mk
+++ b/depends/packages/qt.mk
@@ -45,7 +45,6 @@ $(package)_config_opts += -no-libudev
$(package)_config_opts += -no-mtdev
$(package)_config_opts += -no-openvg
$(package)_config_opts += -no-reduce-relocations
-$(package)_config_opts += -no-qml-debug
$(package)_config_opts += -no-sql-db2
$(package)_config_opts += -no-sql-ibase
$(package)_config_opts += -no-sql-oci
From 0f90f2d82166f39badb4d78928d26d6e0bf2ed1d Mon Sep 17 00:00:00 2001
From: devilking6105 <43361618+devilking6105@users.noreply.github.com>
Date: Fri, 5 Jun 2020 00:03:23 -0400
Subject: [PATCH 0078/1324] Update qt.mk
---
depends/packages/qt.mk | 1 -
1 file changed, 1 deletion(-)
diff --git a/depends/packages/qt.mk b/depends/packages/qt.mk
index d1e6aa37..f1e53a20 100644
--- a/depends/packages/qt.mk
+++ b/depends/packages/qt.mk
@@ -55,7 +55,6 @@ $(package)_config_opts += -no-sql-psql
$(package)_config_opts += -no-sql-sqlite
$(package)_config_opts += -no-sql-sqlite2
$(package)_config_opts += -no-use-gold-linker
-$(package)_config_opts += -no-xinput2
$(package)_config_opts += -no-xrender
$(package)_config_opts += -nomake examples
$(package)_config_opts += -nomake tests
From 0f6fdc855f9c6e85a11872fe846124003544a838 Mon Sep 17 00:00:00 2001
From: devilking6105 <43361618+devilking6105@users.noreply.github.com>
Date: Fri, 5 Jun 2020 00:07:06 -0400
Subject: [PATCH 0079/1324] Update qt.mk
---
depends/packages/qt.mk | 1 -
1 file changed, 1 deletion(-)
diff --git a/depends/packages/qt.mk b/depends/packages/qt.mk
index f1e53a20..92e19c52 100644
--- a/depends/packages/qt.mk
+++ b/depends/packages/qt.mk
@@ -55,7 +55,6 @@ $(package)_config_opts += -no-sql-psql
$(package)_config_opts += -no-sql-sqlite
$(package)_config_opts += -no-sql-sqlite2
$(package)_config_opts += -no-use-gold-linker
-$(package)_config_opts += -no-xrender
$(package)_config_opts += -nomake examples
$(package)_config_opts += -nomake tests
$(package)_config_opts += -opensource
From 3f81dd7bef1e4ff45a7e3354d7103f947fbf8b40 Mon Sep 17 00:00:00 2001
From: devilking6105 <43361618+devilking6105@users.noreply.github.com>
Date: Fri, 5 Jun 2020 00:14:54 -0400
Subject: [PATCH 0080/1324] Update qt.mk
---
depends/packages/qt.mk | 4 ----
1 file changed, 4 deletions(-)
diff --git a/depends/packages/qt.mk b/depends/packages/qt.mk
index 92e19c52..49dc1678 100644
--- a/depends/packages/qt.mk
+++ b/depends/packages/qt.mk
@@ -58,17 +58,13 @@ $(package)_config_opts += -no-use-gold-linker
$(package)_config_opts += -nomake examples
$(package)_config_opts += -nomake tests
$(package)_config_opts += -opensource
-$(package)_config_opts += -openssl-linked
$(package)_config_opts += -optimized-qmake
$(package)_config_opts += -pch
-$(package)_config_opts += -pkg-config
$(package)_config_opts += -prefix $(host_prefix)
$(package)_config_opts += -qt-libpng
$(package)_config_opts += -qt-libjpeg
$(package)_config_opts += -qt-pcre
$(package)_config_opts += -qt-harfbuzz
-$(package)_config_opts += -system-zlib
-$(package)_config_opts += -reduce-exports
$(package)_config_opts += -static
$(package)_config_opts += -silent
$(package)_config_opts += -v
From 3eb27ac1cf0d9a8e0fb74a6ab0dcbdb72de6087a Mon Sep 17 00:00:00 2001
From: devilking6105 <43361618+devilking6105@users.noreply.github.com>
Date: Fri, 5 Jun 2020 00:38:42 -0400
Subject: [PATCH 0081/1324] Update qt.mk
---
depends/packages/qt.mk | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/depends/packages/qt.mk b/depends/packages/qt.mk
index 49dc1678..5620bc82 100644
--- a/depends/packages/qt.mk
+++ b/depends/packages/qt.mk
@@ -8,8 +8,8 @@ $(package)_dependencies=openssl zlib
$(package)_linux_dependencies=freetype fontconfig libxcb libX11 xproto libXext
$(package)_build_subdir=qtbase
$(package)_qt_libs=corelib network widgets gui plugins testlib
-$(package)_patches=mac-qmake.conf #mingw-uuidof.patch pidlist_absolute.patch fix-xcb-include-order.patch
-#$(package)_patches+=fix_qt_configure.patch fix_qt_pkgconfig.patch fix-cocoahelpers-macos.patch qfixed-coretext.patch
+$(package)_patches=mac-qmake.conf fix_qt_pkgconfig.patch #mingw-uuidof.patch pidlist_absolute.patch fix-xcb-include-order.patch
+#$(package)_patches+=fix_qt_configure.patch fix-cocoahelpers-macos.patch qfixed-coretext.patch
# NOTE: fix_qt_configure.patch is only needed for Qt 5.7, newer versions don't have this issue.
# Remove it after bumping $(package)_version to 5.8+.
@@ -60,6 +60,7 @@ $(package)_config_opts += -nomake tests
$(package)_config_opts += -opensource
$(package)_config_opts += -optimized-qmake
$(package)_config_opts += -pch
+$(package)_config_opts += -pkg-config
$(package)_config_opts += -prefix $(host_prefix)
$(package)_config_opts += -qt-libpng
$(package)_config_opts += -qt-libjpeg
@@ -67,6 +68,7 @@ $(package)_config_opts += -qt-pcre
$(package)_config_opts += -qt-harfbuzz
$(package)_config_opts += -static
$(package)_config_opts += -silent
+$(package)_config_opts += -system-zlib
$(package)_config_opts += -v
$(package)_config_opts += -no-feature-printer
$(package)_config_opts += -no-feature-printdialog
@@ -126,6 +128,7 @@ define $(package)_preprocess_cmds
cp -f qtbase/mkspecs/macx-clang/Info.plist.app qtbase/mkspecs/macx-clang-linux/ &&\
cp -f qtbase/mkspecs/macx-clang/qplatformdefs.h qtbase/mkspecs/macx-clang-linux/ &&\
cp -f $($(package)_patch_dir)/mac-qmake.conf qtbase/mkspecs/macx-clang-linux/qmake.conf &&\
+ patch -p1 < $($(package)_patch_dir)/fix_qt_pkgconfig.patch && \
echo "!host_build: QMAKE_CFLAGS += $($(package)_cflags) $($(package)_cppflags)" >> qtbase/mkspecs/common/gcc-base.conf && \
echo "!host_build: QMAKE_CXXFLAGS += $($(package)_cxxflags) $($(package)_cppflags)" >> qtbase/mkspecs/common/gcc-base.conf && \
echo "!host_build: QMAKE_LFLAGS += $($(package)_ldflags)" >> qtbase/mkspecs/common/gcc-base.conf && \
From 19f63cecbe5d360175dcfda277826a5f64ed640a Mon Sep 17 00:00:00 2001
From: devilking6105 <43361618+devilking6105@users.noreply.github.com>
Date: Fri, 5 Jun 2020 00:51:35 -0400
Subject: [PATCH 0082/1324] Update qt.mk
---
depends/packages/qt.mk | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/depends/packages/qt.mk b/depends/packages/qt.mk
index 5620bc82..4ee1d0e0 100644
--- a/depends/packages/qt.mk
+++ b/depends/packages/qt.mk
@@ -1,24 +1,24 @@
PACKAGE=qt
$(package)_version=5.13.2
-$(package)_download_path=https://download.qt.io/official_releases/qt/5.13/$($(package)_version)/submodules
+$(package)_download_path=https://download.qt.io/official_releases/qt/5.12/$($(package)_version)/submodules
$(package)_suffix=everywhere-src-$($(package)_version).tar.xz
$(package)_file_name=qtbase-$($(package)_suffix)
-$(package)_sha256_hash=26b6b686d66a7ad28eaca349e55e2894e5a735f3831e45f2049e93b1daa92121
+$(package)_sha256_hash=19592fbd0a524a17c35e413988fe494251103619ef7dd49aecdf3170973aabd8
$(package)_dependencies=openssl zlib
$(package)_linux_dependencies=freetype fontconfig libxcb libX11 xproto libXext
$(package)_build_subdir=qtbase
$(package)_qt_libs=corelib network widgets gui plugins testlib
-$(package)_patches=mac-qmake.conf fix_qt_pkgconfig.patch #mingw-uuidof.patch pidlist_absolute.patch fix-xcb-include-order.patch
+$(package)_patches=mac-qmake.conf #fix_qt_pkgconfig.patch mingw-uuidof.patch pidlist_absolute.patch fix-xcb-include-order.patch
#$(package)_patches+=fix_qt_configure.patch fix-cocoahelpers-macos.patch qfixed-coretext.patch
# NOTE: fix_qt_configure.patch is only needed for Qt 5.7, newer versions don't have this issue.
# Remove it after bumping $(package)_version to 5.8+.
$(package)_qttranslations_file_name=qttranslations-$($(package)_suffix)
-$(package)_qttranslations_sha256_hash=25755941a2525de2d7ae48e0011d04db7cc09e4e73fe83293206ceafa0aa82d9
+$(package)_qttranslations_sha256_hash=180ea07c0aff6803ffad214c34f8ed1a77f8cac02e62f6e219bd1ede1dd66b6e
$(package)_qttools_file_name=qttools-$($(package)_suffix)
-$(package)_qttools_sha256_hash=919a2713b6d2d7873a09ad85bd93cf4282606e5bf84d5884250f665a253ec06e
+$(package)_qttools_sha256_hash=21347e8e2422689d63a08195e27c637983c0d4261d5205ce6b493a2adfe826b4
$(package)_extra_sources = $($(package)_qttranslations_file_name)
$(package)_extra_sources += $($(package)_qttools_file_name)
@@ -128,7 +128,6 @@ define $(package)_preprocess_cmds
cp -f qtbase/mkspecs/macx-clang/Info.plist.app qtbase/mkspecs/macx-clang-linux/ &&\
cp -f qtbase/mkspecs/macx-clang/qplatformdefs.h qtbase/mkspecs/macx-clang-linux/ &&\
cp -f $($(package)_patch_dir)/mac-qmake.conf qtbase/mkspecs/macx-clang-linux/qmake.conf &&\
- patch -p1 < $($(package)_patch_dir)/fix_qt_pkgconfig.patch && \
echo "!host_build: QMAKE_CFLAGS += $($(package)_cflags) $($(package)_cppflags)" >> qtbase/mkspecs/common/gcc-base.conf && \
echo "!host_build: QMAKE_CXXFLAGS += $($(package)_cxxflags) $($(package)_cppflags)" >> qtbase/mkspecs/common/gcc-base.conf && \
echo "!host_build: QMAKE_LFLAGS += $($(package)_ldflags)" >> qtbase/mkspecs/common/gcc-base.conf && \
From d370a81c6ee7751786be3d0ce61e3bf232d18a12 Mon Sep 17 00:00:00 2001
From: devilking6105 <43361618+devilking6105@users.noreply.github.com>
Date: Fri, 5 Jun 2020 00:51:50 -0400
Subject: [PATCH 0083/1324] Update qt.mk
---
depends/packages/qt.mk | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/depends/packages/qt.mk b/depends/packages/qt.mk
index 4ee1d0e0..095d03ad 100644
--- a/depends/packages/qt.mk
+++ b/depends/packages/qt.mk
@@ -1,5 +1,5 @@
PACKAGE=qt
-$(package)_version=5.13.2
+$(package)_version=5.12.8
$(package)_download_path=https://download.qt.io/official_releases/qt/5.12/$($(package)_version)/submodules
$(package)_suffix=everywhere-src-$($(package)_version).tar.xz
$(package)_file_name=qtbase-$($(package)_suffix)
From e880b726b24cc000295a27d79da0c248a9683d33 Mon Sep 17 00:00:00 2001
From: devilking6105 <43361618+devilking6105@users.noreply.github.com>
Date: Fri, 5 Jun 2020 01:24:46 -0400
Subject: [PATCH 0084/1324] Update connection.h
---
src/qt/connection.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/qt/connection.h b/src/qt/connection.h
index af5fa0ae..47ebfb25 100644
--- a/src/qt/connection.h
+++ b/src/qt/connection.h
@@ -51,8 +51,8 @@
#ifndef CONNECTION_H
#define CONNECTION_H
-#include | |