Merge branch 'stable' into release

Change-Id: I6ae8209211f9a294681ea04dff070543957d1053

11 files changed, 73 insertions, 24 deletions

diff --git a/.gitignore b/.gitignore
index f2338c9..2f510c4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -260,3 +260,6 @@ src/xml/lib/
 *.dep
 *.map
 work
+
+# Generated static plugin import sources
+*_plugin_import.cpp
diff --git a/dist/changes-5.0.1 b/dist/changes-5.0.1
new file mode 100644
index 0000000..cc5a670
--- /dev/null
+++ b/dist/changes-5.0.1
@@ -0,0 +1,51 @@
+Qt 5.0.1 is a bug-fix release. It maintains both forward and backward
+compatibility (source and binary) with Qt 5.0.0.
+
+For more details, refer to the online documentation included in this
+distribution. The documentation is also available online:
+
+  http://qt-project.org/doc/qt-5.0/
+
+Some of the changes listed in this file include issue tracking numbers
+corresponding to tasks in the Qt Bug Tracker:
+
+  http://bugreports.qt-project.org/
+
+Each of these identifiers can be entered in the bug tracker to obtain more
+information about a particular change.
+
+
+****************************************************************************
+*                           General                                        *
+****************************************************************************
+
+General Improvements
+--------------------
+
+Third party components
+----------------------
+
+****************************************************************************
+*                          Library                                         *
+****************************************************************************
+
+
+****************************************************************************
+*                      Platform Specific Changes                           *
+****************************************************************************
+
+
+****************************************************************************
+*                      Compiler Specific Changes                           *
+****************************************************************************
+
+
+****************************************************************************
+*                          Tools                                           *
+****************************************************************************
+
+
+****************************************************************************
+*                          Plugins                                         *
+****************************************************************************
+
diff --git a/examples/svg/draganddrop/delayedencoding/delayedencoding.pro b/examples/svg/draganddrop/delayedencoding/delayedencoding.pro
index 2cb82f5..a0a8371 100644
--- a/examples/svg/draganddrop/delayedencoding/delayedencoding.pro
+++ b/examples/svg/draganddrop/delayedencoding/delayedencoding.pro
@@ -1,4 +1,4 @@
-QT          += svg
+QT          += widgets svg
 
 HEADERS     = mimedata.h \
               sourcewidget.h
@@ -12,4 +12,3 @@ target.path = $$[QT_INSTALL_EXAMPLES]/svg/draganddrop/delayedencoding
 INSTALLS += target
 
 simulator: warning(This example does not work on Simulator platform)
-QT+=widgets
diff --git a/examples/svg/embedded/weatherinfo/weatherinfo.pro b/examples/svg/embedded/weatherinfo/weatherinfo.pro
index 94aefd1..b2c94cf 100644
--- a/examples/svg/embedded/weatherinfo/weatherinfo.pro
+++ b/examples/svg/embedded/weatherinfo/weatherinfo.pro
@@ -2,8 +2,7 @@ TEMPLATE = app
 TARGET = weatherinfo
 SOURCES = weatherinfo.cpp
 RESOURCES = weatherinfo.qrc
-QT += network svg
+QT += network widgets svg
 
 target.path = $$[QT_INSTALL_EXAMPLES]/svg/embedded/weatherinfo
 INSTALLS += target
-QT+=widgets
diff --git a/examples/svg/richtext/textobject/textobject.pro b/examples/svg/richtext/textobject/textobject.pro
index 34e84dc..794ad32 100644
--- a/examples/svg/richtext/textobject/textobject.pro
+++ b/examples/svg/richtext/textobject/textobject.pro
@@ -4,7 +4,7 @@ SOURCES         = main.cpp \
                   svgtextobject.cpp \
                   window.cpp
 
-QT += svg
+QT += widgets svg
 
 RESOURCES       = resources.qrc
 
