Merge branch 'refactor'

Change-Id: Ie0d0bcdb6f4cd2b157a06e1197aaaad7fd126392

39 files changed, 40 insertions, 18 deletions

diff --git a/examples/desktop/desktop.pro b/examples/desktop/desktop.pro
index 6eab5e7..0e4d00c 100644
--- a/examples/desktop/desktop.pro
+++ b/examples/desktop/desktop.pro
@@ -1,2 +1,3 @@
 TEMPLATE = subdirs
 SUBDIRS +=  systray
+QT+=widgets
diff --git a/examples/desktop/systray/main.cpp b/examples/desktop/systray/main.cpp
index 6c84e58..892fbc6 100644
--- a/examples/desktop/systray/main.cpp
+++ b/examples/desktop/systray/main.cpp
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-#include <QtGui>
+#include <QtWidgets>
 
 #include "window.h"
 
diff --git a/examples/desktop/systray/systray.pro b/examples/desktop/systray/systray.pro
index 96a0fba..8e10fcc 100644
--- a/examples/desktop/systray/systray.pro
+++ b/examples/desktop/systray/systray.pro
@@ -27,3 +27,4 @@ maemo5: CONFIG += qt_example
 symbian: warning(This example does not work on Symbian platform)
 maemo5: warning(This example does not work on Maemo platform)
 simulator: warning(This example does not work on Simulator platform)
+QT+=widgets
diff --git a/examples/desktop/systray/window.cpp b/examples/desktop/systray/window.cpp
index 4091358..9295de4 100644
--- a/examples/desktop/systray/window.cpp
+++ b/examples/desktop/systray/window.cpp
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-#include <QtGui>
+#include <QtWidgets>
 
 #include "window.h"
 
diff --git a/examples/draganddrop/delayedencoding/delayedencoding.pro b/examples/draganddrop/delayedencoding/delayedencoding.pro
index e10f517..083a15b 100644
--- a/examples/draganddrop/delayedencoding/delayedencoding.pro
+++ b/examples/draganddrop/delayedencoding/delayedencoding.pro
@@ -21,3 +21,4 @@ maemo5: CONFIG += qt_example
 symbian: warning(This example does not work on Symbian platform)
 maemo5: warning(This example does not work on Maemo platform)
 simulator: warning(This example does not work on Simulator platform)
+QT+=widgets
diff --git a/examples/draganddrop/delayedencoding/mimedata.cpp b/examples/draganddrop/delayedencoding/mimedata.cpp
index 34d08a3..0e0efb5 100644
--- a/examples/draganddrop/delayedencoding/mimedata.cpp
+++ b/examples/draganddrop/delayedencoding/mimedata.cpp
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-#include <QtGui>
+#include <QtWidgets>
 #include "mimedata.h"
 
 MimeData::MimeData()
diff --git a/examples/draganddrop/delayedencoding/sourcewidget.cpp b/examples/draganddrop/delayedencoding/sourcewidget.cpp
index 0fbeb11..11fa922 100644
--- a/examples/draganddrop/delayedencoding/sourcewidget.cpp
+++ b/examples/draganddrop/delayedencoding/sourcewidget.cpp
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-#include <QtGui>
+#include <QtWidgets>
 #include <QtSvg>
 #include "mimedata.h"
 #include "sourcewidget.h"
diff --git a/examples/draganddrop/draganddrop.pro b/examples/draganddrop/draganddrop.pro
index c643b11..d87e6b2 100644
--- a/examples/draganddrop/draganddrop.pro
+++ b/examples/draganddrop/draganddrop.pro
@@ -1,2 +1,3 @@
 TEMPLATE = subdirs
 SUBDIRS +=  delayedencoding
+QT+=widgets
diff --git a/examples/embedded/desktopservices/desktopservices.pro b/examples/embedded/desktopservices/desktopservices.pro
index ae151d3..d9e6ab7 100644
--- a/examples/embedded/desktopservices/desktopservices.pro
+++ b/examples/embedded/desktopservices/desktopservices.pro
@@ -30,3 +30,4 @@ wince*{
 }
 
 INSTALLS += target sources
+QT+=widgets
diff --git a/examples/embedded/embedded.pro b/examples/embedded/embedded.pro
index 8adae72..8749fdb 100644
--- a/examples/embedded/embedded.pro
+++ b/examples/embedded/embedded.pro
@@ -1,2 +1,3 @@
 TEMPLATE = subdirs
 SUBDIRS +=  desktopservices embeddedsvgviewer fluidlauncher weatherinfo
