diff options
author | Sergio Ahumada <sahumada@blackberry.com> | 2014-06-14 21:58:01 +0200 |
---|---|---|
committer | Sergio Ahumada <sahumada@blackberry.com> | 2014-06-14 21:58:01 +0200 |
commit | d098ff07179ecc49f75f3070390b7391ebd9da6e (patch) | |
tree | 83ecb7f36fd9bee1a10c8df01667acf1e875d7ac /src/plugins/iconengines/svgiconengine/qsvgiconengine.cpp | |
parent | 90c3421846e1ea51b0048122e29bcc890d691cab (diff) | |
parent | 35a2f0880831d38c60d2b4820dac808f48f6f3a8 (diff) | |
download | qtsvg-d098ff07179ecc49f75f3070390b7391ebd9da6e.tar.gz |
Merge remote-tracking branch 'origin/5.3' into dev
Conflicts:
.qmake.conf
Change-Id: Ic8f6fce9251acf4fbd0e7d5c3996ab2defb81107
Diffstat (limited to 'src/plugins/iconengines/svgiconengine/qsvgiconengine.cpp')
-rw-r--r-- | src/plugins/iconengines/svgiconengine/qsvgiconengine.cpp | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/src/plugins/iconengines/svgiconengine/qsvgiconengine.cpp b/src/plugins/iconengines/svgiconengine/qsvgiconengine.cpp index 1f47dfe..383881f 100644 --- a/src/plugins/iconengines/svgiconengine/qsvgiconengine.cpp +++ b/src/plugins/iconengines/svgiconengine/qsvgiconengine.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the plugins of the Qt Toolkit. @@ -46,12 +46,10 @@ #include "qpixmap.h" #include "qsvgrenderer.h" #include "qpixmapcache.h" -#include "qstyle.h" -#include "qapplication.h" -#include "qstyleoption.h" #include "qfileinfo.h" #include <QAtomicInt> #include "qdebug.h" +#include <private/qguiapplication_p.h> QT_BEGIN_NAMESPACE @@ -178,10 +176,8 @@ QPixmap QSvgIconEngine::pixmap(const QSize &size, QIcon::Mode mode, renderer.render(&p); p.end(); pm = QPixmap::fromImage(img); - if (qobject_cast<QApplication *>(QCoreApplication::instance())) { - QStyleOption opt(0); - opt.palette = QGuiApplication::palette(); - QPixmap generated = QApplication::style()->generatedIconPixmap(mode, pm, &opt); + if (qobject_cast<QGuiApplication *>(QCoreApplication::instance())) { + const QPixmap generated = QGuiApplicationPrivate::instance()->applyQIconStyleHelper(mode, pm); if (!generated.isNull()) pm = generated; } |