@@ -15,4 +15,3 @@ INSTALLS += target
 filesToDeploy.files = files/*.svg
 filesToDeploy.path = files
 DEPLOYMENT += filesToDeploy
-QT+=widgets
diff --git a/examples/svg/svggenerator/svggenerator.pro b/examples/svg/svggenerator/svggenerator.pro
index f13a9c4..8ac904b 100644
--- a/examples/svg/svggenerator/svggenerator.pro
+++ b/examples/svg/svggenerator/svggenerator.pro
@@ -6,12 +6,10 @@ SOURCES   = displaywidget.cpp \
             main.cpp \
             window.cpp
 
-QT += svg
+QT += widgets svg
 
 INCLUDEPATH += $$PWD
 
 # install
 target.path = $$[QT_INSTALL_EXAMPLES]/svg/svggenerator
 INSTALLS += target
-
-QT+=widgets
diff --git a/examples/svg/svgviewer/svgviewer.pro b/examples/svg/svgviewer/svgviewer.pro
index 43a89dc..b163ef7 100644
--- a/examples/svg/svgviewer/svgviewer.pro
+++ b/examples/svg/svgviewer/svgviewer.pro
@@ -4,7 +4,7 @@ RESOURCES     = svgviewer.qrc
 SOURCES       = main.cpp \
                 mainwindow.cpp \
                 svgview.cpp
-QT           += svg xml
+QT           += widgets svg xml
 
 contains(QT_CONFIG, opengl): QT += opengl
 
@@ -19,5 +19,3 @@ wince*: {
      addFiles.path = "\\My Documents"
      DEPLOYMENT += addFiles
 }
-
-QT+=widgets
diff --git a/src/plugins/iconengines/svgiconengine/qsvgiconengine.cpp b/src/plugins/iconengines/svgiconengine/qsvgiconengine.cpp
index 902e59d..6d84df1 100644
--- a/src/plugins/iconengines/svgiconengine/qsvgiconengine.cpp
+++ b/src/plugins/iconengines/svgiconengine/qsvgiconengine.cpp
@@ -180,11 +180,13 @@ QPixmap QSvgIconEngine::pixmap(const QSize &size, QIcon::Mode mode,
     renderer.render(&p);
     p.end();
     pm = QPixmap::fromImage(img);
-    QStyleOption opt(0);
-    opt.palette = QApplication::palette();
-    QPixmap generated = QApplication::style()->generatedIconPixmap(mode, pm, &opt);
-    if (!generated.isNull())
-        pm = generated;
+    if (qobject_cast<QApplication *>(QCoreApplication::instance())) {
+        QStyleOption opt(0);
+        opt.palette = QGuiApplication::palette();
+        QPixmap generated = QApplication::style()->generatedIconPixmap(mode, pm, &opt);
+        if (!generated.isNull())
+            pm = generated;
+    }
 
     if (!pm.isNull())
         QPixmapCache::insert(pmckey, pm);
diff --git a/src/svg/doc/qtsvg.qdocconf b/src/svg/doc/qtsvg.qdocconf
index 2758128..88fd510 100644
--- a/src/svg/doc/qtsvg.qdocconf
+++ b/src/svg/doc/qtsvg.qdocconf
@@ -4,7 +4,7 @@ include($QT_INSTALL_DOCS/global/qt-module-defaults.qdocconf)
 project                 = QtSvg
 description             = Qt SVG Reference Documentation
 url                     = http://qt-project.org/doc/qtsvg
-version                 = 5.0.0
+version                 = 5.0.1
 
 qhp.projects            = QtSvg
 
@@ -14,9 +14,9 @@ qhp.QtSvg.virtualFolder       = qtsvg
 qhp.QtSvg.indexTitle          = Qt SVG
 qhp.QtSvg.indexRoot           =
 
-qhp.QtSvg.filterAttributes    = qtsvg 5.0.0 qtrefdoc
-qhp.QtSvg.customFilters.Qt.name = QtSvg 5.0.0
-qhp.QtSvg.customFilters.Qt.filterAttributes = qtsvg 5.0.0
+qhp.QtSvg.filterAttributes    = qtsvg 5.0.1 qtrefdoc
+qhp.QtSvg.customFilters.Qt.name = QtSvg 5.0.1
+qhp.QtSvg.customFilters.Qt.filterAttributes = qtsvg 5.0.1
 qhp.QtSvg.subprojects         = classes
 qhp.QtSvg.subprojects.classes.title = C++ Classes
 qhp.QtSvg.subprojects.classes.indexTitle = Qt SVG C++ Classes
diff --git a/src/svg/qsvggenerator.cpp b/src/svg/qsvggenerator.cpp
index 47f760b..74efc65 100644
--- a/src/svg/qsvggenerator.cpp
+++ b/src/svg/qsvggenerator.cpp
@@ -175,7 +175,7 @@ public:
     void drawPolygon(const QPointF *points, int pointCount, PolygonDrawMode mode);
     void drawTextItem(const QPointF &pt, const QTextItem &item);
     void drawImage(const QRectF &r, const QImage &pm, const QRectF &sr,
-                   Qt::ImageConversionFlag = Qt::AutoColor);
+                   Qt::ImageConversionFlags flags = Qt::AutoColor);
 
     QPaintEngine::Type type() const { return QPaintEngine::SVG; }
 
@@ -907,7 +907,7 @@ void QSvgPaintEngine::drawPixmap(const QRectF &r, const QPixmap &pm,
 
 void QSvgPaintEngine::drawImage(const QRectF &r, const QImage &image,
                                 const QRectF &sr,
-                                Qt::ImageConversionFlag flags)
+                                Qt::ImageConversionFlags flags)
 {
     //Q_D(QSvgPaintEngine);
 
diff --git a/tests/auto/qicon_svg/qicon_svg.pro b/tests/auto/qicon_svg/qicon_svg.pro
index 3d61851..87e26be 100644
--- a/tests/auto/qicon_svg/qicon_svg.pro
+++ b/tests/auto/qicon_svg/qicon_svg.pro
@@ -1,7 +1,7 @@
 CONFIG += testcase
 TARGET = tst_qicon_svg
 
-QT += widgets testlib gui-private
+QT += testlib gui-private
 SOURCES += tst_qicon_svg.cpp
 RESOURCES = tst_qicon_svg.qrc