From 9a7b4728db831ffb74447e393a0a2cd07176909e Mon Sep 17 00:00:00 2001
From: phuzion <398094+phuzion@users.noreply.github.com>
Date: Wed, 13 Feb 2019 14:28:13 +0000
Subject: [PATCH] Update Help>About Qt to use modern Qt logo and remove old Qt
logo from repo
(cherry picked from commit d05ae6f10b9fe9d90d623374c1c065f436fab525)
---
pics/CMakeLists.txt | 3 +--
pics/pics.qrc | 1 -
pics/qt-logo.png | Bin 2238 -> 0 bytes
src/qtui/mainwin.cpp | 2 +-
4 files changed, 2 insertions(+), 4 deletions(-)
delete mode 100644 pics/qt-logo.png
diff --git a/pics/CMakeLists.txt b/pics/CMakeLists.txt
index d92e3a96..08c077c4 100644
--- a/pics/CMakeLists.txt
+++ b/pics/CMakeLists.txt
@@ -21,8 +21,7 @@ if(WANT_MONO OR WANT_QTCLIENT)
else()
# We don't find them yet externally, so disable installation
set(CLIENT_RCS ${CLIENT_RCS} ${CMAKE_CURRENT_SOURCE_DIR}/pics.qrc PARENT_SCOPE)
- # install(FILES qt-logo.png
- # quassel-large.png
+ # install(FILES quassel-large.png
# DESTINATION ${DATA_INSTALL_DIR}/quassel/pics)
endif()
endif()
diff --git a/pics/pics.qrc b/pics/pics.qrc
index 80bbbbb6..6482855d 100644
--- a/pics/pics.qrc
+++ b/pics/pics.qrc
@@ -5,7 +5,6 @@
quassel-eye.png
quassel-logo.png
quassel-oxygen-32.png
- qt-logo.png
qt-logo-32.png
diff --git a/pics/qt-logo.png b/pics/qt-logo.png
deleted file mode 100644
index 00931777875ac206566aa26a1b02989ece8a7acb..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 2238
zcmV;v2toIWP)R8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H12s=qcK~!jg&02eKRMj2+?(W^aH=AsBNkRw&SRnEaQ4DWEWu!o`
z!(*)4PK%|T)|xVuYOT{h+5$3`$v9X?Tj|*8s6$7Gsg5|*Qke)UBtm#r5=e+V^4ySw
zymt4#?>YTrht!*Mx8&X|==ay&-*?XW{k}bqd(Q7%j#7$L2$n@k0el<4vQQ2`zGPn3
zgkYE#eLfBx2O=d%pCXecO(nIuMyqt49IDz;*Oaos+X&81NU$v81Mnh%tpHG5nuR%~
zS>QakZcvd4NyN-PMJ6qpLM~_;{oK&WN5^*5T}pH87NipL27pZfFm{4~
zBoQ+Q6q&TC3b~+bv_{uy<+1Ix=SJK(Y=i{MB8vf30pK_e*sw7lVqh3u;S#z=X*_1e
z70GN@6;iLMw8qfs$49r$&+~wcCxE$v1xl
zL;P(I%qhG)2cMtIA8NM~^398W7`T12_zoj2|GuUY+~_ip?ajy7>o$KzT^L#>3d1wpKz{|LjKX#F>SzHbfg**q6N{NoQSTv5*5
zcx=wo7F%ajL-Euix1j)VDI^{<5p7cO{jv=V*B-lqy=Pwl0)3dbEED@HkD}uJ7c6BK
z6s{WV6$rjA_sC5l6Z0Yrry2_Dz|R2yViFtd%Cbq=wf9B5`rco0
z=1(<)_L$m>iX-I^co7-?z_8+SEo4f;6o%7GnXz#IcrS;9DluG^KWyuRf}%^k3a9`Q
z!;8!D&{7h~EkselG=@`cgaClo$3c==E?dZP>OLi0%@Lp9gK&U7$J-4pAUV7wg%y$|
z*!PGVI2OWj044S*BoD{g*8yOcY#z?<&9JRw7!(%LG{N9`mNtLuJc+R4~L~ILOA$tH#WWe1ol4j_ATo)-Z+al&g=li|Mp!RfE8r!${7;Jrx47P}HSaG!YdP7CIEgKY9+b=vV)hb(?QiYE
zy_@GVWxAy{R5c$+i-=T6TQ;8eahN$O5*
zL;wfi&B`|!?#cPP@ZCAjVn!a@V@{!|gt;M3s}M26gUD172R=K(oL9nP9+ppe6s3g^
zjo6POllO<((tgpi;QkN{V&L&zkEgq706=fI-v8VXy`nzGsetMenuRole(QAction::AboutRole);
coll->addAction("AboutQuassel", aboutQuasselAct);
- QAction *aboutQtAct = new Action(QIcon(":/pics/qt-logo.png"), tr("About &Qt"), coll,
+ QAction *aboutQtAct = new Action(QIcon(":/pics/qt-logo-32.png"), tr("About &Qt"), coll,
qApp, SLOT(aboutQt()));
aboutQtAct->setMenuRole(QAction::AboutQtRole);
coll->addAction("AboutQt", aboutQtAct);
--
2.20.1