From 24aedcb90a6f274c6329ccfcd0ab83f7e1d0ec7d Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Fri, 16 May 2014 09:47:39 +0200 Subject: Remove dependency of the SVG icon engine plugin on QtWidgets. Use the virtual QGuiApplicationPrivate::applyQIconStyleHelper() introduced by commit 6c06e14a49773ce5572935864ed6b9be219c6103 in qtbase to adapt the icon according to the style. Change-Id: I7c429f818c012c58118c64cc3b20a87fcb712877 Reviewed-by: Olivier Goffart --- src/plugins/iconengines/iconengines.pro | 2 +- src/plugins/iconengines/svgiconengine/qsvgiconengine.cpp | 12 ++++-------- src/plugins/iconengines/svgiconengine/svgiconengine.pro | 2 +- 3 files changed, 6 insertions(+), 10 deletions(-) diff --git a/src/plugins/iconengines/iconengines.pro b/src/plugins/iconengines/iconengines.pro index e7d1871..21bb8a7 100644 --- a/src/plugins/iconengines/iconengines.pro +++ b/src/plugins/iconengines/iconengines.pro @@ -1,3 +1,3 @@ TEMPLATE = subdirs -qtHaveModule(widgets): SUBDIRS += svgiconengine +SUBDIRS += svgiconengine 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 #include "qdebug.h" +#include 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(QCoreApplication::instance())) { - QStyleOption opt(0); - opt.palette = QGuiApplication::palette(); - QPixmap generated = QApplication::style()->generatedIconPixmap(mode, pm, &opt); + if (qobject_cast(QCoreApplication::instance())) { + const QPixmap generated = QGuiApplicationPrivate::instance()->applyQIconStyleHelper(mode, pm); if (!generated.isNull()) pm = generated; } diff --git a/src/plugins/iconengines/svgiconengine/svgiconengine.pro b/src/plugins/iconengines/svgiconengine/svgiconengine.pro index 2b27b3d..516142b 100644 --- a/src/plugins/iconengines/svgiconengine/svgiconengine.pro +++ b/src/plugins/iconengines/svgiconengine/svgiconengine.pro @@ -9,4 +9,4 @@ HEADERS += qsvgiconengine.h SOURCES += main.cpp \ qsvgiconengine.cpp OTHER_FILES += qsvgiconengine.json -QT += xml svg gui +QT += svg core-private gui-private -- cgit v1.2.1