Merge remote-tracking branch 'origin/5.3' into dev

Conflicts:
	.qmake.conf

Change-Id: Ic8f6fce9251acf4fbd0e7d5c3996ab2defb81107

5 files changed, 9 insertions, 19 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 <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;
     }
diff --git a/src/plugins/iconengines/svgiconengine/svgiconengine.pro b/src/plugins/iconengines/svgiconengine/svgiconengine.pro
index cf09d14..516142b 100644
--- a/src/plugins/iconengines/svgiconengine/svgiconengine.pro
+++ b/src/plugins/iconengines/svgiconengine/svgiconengine.pro
@@ -1,7 +1,7 @@
 TARGET  = qsvgicon
 
 PLUGIN_TYPE = iconengines
-PLUGIN_EXTENDS = -
+PLUGIN_EXTENDS = svg
 PLUGIN_CLASS_NAME = QSvgIconPlugin
 load(qt_plugin)
 
@@ -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
diff --git a/src/plugins/imageformats/svg/svg.pro b/src/plugins/imageformats/svg/svg.pro
index 9536c0b..ce1881f 100644
--- a/src/plugins/imageformats/svg/svg.pro
+++ b/src/plugins/imageformats/svg/svg.pro
@@ -1,11 +1,11 @@
 TARGET  = qsvg
 
 PLUGIN_TYPE = imageformats
-PLUGIN_EXTENDS = -
+PLUGIN_EXTENDS = svg
 PLUGIN_CLASS_NAME = QSvgPlugin
 load(qt_plugin)
 
 HEADERS += qsvgiohandler.h
 SOURCES += main.cpp \
            qsvgiohandler.cpp
-QT += xml svg
+QT += svg
diff --git a/src/svg/svg.pro b/src/svg/svg.pro
index e868e61..f2906ce 100644
--- a/src/svg/svg.pro
+++ b/src/svg/svg.pro
@@ -53,9 +53,3 @@ contains(QT_CONFIG, system-zlib) {
     else: \
         INCLUDEPATH += $$[QT_INSTALL_HEADERS/src]/QtZlib
 }
-
-ANDROID_LIB_DEPENDENCIES = \
-    lib/libQt5Xml.so
-
-ANDROID_BUNDLED_FILES += \
-    lib/libQt5Xml.so