Update Help>About Qt to use modern Qt logo and remove old Qt logo from repo

(cherry picked from commit d05ae6f10b9fe9d90d623374c1c065f436fab525)

diff --git a/pics/CMakeLists.txt b/pics/CMakeLists.txt
index d92e3a9..08c077c 100644 (file)
--- 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 80bbbbb..6482855 100644 (file)
--- a/pics/pics.qrc
+++ b/pics/pics.qrc
@@ -5,7 +5,6 @@
     <file>quassel-eye.png</file>
     <file>quassel-logo.png</file>
     <file>quassel-oxygen-32.png</file>
-    <file>qt-logo.png</file>
     <file>qt-logo-32.png</file>
   </qresource>
 </RCC>

diff --git a/pics/qt-logo.png b/pics/qt-logo.png
deleted file mode 100644 (file)
index 0093177..0000000
Binary files a/pics/qt-logo.png and /dev/null differ

diff --git a/src/qtui/mainwin.cpp b/src/qtui/mainwin.cpp
index 1879aed..489c02c 100644 (file)
--- a/src/qtui/mainwin.cpp
+++ b/src/qtui/mainwin.cpp
@@ -463,7 +463,7 @@ void MainWin::setupActions()
     aboutQuasselAct->setMenuRole(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);