From d1a868e19f07cd719f958ab5d401d3c4564c91b3 Mon Sep 17 00:00:00 2001
From: Manuel Nickschas <sputnick@quassel-irc.org>
Date: Sun, 16 Nov 2008 03:31:40 +0100
Subject: [PATCH] Add Qt logo to About Qt... action

---
 pics/README.qt-logo  |   3 +++
 pics/pics.qrc        |   1 +
 pics/qt-logo.png     | Bin 0 -> 2238 bytes
 src/qtui/mainwin.cpp |   5 ++---
 4 files changed, 6 insertions(+), 3 deletions(-)
 create mode 100644 pics/README.qt-logo
 create mode 100644 pics/qt-logo.png

diff --git a/pics/README.qt-logo b/pics/README.qt-logo
new file mode 100644
index 00000000..dfbb3800
--- /dev/null
+++ b/pics/README.qt-logo
@@ -0,0 +1,3 @@
+The Qt logo in qt-logo.png has been copied from Qt's source distribution
+and is hence distributed under GPL.
+All rights for this logo remain with Qt Software/Nokia.
diff --git a/pics/pics.qrc b/pics/pics.qrc
index 4ae2ef45..b3aa5290 100644
--- a/pics/pics.qrc
+++ b/pics/pics.qrc
@@ -1,5 +1,6 @@
 <RCC>
   <qresource prefix="/pics" >
     <file>quassel-large.png</file>
+    <file>qt-logo.png</file>
   </qresource>
 </RCC>
diff --git a/pics/qt-logo.png b/pics/qt-logo.png
new file mode 100644
index 0000000000000000000000000000000000000000..00931777875ac206566aa26a1b02989ece8a7acb
GIT binary patch
literal 2238
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
M07*qoM6N<$g2;O;F8}}l

literal 0
HcmV?d00001

diff --git a/src/qtui/mainwin.cpp b/src/qtui/mainwin.cpp
index e45576e1..0a3147f6 100644
--- a/src/qtui/mainwin.cpp
+++ b/src/qtui/mainwin.cpp
@@ -18,7 +18,7 @@
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 #include "mainwin.h"
-
+#include <QDir>
 #include "aboutdlg.h"
 #include "action.h"
 #include "actioncollection.h"
@@ -142,7 +142,6 @@ void MainWin::init() {
   setDisconnectedState();  // Disable menus and stuff
 
   show();
-
   showCoreConnectionDlg(true); // autoconnect if appropriate
 }
 
@@ -197,7 +196,7 @@ void MainWin::setupActions() {
   // Help
   coll->addAction("AboutQuassel", new Action(SmallIcon("quassel"), tr("&About Quassel..."), coll,
                                               this, SLOT(showAboutDlg())));
-  coll->addAction("AboutQt", new Action(tr("About &Qt..."), coll,
+  coll->addAction("AboutQt", new Action(QIcon(":/pics/qt-logo.png"), tr("About &Qt..."), coll,
                                          qApp, SLOT(aboutQt())));
   coll->addAction("DebugNetworkModel", new Action(SmallIcon("tools-report-bug"), tr("Debug &NetworkModel"), coll,
                                        this, SLOT(on_actionDebugNetworkModel_triggered())));
-- 
2.20.1