From 3c199843f5b649d705e3c6e6a2ea288ce536470f Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Mon, 16 Jan 2012 16:50:09 -0600 Subject: Fix kiconloader crash when libart is not in use (cherry picked from commit e6b6f2eafdf6dbe3b4d5526c75e9d7c5aaee5ccb) --- kdecore/kiconloader.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/kdecore/kiconloader.cpp b/kdecore/kiconloader.cpp index f40bcc531..91992f929 100644 --- a/kdecore/kiconloader.cpp +++ b/kdecore/kiconloader.cpp @@ -753,9 +753,9 @@ TQPixmap KIconLoader::loadIcon(const TQString& _name, KIcon::Group group, int si return pix; } } -#ifdef HAVE_LIBART else { +#ifdef HAVE_LIBART // Special stuff for SVG icons KSVGIconEngine *svgEngine = new KSVGIconEngine(); @@ -765,8 +765,10 @@ TQPixmap KIconLoader::loadIcon(const TQString& _name, KIcon::Group group, int si img = new TQImage(); delete svgEngine; - } +#else + img = new TQImage(); #endif + } iconType = icon.type; iconThreshold = icon.threshold; -- cgit v1.2.3