From 200ae853226f786ff4afc42bd7e2c067b54435d1 Mon Sep 17 00:00:00 2001
From: Bastiaan Veelo <Bastiaan@SARC.nl>
Date: Thu, 29 Nov 2012 09:00:15 +0100
Subject: [PATCH] Load all applicationIcon pixmaps.

---
 tools/assistant/tools/assistant/mainwindow.cpp | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/tools/assistant/tools/assistant/mainwindow.cpp b/tools/assistant/tools/assistant/mainwindow.cpp
index 68343a4..20512e6 100644
--- a/tools/assistant/tools/assistant/mainwindow.cpp
+++ b/tools/assistant/tools/assistant/mainwindow.cpp
@@ -67,6 +67,7 @@
 #include <QtCore/QByteArray>
 #include <QtCore/QTextStream>
 #include <QtCore/QCoreApplication>
+#include <QtCore/QBuffer>
 
 #include <QtGui/QMenuBar>
 #include <QtGui/QAction>
@@ -84,6 +85,7 @@
 #include <QtGui/QDesktopServices>
 #include <QtGui/QToolButton>
 #include <QtGui/QFileDialog>
+#include <QtGui/QImageReader>
 
 #include <QtHelp/QHelpEngineCore>
 #include <QtHelp/QHelpSearchEngine>
@@ -169,9 +171,14 @@ MainWindow::MainWindow(CmdLineParser *cmdLine, QWidget *parent)
         setWindowTitle(windowTitle.isEmpty() ? defWindowTitle : windowTitle);
         QByteArray iconArray = helpEngineWrapper.applicationIcon();
         if (iconArray.size() > 0) {
-            QPixmap pix;
-            pix.loadFromData(iconArray);
-            QIcon appIcon(pix);
+            QBuffer buffer(&iconArray);
+            QImageReader reader(&buffer);
+            QIcon appIcon;
+            do {
+                QPixmap pix;
+                pix.convertFromImage(reader.read());
+                appIcon.addPixmap(pix);
+            } while (reader.jumpToNextImage());
             qApp->setWindowIcon(appIcon);
         } else {
             QIcon appIcon(QLatin1String(":/trolltech/assistant/images/assistant-128.png"));
-- 
1.7.11.msysgit.1