From 7ec4dda4219f796cade73f00fea14fc4b2bdd7a5 Mon Sep 17 00:00:00 2001
From: Szymon Tomasz Stefanek
Date: Mon, 7 Jun 2010 01:12:27 +0000
Subject: Fix some icon issues

git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@4424 17fca916-40b9-46aa-a4ea-0a15b648b75c
---
 src/modules/toolbareditor/toolbareditor.cpp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'src/modules/toolbareditor/toolbareditor.cpp')

diff --git a/src/modules/toolbareditor/toolbareditor.cpp b/src/modules/toolbareditor/toolbareditor.cpp
index 7accfd5a5..afbe0de71 100644
--- a/src/modules/toolbareditor/toolbareditor.cpp
+++ b/src/modules/toolbareditor/toolbareditor.cpp
@@ -205,10 +205,11 @@ KviCustomToolBarPropertiesDialog::~KviCustomToolBarPropertiesDialog()
 
 void KviCustomToolBarPropertiesDialog::iconSelected(const QString &szIconId)
 {
-	QPixmap * p = g_pIconManager->getImage(szIconId.toUtf8().data());
-	if(p)
+	QPixmap * pix = g_pIconManager->getImage(szIconId);
+
+	if(pix)
 	{
-		m_pIconButton->setIcon(*p);
+		m_pIconButton->setIcon(QIcon(*pix));
 		m_szIconId = szIconId;
 		m_pIconEdit->setText(szIconId);
 	} else {
-- 
cgit v1.3.1-10-gc9f91