+QT+=widgets
diff --git a/examples/embedded/embeddedsvgviewer/embeddedsvgviewer.pro b/examples/embedded/embeddedsvgviewer/embeddedsvgviewer.pro
index b55aee2..6f43cf7 100644
--- a/examples/embedded/embeddedsvgviewer/embeddedsvgviewer.pro
+++ b/examples/embedded/embeddedsvgviewer/embeddedsvgviewer.pro
@@ -19,3 +19,4 @@ symbian {
     TARGET.UID3 = 0xA000A640
     CONFIG += qt_demo
 }
+QT+=widgets
diff --git a/examples/embedded/fluidlauncher/fluidlauncher.h b/examples/embedded/fluidlauncher/fluidlauncher.h
index 4371537..f4dbb63 100644
--- a/examples/embedded/fluidlauncher/fluidlauncher.h
+++ b/examples/embedded/fluidlauncher/fluidlauncher.h
@@ -42,7 +42,7 @@
 #ifndef FLUID_LAUNCHER_H
 #define FLUID_LAUNCHER_H
 
-#include <QtGui>
+#include <QtWidgets>
 #include <QTimer>
 #include <QStringRef>
 
diff --git a/examples/embedded/fluidlauncher/fluidlauncher.pro b/examples/embedded/fluidlauncher/fluidlauncher.pro
index 272be25..847cd8d 100644
--- a/examples/embedded/fluidlauncher/fluidlauncher.pro
+++ b/examples/embedded/fluidlauncher/fluidlauncher.pro
@@ -261,3 +261,4 @@ symbian {
 
     TARGET.EPOCHEAPSIZE = 100000 20000000
 }
+QT+=widgets
diff --git a/examples/embedded/weatherinfo/weatherinfo.cpp b/examples/embedded/weatherinfo/weatherinfo.cpp
index 0614149..25f4b2a 100644
--- a/examples/embedded/weatherinfo/weatherinfo.cpp
+++ b/examples/embedded/weatherinfo/weatherinfo.cpp
@@ -40,7 +40,7 @@
 ****************************************************************************/
 
 #include <QtCore>
-#include <QtGui>
+#include <QtWidgets>
 #include <QtNetwork>
 #include <QtSvg>
 
diff --git a/examples/embedded/weatherinfo/weatherinfo.pro b/examples/embedded/weatherinfo/weatherinfo.pro
index 58a7add..a596191 100644
--- a/examples/embedded/weatherinfo/weatherinfo.pro
+++ b/examples/embedded/weatherinfo/weatherinfo.pro
@@ -14,3 +14,4 @@ target.path = $$[QT_INSTALL_EXAMPLES]/qtsvg/embedded/weatherinfo
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.pro
 sources.path = $$[QT_INSTALL_EXAMPLES]/qtsvg/embedded/weatherinfo
 INSTALLS += target sources
+QT+=widgets
diff --git a/examples/examples.pro b/examples/examples.pro
index d64c5e5..aa9351d 100644
--- a/examples/examples.pro
+++ b/examples/examples.pro
@@ -2,3 +2,4 @@ TEMPLATE = subdirs
 SUBDIRS += embedded richtext draganddrop painting network desktop
 
 contains(QT_CONFIG,opengl):SUBDIRS += opengl
