diff options
author | Gunnar Sletta <gunnar.sletta@nokia.com> | 2011-08-26 08:17:28 +0200 |
---|---|---|
committer | Gunnar Sletta <gunnar.sletta@nokia.com> | 2011-08-26 08:17:28 +0200 |
commit | 09448b55b19c1f6b17e0715f3a1e10f0f6d93673 (patch) | |
tree | 788f72f0b788f49529d04d47783f3213bf5c7a5c | |
parent | 11eeee22affeca89eea90b8555fa8016fd74b789 (diff) | |
download | qtsvg-09448b55b19c1f6b17e0715f3a1e10f0f6d93673.tar.gz |
Refactor branch
Change-Id: Ib40cc3a98060dfbe1649af23f970afe542f9734c
-rw-r--r-- | examples/desktop/systray/main.cpp | 2 | ||||
-rw-r--r-- | examples/desktop/systray/window.cpp | 2 | ||||
-rw-r--r-- | examples/draganddrop/delayedencoding/mimedata.cpp | 2 | ||||
-rw-r--r-- | examples/draganddrop/delayedencoding/sourcewidget.cpp | 2 | ||||
-rw-r--r-- | examples/embedded/fluidlauncher/fluidlauncher.h | 2 | ||||
-rw-r--r-- | examples/embedded/weatherinfo/weatherinfo.cpp | 2 | ||||
-rw-r--r-- | examples/opengl/framebufferobject/main.cpp | 4 | ||||
-rw-r--r-- | examples/painting/svggenerator/displaywidget.cpp | 2 | ||||
-rw-r--r-- | examples/painting/svgviewer/mainwindow.cpp | 2 | ||||
-rw-r--r-- | examples/richtext/textobject/main.cpp | 2 | ||||
-rw-r--r-- | examples/richtext/textobject/svgtextobject.cpp | 2 | ||||
-rw-r--r-- | examples/richtext/textobject/window.cpp | 2 | ||||
-rw-r--r-- | src/plugins/iconengines/svgiconengine/qsvgiconengine.h | 2 | ||||
-rw-r--r-- | src/plugins/iconengines/svgiconengine/svgiconengine.pro | 2 | ||||
-rw-r--r-- | src/svg/qgraphicssvgitem.h | 2 | ||||
-rw-r--r-- | src/svg/qsvgwidget.h | 2 | ||||
-rw-r--r-- | src/svg/svg.pro | 2 |
17 files changed, 18 insertions, 18 deletions
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/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/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/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/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/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/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/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/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/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 |