From 37c52018499ebe9e28a84f1d1ac4edb9abd9798c Mon Sep 17 00:00:00 2001
From: Bastiaan Veelo <Bastiaan@SARC.nl>
Date: Sat, 16 Nov 2013 21:48:49 +0100
Subject: [PATCH] Assistant: Load all applicationIcon pixmaps.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Qt Assistant, when used as a custom help viewer, would not load all
sizes of the application icon specified in the .qhcp file. Now
application icons look good everywhere, provided the files contain
multiple icons of various sizes.
Task-number: QTBUG-28267
Change-Id: I362e2feafa7944b0ad25627fb2fcea1b90af4e53
Reviewed-by: Thorbjørn Lund Martsum <tmartsum@gmail.com>
---
src/assistant/assistant/mainwindow.cpp | 13 ++++++++++---
1 file changed, 10 insertions(+), 3 deletions(-)
diff --git a/src/assistant/assistant/mainwindow.cpp b/src/assistant/assistant/mainwindow.cpp
index facbcd819..5186de341 100644
--- a/src/assistant/assistant/mainwindow.cpp
+++ b/src/assistant/assistant/mainwindow.cpp
@@ -66,12 +66,14 @@
#include <QtCore/QStandardPaths>
#include <QtCore/QTextStream>
#include <QtCore/QTimer>
+#include <QtCore/QBuffer>
#include <QtWidgets/QAction>
#include <QtWidgets/QComboBox>
#include <QtWidgets/QDesktopWidget>
#include <QtWidgets/QDockWidget>
#include <QtGui/QFontDatabase>
+#include <QtGui/QImageReader>
#include <QtWidgets/QFileDialog>
#include <QtWidgets/QLabel>
#include <QtWidgets/QLayout>
@@ -189,9 +191,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(":/qt-project.org/assistant/images/assistant-128.png"));
--
GitLab