+QT+=widgets
diff --git a/examples/network/bearercloud/bearercloud.pro b/examples/network/bearercloud/bearercloud.pro
index 4be5fe0..a4f2657 100644
--- a/examples/network/bearercloud/bearercloud.pro
+++ b/examples/network/bearercloud/bearercloud.pro
@@ -20,3 +20,4 @@ symbian: {
 maemo5: CONFIG += qt_example
 symbian: warning(This example might not fully work on Symbian platform)
 maemo5: warning(This example might not fully work on Maemo platform)
+QT+=widgets
diff --git a/examples/network/network.pro b/examples/network/network.pro
index a6c4b01..b4009da 100644
--- a/examples/network/network.pro
+++ b/examples/network/network.pro
@@ -1,2 +1,3 @@
 TEMPLATE = subdirs
 SUBDIRS +=  bearercloud
+QT+=widgets
diff --git a/examples/opengl/framebufferobject/framebufferobject.pro b/examples/opengl/framebufferobject/framebufferobject.pro
index 41e8b6d..958a8ad 100644
--- a/examples/opengl/framebufferobject/framebufferobject.pro
+++ b/examples/opengl/framebufferobject/framebufferobject.pro
@@ -22,3 +22,4 @@ INSTALLS += target sources
 
 symbian: CONFIG += qt_example
 
+QT+=widgets
diff --git a/examples/opengl/framebufferobject/main.cpp b/examples/opengl/framebufferobject/main.cpp
index c96392f..902ef47 100644
--- a/examples/opengl/framebufferobject/main.cpp
+++ b/examples/opengl/framebufferobject/main.cpp
@@ -38,8 +38,8 @@
 **
 ****************************************************************************/
 
-#include <QtGui/QApplication>
-#include <QtGui/QMessageBox>
+#include <QtWidgets/QApplication>
+#include <QtWidgets/QMessageBox>
 #include "glwidget.h"
 
 int main(int argc, char **argv)
diff --git a/examples/opengl/opengl.pro b/examples/opengl/opengl.pro
index a2d85f5..1cd7df1 100644
--- a/examples/opengl/opengl.pro
+++ b/examples/opengl/opengl.pro
@@ -1,2 +1,3 @@
 TEMPLATE = subdirs
 SUBDIRS +=  framebufferobject
+QT+=widgets
diff --git a/examples/painting/painting.pro b/examples/painting/painting.pro
index 1f1e54b..518bf06 100644
--- a/examples/painting/painting.pro
+++ b/examples/painting/painting.pro
@@ -1,2 +1,3 @@
 TEMPLATE = subdirs
 SUBDIRS +=  svgviewer svggenerator
+QT+=widgets
diff --git a/examples/painting/svggenerator/displaywidget.cpp b/examples/painting/svggenerator/displaywidget.cpp
index b99aa1f..d9db1c3 100644
--- a/examples/painting/svggenerator/displaywidget.cpp
+++ b/examples/painting/svggenerator/displaywidget.cpp
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-#include <QtGui>
+#include <QtWidgets>
 #include "displaywidget.h"
 
 DisplayWidget::DisplayWidget(QWidget *parent)
diff --git a/examples/painting/svggenerator/svggenerator.pro b/examples/painting/svggenerator/svggenerator.pro
index f0b5034..581db0b 100644
--- a/examples/painting/svggenerator/svggenerator.pro
+++ b/examples/painting/svggenerator/svggenerator.pro
@@ -22,3 +22,4 @@ symbian {
 }
 maemo5: CONFIG += qt_example
 
+QT+=widgets
diff --git a/examples/painting/svgviewer/mainwindow.cpp b/examples/painting/svgviewer/mainwindow.cpp
index 3821e51..9d8ca6b 100644
--- a/examples/painting/svgviewer/mainwindow.cpp
+++ b/examples/painting/svgviewer/mainwindow.cpp
@@ -40,7 +40,7 @@
 
 #include "mainwindow.h"
 
-#include <QtGui>
+#include <QtWidgets>
 
 #include "svgview.h"
 
diff --git a/examples/painting/svgviewer/svgviewer.pro b/examples/painting/svgviewer/svgviewer.pro
index fa862cf..b0bc1ed 100644
--- a/examples/painting/svgviewer/svgviewer.pro
+++ b/examples/painting/svgviewer/svgviewer.pro
@@ -31,3 +31,4 @@ symbian: {
 }
 maemo5: CONFIG += qt_example
 
+QT+=widgets
diff --git a/examples/richtext/richtext.pro b/examples/richtext/richtext.pro
index 5bc54f9..6983491 100644
--- a/examples/richtext/richtext.pro
+++ b/examples/richtext/richtext.pro
@@ -1,2 +1,3 @@
 TEMPLATE = subdirs
 SUBDIRS +=  textobject
+QT+=widgets
diff --git a/examples/richtext/textobject/main.cpp b/examples/richtext/textobject/main.cpp
index 1d1d433..3b8288a 100644
--- a/examples/richtext/textobject/main.cpp
+++ b/examples/richtext/textobject/main.cpp
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-#include <QtGui>
+#include <QtWidgets>
 
 #include "window.h"
 
diff --git a/examples/richtext/textobject/svgtextobject.cpp b/examples/richtext/textobject/svgtextobject.cpp
index 57d7fcc..5815e88 100644
--- a/examples/richtext/textobject/svgtextobject.cpp
+++ b/examples/richtext/textobject/svgtextobject.cpp
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-#include <QtGui>
+#include <QtWidgets>
 #include <QtSvg>
 
 #include "svgtextobject.h"
diff --git a/examples/richtext/textobject/textobject.pro b/examples/richtext/textobject/textobject.pro
index 5c49e17..e2e7d3b 100644
--- a/examples/richtext/textobject/textobject.pro
+++ b/examples/richtext/textobject/textobject.pro
@@ -19,3 +19,4 @@ maemo5: CONFIG += qt_example
 filesToDeploy.files = files/*.svg
 filesToDeploy.path = files
 DEPLOYMENT += filesToDeploy
+QT+=widgets
diff --git a/examples/richtext/textobject/window.cpp b/examples/richtext/textobject/window.cpp
index e43ac28..0f5bc50 100644
--- a/examples/richtext/textobject/window.cpp
+++ b/examples/richtext/textobject/window.cpp
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-#include <QtGui>
+#include <QtWidgets>
 #include <QtSvg>
 
 #include "window.h"
diff --git a/src/plugins/iconengines/svgiconengine/qsvgiconengine.h b/src/plugins/iconengines/svgiconengine/qsvgiconengine.h
index c4c77c8..a7e9c8d 100644
--- a/src/plugins/iconengines/svgiconengine/qsvgiconengine.h
+++ b/src/plugins/iconengines/svgiconengine/qsvgiconengine.h
@@ -42,7 +42,7 @@
 #ifndef QSVGICONENGINE_H
 #define QSVGICONENGINE_H
 
-#include <QtGui/qiconengine.h>
+#include <QtWidgets/qiconengine.h>
 #include <QtCore/qshareddata.h>
 
 #ifndef QT_NO_SVG
diff --git a/src/plugins/iconengines/svgiconengine/svgiconengine.pro b/src/plugins/iconengines/svgiconengine/svgiconengine.pro
index 5085a24..d13e0ea 100644
--- a/src/plugins/iconengines/svgiconengine/svgiconengine.pro
+++ b/src/plugins/iconengines/svgiconengine/svgiconengine.pro
@@ -6,7 +6,7 @@ load(qt_plugin)
 HEADERS += qsvgiconengine.h
 SOURCES += main.cpp \
            qsvgiconengine.cpp
-QT += xml svg
+QT += xml svg widgets
 
 DESTDIR  = $$QT.svg.plugins/iconengines
 target.path += $$[QT_INSTALL_PLUGINS]/iconengines
diff --git a/src/svg/qgraphicssvgitem.h b/src/svg/qgraphicssvgitem.h
index 88df102..63f1f2c 100644
--- a/src/svg/qgraphicssvgitem.h
+++ b/src/svg/qgraphicssvgitem.h
@@ -41,7 +41,7 @@
 #ifndef QGRAPHICSSVGITEM_H
 #define QGRAPHICSSVGITEM_H
 
-#include <QtGui/qgraphicsitem.h>
+#include <QtWidgets/qgraphicsitem.h>
 
 #ifndef QT_NO_GRAPHICSSVGITEM
 
diff --git a/src/svg/qsvgwidget.h b/src/svg/qsvgwidget.h
index 718e8ff..5de5956 100644
--- a/src/svg/qsvgwidget.h
+++ b/src/svg/qsvgwidget.h
@@ -42,7 +42,7 @@
 #ifndef QSVGWIDGET_H
 #define QSVGWIDGET_H
 
-#include <QtGui/qwidget.h>
+#include <QtWidgets/qwidget.h>
 
 #ifndef QT_NO_SVGWIDGET
 
diff --git a/src/svg/svg.pro b/src/svg/svg.pro
index 6a81ffd..24aaf52 100644
--- a/src/svg/svg.pro
+++ b/src/svg/svg.pro
@@ -2,7 +2,7 @@ load(qt_module)
 
 TARGET     = QtSvg
 QPRO_PWD   = $$PWD
-QT         = core-private gui-private
+QT         = core-private gui-private widgets widgets-private
 
 CONFIG += module
 MODULE_PRI = ../../modules/qt_svg.pri
diff --git a/tests/auto/qsvgdevice/qsvgdevice.pro b/tests/auto/qsvgdevice/qsvgdevice.pro
index 7eed6c8..91bb2ef 100644
--- a/tests/auto/qsvgdevice/qsvgdevice.pro
+++ b/tests/auto/qsvgdevice/qsvgdevice.pro
@@ -4,3 +4,4 @@ QT += xml
 
 
 
+QT+=widgets
diff --git a/tests/auto/qsvggenerator/qsvggenerator.pro b/tests/auto/qsvggenerator/qsvggenerator.pro
index 2e899a9..6699ff0 100644
--- a/tests/auto/qsvggenerator/qsvggenerator.pro
+++ b/tests/auto/qsvggenerator/qsvggenerator.pro
@@ -18,3 +18,4 @@ wince* {
 } else:!symbian {
     DEFINES += SRCDIR=\\\"$$PWD/\\\"
 }
+QT+=widgets
diff --git a/tests/auto/qsvgrenderer/qsvgrenderer.pro b/tests/auto/qsvgrenderer/qsvgrenderer.pro
index fc98776..768e6e6 100644
--- a/tests/auto/qsvgrenderer/qsvgrenderer.pro
+++ b/tests/auto/qsvgrenderer/qsvgrenderer.pro
@@ -21,3 +21,4 @@ wince*|symbian {
 !symbian: {
     DEFINES += SRCDIR=\\\"$$PWD/\\\"
 }
+QT+=widgets