diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2012-01-16 16:50:09 -0600 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2012-06-02 19:05:12 +0200 |
| commit | 3c199843f5b649d705e3c6e6a2ea288ce536470f (patch) | |
| tree | 137fca8a5ad7d5cbdbcf83696b3f1877b7a708e7 | |
| parent | f1cc1e956cf404a71c453c9765b6f22abbbb55eb (diff) | |
| download | tdelibs-3c199843f5b649d705e3c6e6a2ea288ce536470f.tar.gz tdelibs-3c199843f5b649d705e3c6e6a2ea288ce536470f.zip | |
Fix kiconloader crash when libart is not in use
(cherry picked from commit e6b6f2eafdf6dbe3b4d5526c75e9d7c5aaee5ccb)
| -rw-r--r-- | kdecore/kiconloader.cpp | 6 |
1 files 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; |