don't link to xml and iconthemes

This commit is contained in:
Marco Martin 2014-05-19 19:09:09 +02:00
parent 8155f2d542
commit f7e25fe696
8 changed files with 3 additions and 20 deletions

View File

@ -115,10 +115,10 @@ PRIVATE
Qt5::Sql Qt5::Sql
Qt5::Svg Qt5::Svg
Qt5::DBus Qt5::DBus
Qt5::Xml #Qt5::Xml
KF5::Archive KF5::Archive
KF5::GuiAddons #kimagecache KF5::GuiAddons #kimagecache
KF5::IconThemes #KF5::IconThemes
KF5::I18n KF5::I18n
KF5::KIOCore KF5::KIOCore
KF5::KIOWidgets KF5::KIOWidgets

View File

@ -32,7 +32,6 @@
#include <cmath> #include <cmath>
#include <QDebug> #include <QDebug>
#include <kiconloader.h>
#include <klocalizedstring.h> #include <klocalizedstring.h>
#include <kwindowsystem.h> #include <kwindowsystem.h>

View File

@ -30,7 +30,6 @@
#include <QDebug> #include <QDebug>
#include <QMessageBox> #include <QMessageBox>
#include <kiconloader.h>
#include <klocalizedstring.h> #include <klocalizedstring.h>
#include <kkeysequencewidget.h> #include <kkeysequencewidget.h>
#include <kglobalaccel.h> #include <kglobalaccel.h>

View File

@ -26,7 +26,6 @@
#include <qstandardpaths.h> #include <qstandardpaths.h>
#include <klocalizedstring.h> #include <klocalizedstring.h>
#include <kiconloader.h>
#if !PLASMA_NO_KIO #if !PLASMA_NO_KIO
#include <krun.h> #include <krun.h>

View File

@ -24,7 +24,6 @@
#include <kactioncollection.h> #include <kactioncollection.h>
#include <QDebug> #include <QDebug>
#include <kiconloader.h>
#include <klocalizedstring.h> #include <klocalizedstring.h>
#include <kwindowsystem.h> #include <kwindowsystem.h>

View File

@ -26,7 +26,6 @@
#include <QFontDatabase> #include <QFontDatabase>
#include <kdirwatch.h> #include <kdirwatch.h>
#include <kiconloader.h>
#include <kwindoweffects.h> #include <kwindoweffects.h>
namespace Plasma namespace Plasma

View File

@ -35,7 +35,6 @@
#include <kconfiggroup.h> #include <kconfiggroup.h>
#include <QDebug> #include <QDebug>
#include <kfilterdev.h> #include <kfilterdev.h>
#include <kiconeffect.h>
#include "applet.h" #include "applet.h"
#include "package.h" #include "package.h"
@ -368,13 +367,6 @@ QPixmap SvgPrivate::findInCache(const QString &elementId, const QSizeF &s)
renderPainter.end(); renderPainter.end();
// Apply current color scheme if the svg asks for it
if (applyColors) {
QImage itmp = p.toImage();
KIconEffect::colorize(itmp, cacheAndColorsTheme()->color(Theme::BackgroundColor), 1.0);
p = p.fromImage(itmp);
}
if (cacheRendering) { if (cacheRendering) {
cacheAndColorsTheme()->insertIntoCache(id, p, QString::number((qint64)q, 16) % QLSEP % actualElementId); cacheAndColorsTheme()->insertIntoCache(id, p, QString::number((qint64)q, 16) % QLSEP % actualElementId);
} }
@ -533,10 +525,7 @@ QMatrix SvgPrivate::matrixForElement(const QString &elementId)
void SvgPrivate::checkColorHints() void SvgPrivate::checkColorHints()
{ {
if (elementRect("hint-apply-color-scheme").isValid()) { if (elementRect("current-color-scheme").isValid()) {
applyColors = true;
usesColors = true;
} else if (elementRect("current-color-scheme").isValid()) {
applyColors = false; applyColors = false;
usesColors = true; usesColors = true;
} else { } else {

View File

@ -35,7 +35,6 @@
#include <kconfiggroup.h> #include <kconfiggroup.h>
#include <QDebug> #include <QDebug>
#include <kdirwatch.h> #include <kdirwatch.h>
#include <kiconloader.h>
#include <kimagecache.h> #include <kimagecache.h>
#include <ksharedconfig.h> #include <ksharedconfig.h>
#include <kwindoweffects.h> #include <kwindoweffects.h>