fix compilation for demos/

2011-05-08 09:13:40 +02:00 · 2011-05-08 09:13:40 +02:00 · 16f7919629
commit 16f7919629
parent 6773a7f870
78 changed files with 86 additions and 73 deletions
--- a/demos/affine/affine.pro
+++ b/demos/affine/affine.pro
@ -3,7 +3,7 @@ HEADERS += xform.h

 contains(QT_CONFIG, opengl)|contains(QT_CONFIG, opengles1)|contains(QT_CONFIG, opengles2) {
 	DEFINES += QT_OPENGL_SUPPORT
-	QT += opengl
+	QT += opengl widgets
 }

 SHARED_FOLDER = ../shared
--- a/demos/books/bookdelegate.cpp
+++ b/demos/books/bookdelegate.cpp
@ -41,7 +41,7 @@

 #include "bookdelegate.h"

-#include <QtGui>
+#include <QtWidgets>

 BookDelegate::BookDelegate(QObject *parent)
    : QSqlRelationalDelegate(parent), star(QPixmap(":images/star.png"))
--- a/demos/books/books.pro
+++ b/demos/books/books.pro
@ -6,7 +6,7 @@ RESOURCES   = books.qrc
 SOURCES     = bookdelegate.cpp main.cpp bookwindow.cpp
 FORMS       = bookwindow.ui

-QT += sql
+QT += sql widgets widgets

 target.path = $$[QT_INSTALL_DEMOS]/qtbase/books
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.pro images
--- a/demos/books/bookwindow.h
+++ b/demos/books/bookwindow.h
@ -42,7 +42,7 @@
 #ifndef BOOKWINDOW_H
 #define BOOKWINDOW_H

-#include <QtGui>
+#include <QtWidgets>
 #include <QtSql>

 #include "ui_bookwindow.h"
--- a/demos/books/main.cpp
+++ b/demos/books/main.cpp
@ -41,7 +41,7 @@

 #include "bookwindow.h"

-#include <QtGui>
+#include <QtWidgets>

 int main(int argc, char * argv[])
 {
--- a/demos/boxes/boxes.pro
+++ b/demos/boxes/boxes.pro
@ -27,7 +27,7 @@ SOURCES += 3rdparty/fbm.c \

 RESOURCES += boxes.qrc

-QT += opengl
+QT += opengl widgets

 # install
 target.path = $$[QT_INSTALL_DEMOS]/qtbase/boxes
--- a/demos/boxes/glbuffers.h
+++ b/demos/boxes/glbuffers.h
@ -45,7 +45,7 @@
 //#include <GL/glew.h>
 #include "glextensions.h"

-#include <QtGui>
+#include <QtWidgets>
 #include <QtOpenGL>

 #define BUFFER_OFFSET(i) ((char*)0 + (i))
--- a/demos/boxes/gltrianglemesh.h
+++ b/demos/boxes/gltrianglemesh.h
@ -45,7 +45,7 @@
 //#include <GL/glew.h>
 #include "glextensions.h"

-#include <QtGui>
+#include <QtWidgets>
 #include <QtOpenGL>

 #include "glbuffers.h"
--- a/demos/boxes/main.cpp
+++ b/demos/boxes/main.cpp
@ -44,7 +44,7 @@

 #include "scene.h"

-#include <QtGui>
+#include <QtWidgets>
 #include <QGLWidget>

 class GraphicsView : public QGraphicsView
--- a/demos/boxes/qtbox.h
+++ b/demos/boxes/qtbox.h
@ -42,7 +42,7 @@
 #ifndef QTBOX_H
 #define QTBOX_H

-#include <QtGui>
+#include <QtWidgets>

 #include <QtGui/qvector3d.h>
 #include "glbuffers.h"
--- a/demos/boxes/roundedbox.h
+++ b/demos/boxes/roundedbox.h
@ -45,7 +45,7 @@
 //#include <GL/glew.h>
 #include "glextensions.h"

-#include <QtGui>
+#include <QtWidgets>
 #include <QtOpenGL>

 #include "gltrianglemesh.h"
--- a/demos/boxes/scene.h
+++ b/demos/boxes/scene.h
@ -45,7 +45,7 @@
 //#include <GL/glew.h>
 #include "glextensions.h"

-#include <QtGui>
+#include <QtWidgets>
 #include <QtOpenGL>

 #include "roundedbox.h"
--- a/demos/boxes/trackball.h
+++ b/demos/boxes/trackball.h
@ -42,7 +42,7 @@
 #ifndef TRACKBALL_H
 #define TRACKBALL_H

-#include <QtGui>
+#include <QtWidgets>

 #include <QtGui/qvector3d.h>
 #include <QtGui/qquaternion.h>
--- a/demos/chip/chip.cpp
+++ b/demos/chip/chip.cpp
@ -41,7 +41,7 @@

 #include "chip.h"

-#include <QtGui>
+#include <QtWidgets>

 Chip::Chip(const QColor &color, int x, int y)
 {
--- a/demos/chip/chip.h
+++ b/demos/chip/chip.h
@ -43,7 +43,7 @@
 #define CHIP_H

 #include <QtGui/QColor>
-#include <QtGui/QGraphicsItem>
+#include <QtWidgets/QGraphicsItem>

 class Chip : public QGraphicsItem
 {
--- a/demos/chip/chip.pro
+++ b/demos/chip/chip.pro
@ -4,7 +4,7 @@ HEADERS += mainwindow.h view.h chip.h
 SOURCES += main.cpp
 SOURCES += mainwindow.cpp view.cpp chip.cpp

-contains(QT_CONFIG, opengl):QT += opengl
+contains(QT_CONFIG, opengl):QT += opengl widgets

 build_all:!build_pass {
    CONFIG -= build_all
--- a/demos/chip/mainwindow.cpp
+++ b/demos/chip/mainwindow.cpp
@ -43,7 +43,7 @@
 #include "view.h"
 #include "chip.h"

-#include <QtGui>
+#include <QtWidgets>

 MainWindow::MainWindow(QWidget *parent)
    : QWidget(parent)
--- a/demos/chip/mainwindow.h
+++ b/demos/chip/mainwindow.h
@ -42,7 +42,7 @@
 #ifndef MAINWINDOW_H
 #define MAINWINDOW_H

-#include <QtGui/qwidget.h>
+#include <QtWidgets/qwidget.h>

 QT_FORWARD_DECLARE_CLASS(QGraphicsScene)
 QT_FORWARD_DECLARE_CLASS(QGraphicsView)
--- a/demos/chip/view.cpp
+++ b/demos/chip/view.cpp
@ -41,7 +41,7 @@

 #include "view.h"

-#include <QtGui>
+#include <QtWidgets>
 #ifndef QT_NO_OPENGL
 #include <QtOpenGL>
 #endif
--- a/demos/composition/composition.pro
+++ b/demos/composition/composition.pro
@ -8,7 +8,7 @@ include($$SHARED_FOLDER/shared.pri)
 RESOURCES += composition.qrc
 contains(QT_CONFIG, opengl) {
 	DEFINES += QT_OPENGL_SUPPORT
-	QT += opengl
+	QT += opengl widgets
 }

 # install
--- a/demos/deform/deform.pro
+++ b/demos/deform/deform.pro
@ -9,7 +9,7 @@ RESOURCES += deform.qrc

 contains(QT_CONFIG, opengl) {
 	DEFINES += QT_OPENGL_SUPPORT
-	QT += opengl
+	QT += opengl widgets
 }

 # install
--- a/demos/demos.pro
+++ b/demos/demos.pro
@ -96,3 +96,4 @@ demos_sub-attaq.subdir = sub-attaq
     demos_pathstroke.depends = demos_shared
 }
 }
+QT += widgets widgets
--- a/demos/embedded/digiflip/digiflip.cpp
+++ b/demos/embedded/digiflip/digiflip.cpp
@ -40,7 +40,7 @@
 ****************************************************************************/

 #include <QtCore>
-#include <QtGui>
+#include <QtWidgets>

 class Digits: public QWidget
 {
--- a/demos/embedded/digiflip/digiflip.pro
+++ b/demos/embedded/digiflip/digiflip.pro
@ -9,3 +9,4 @@ target.path = $$[QT_INSTALL_DEMOS]/qtbase/embedded/digiflip
 sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro
 sources.path = $$[QT_INSTALL_DEMOS]/qtbase/embedded/digiflip
 INSTALLS += target sources
+QT += widgets widgets
--- a/demos/embedded/embedded.pro
+++ b/demos/embedded/embedded.pro
@ -10,3 +10,4 @@ sources.path = $$[QT_INSTALL_DEMOS]/qtbase/embedded
 INSTALLS += sources

 symbian: CONFIG += qt_demo
+QT += widgets widgets
--- a/demos/embedded/flickable/flickable.cpp
+++ b/demos/embedded/flickable/flickable.cpp
@ -42,7 +42,7 @@
 #include "flickable.h"

 #include <QtCore>
-#include <QtGui>
+#include <QtWidgets>

 class FlickableTicker: QObject
 {
--- a/demos/embedded/flickable/flickable.pro
+++ b/demos/embedded/flickable/flickable.pro
@ -10,3 +10,4 @@ target.path = $$[QT_INSTALL_DEMOS]/qtbase/embedded/flickable
 sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro
 sources.path = $$[QT_INSTALL_DEMOS]/qtbase/embedded/flickable
 INSTALLS += target sources
+QT += widgets widgets
--- a/demos/embedded/flickable/main.cpp
+++ b/demos/embedded/flickable/main.cpp
@ -40,7 +40,7 @@
 ****************************************************************************/

 #include <QtCore>
-#include <QtGui>
+#include <QtWidgets>

 #include "flickable.h"

--- a/demos/embedded/flightinfo/flightinfo.cpp
+++ b/demos/embedded/flightinfo/flightinfo.cpp
@ -40,7 +40,7 @@
 ****************************************************************************/

 #include <QtCore>
-#include <QtGui>
+#include <QtWidgets>
 #include <QtNetwork>

 #include "ui_form.h"
--- a/demos/embedded/flightinfo/flightinfo.pro
+++ b/demos/embedded/flightinfo/flightinfo.pro
@ -3,7 +3,7 @@ TARGET = flightinfo
 SOURCES = flightinfo.cpp
 FORMS += form.ui
 RESOURCES = flightinfo.qrc
-QT += network
+QT += network widgets

 symbian {
    TARGET.UID3 = 0xA000CF74
--- a/demos/embedded/lightmaps/lightmaps.cpp
+++ b/demos/embedded/lightmaps/lightmaps.cpp
@ -40,7 +40,7 @@
 ****************************************************************************/

 #include <QtCore>
-#include <QtGui>
+#include <QtWidgets>
 #include <QtNetwork>

 #include <math.h>
--- a/demos/embedded/lightmaps/lightmaps.pro
+++ b/demos/embedded/lightmaps/lightmaps.pro
@ -6,7 +6,7 @@ SOURCES   = lightmaps.cpp \
            main.cpp \
            mapzoom.cpp \
            slippymap.cpp
-QT += network
+QT += network widgets

 symbian {
    TARGET.UID3 = 0xA000CF75
--- a/demos/embedded/lightmaps/mapzoom.cpp
+++ b/demos/embedded/lightmaps/mapzoom.cpp
@ -39,7 +39,7 @@
 **
 ****************************************************************************/

-#include <QtGui>
+#include <QtWidgets>
 #include <QtNetwork>
 #include "lightmaps.h"
 #include "mapzoom.h"
--- a/demos/embedded/lightmaps/slippymap.cpp
+++ b/demos/embedded/lightmaps/slippymap.cpp
@ -41,7 +41,7 @@

 #include <math.h>

-#include <QtGui>
+#include <QtWidgets>
 #include <QtNetwork>
 #include "slippymap.h"

--- a/demos/embedded/raycasting/raycasting.cpp
+++ b/demos/embedded/raycasting/raycasting.cpp
@ -40,7 +40,7 @@
 ****************************************************************************/

 #include <QtCore>
-#include <QtGui>
+#include <QtWidgets>

 #include <math.h>

--- a/demos/embedded/raycasting/raycasting.pro
+++ b/demos/embedded/raycasting/raycasting.pro
@ -11,3 +11,4 @@ target.path = $$[QT_INSTALL_DEMOS]/qtbase/embedded/raycasting
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.pro
 sources.path = $$[QT_INSTALL_DEMOS]/qtbase/embedded/raycasting
 INSTALLS += target sources
+QT += widgets widgets
--- a/demos/embedded/styledemo/styledemo.pro
+++ b/demos/embedded/styledemo/styledemo.pro
@ -15,3 +15,4 @@ symbian {
    TARGET.UID3 = 0xA000A63F
    CONFIG += qt_demo
 }
+QT += widgets widgets
--- a/demos/embeddeddialogs/customproxy.cpp
+++ b/demos/embeddeddialogs/customproxy.cpp
@ -41,7 +41,7 @@

 #include "customproxy.h"

-#include <QtGui>
+#include <QtWidgets>

 CustomProxy::CustomProxy(QGraphicsItem *parent, Qt::WindowFlags wFlags)
    : QGraphicsProxyWidget(parent, wFlags), popupShown(false), currentPopup(0)
--- a/demos/embeddeddialogs/customproxy.h
+++ b/demos/embeddeddialogs/customproxy.h
@ -43,7 +43,7 @@
 #define CUSTOMPROXY_H

 #include <QtCore/qtimeline.h>
-#include <QtGui/qgraphicsproxywidget.h>
+#include <QtWidgets/qgraphicsproxywidget.h>

 class CustomProxy : public QGraphicsProxyWidget
 {
--- a/demos/embeddeddialogs/embeddeddialog.cpp
+++ b/demos/embeddeddialogs/embeddeddialog.cpp
@ -42,7 +42,7 @@
 #include "embeddeddialog.h"
 #include "ui_embeddeddialog.h"

-#include <QtGui>
+#include <QtWidgets>

 EmbeddedDialog::EmbeddedDialog(QWidget *parent)
    : QDialog(parent)
--- a/demos/embeddeddialogs/embeddeddialog.h
+++ b/demos/embeddeddialogs/embeddeddialog.h
@ -42,7 +42,7 @@
 #ifndef EMBEDDEDDIALOG_H
 #define EMBEDDEDDIALOG_H

-#include <QtGui/qdialog.h>
+#include <QtWidgets/qdialog.h>

 QT_FORWARD_DECLARE_CLASS(Ui_embeddedDialog);

--- a/demos/embeddeddialogs/embeddeddialogs.pro
+++ b/demos/embeddeddialogs/embeddeddialogs.pro
@ -17,3 +17,4 @@ sources.path = $$[QT_INSTALL_DEMOS]/qtbase/embeddeddialogs
 INSTALLS += target sources

 symbian: CONFIG += qt_demo
+QT += widgets widgets
--- a/demos/embeddeddialogs/main.cpp
+++ b/demos/embeddeddialogs/main.cpp
@ -42,7 +42,7 @@
 #include "customproxy.h"
 #include "embeddeddialog.h"

-#include <QtGui>
+#include <QtWidgets>

 int main(int argc, char *argv[])
 {
--- a/demos/gradients/gradients.h
+++ b/demos/gradients/gradients.h
@ -44,7 +44,7 @@

 #include "arthurwidgets.h"

-#include <QtGui>
+#include <QtWidgets>

 class HoverPoints;

--- a/demos/gradients/gradients.pro
+++ b/demos/gradients/gradients.pro
@ -8,7 +8,7 @@ include($$SHARED_FOLDER/shared.pri)
 RESOURCES += gradients.qrc
 contains(QT_CONFIG, opengl) {
 	DEFINES += QT_OPENGL_SUPPORT
-	QT += opengl
+	QT += opengl widgets
 }

 # install
--- a/demos/interview/interview.pro
+++ b/demos/interview/interview.pro
@ -17,3 +17,4 @@ sources.path = $$[QT_INSTALL_DEMOS]/qtbase/interview
 INSTALLS += target sources

 symbian: CONFIG += qt_demo
+QT += widgets widgets
--- a/demos/macmainwindow/macmainwindow.h
+++ b/demos/macmainwindow/macmainwindow.h
@ -41,7 +41,7 @@
 #ifndef MACMAINWINDOW_H
 #define MACMAINWINDOW_H

-#include <QtGui>
+#include <QtWidgets>

 #ifdef Q_WS_MAC

--- a/demos/macmainwindow/macmainwindow.pro
+++ b/demos/macmainwindow/macmainwindow.pro
@ -21,3 +21,4 @@ sources.files = $$SOURCES  *.pro *.html
 sources.path = $$[QT_INSTALL_DEMOS]/qtbase/macmainwindow
 INSTALLS += target sources
 }
+QT += widgets widgets
--- a/demos/macmainwindow/main.cpp
+++ b/demos/macmainwindow/main.cpp
@ -39,7 +39,7 @@
 **
 ****************************************************************************/

-#include <QtGui>
+#include <QtWidgets>
 #include "macmainwindow.h"

 #ifdef Q_WS_MAC
--- a/demos/mainwindow/mainwindow.pro
+++ b/demos/mainwindow/mainwindow.pro
@ -15,3 +15,4 @@ sources.path = $$[QT_INSTALL_DEMOS]/qtbase/mainwindow
 INSTALLS += target sources

 symbian: CONFIG += qt_demo
+QT += widgets widgets
--- a/demos/pathstroke/pathstroke.h
+++ b/demos/pathstroke/pathstroke.h
@ -43,7 +43,7 @@
 #define PATHSTROKE_H

 #include "arthurwidgets.h"
-#include <QtGui>
+#include <QtWidgets>

 class PathStrokeRenderer : public ArthurFrame
 {
--- a/demos/pathstroke/pathstroke.pro
+++ b/demos/pathstroke/pathstroke.pro
@ -9,7 +9,7 @@ RESOURCES += pathstroke.qrc

 contains(QT_CONFIG, opengl) {
 	DEFINES += QT_OPENGL_SUPPORT
-	QT += opengl
+	QT += opengl widgets
 }

 # install
--- a/demos/shared/hoverpoints.h
+++ b/demos/shared/hoverpoints.h
@ -42,7 +42,7 @@
 #ifndef HOVERPOINTS_H
 #define HOVERPOINTS_H

-#include <QtGui>
+#include <QtWidgets>

 QT_FORWARD_DECLARE_CLASS(QBypassWidget)

--- a/demos/shared/shared.pro
+++ b/demos/shared/shared.pro
@ -3,7 +3,7 @@ CONFIG += static

 contains(QT_CONFIG, opengl)|contains(QT_CONFIG, opengles1)|contains(QT_CONFIG, opengles2) {
 	DEFINES += QT_OPENGL_SUPPORT
-	QT += opengl
+	QT += opengl widgets
 }

 build_all:!build_pass {
@ -11,7 +11,7 @@ build_all:!build_pass {
    CONFIG += release
 }
 TARGET = demo_shared
-QT += gui-private
+QT += gui-private widgets

 SOURCES += \
 	arthurstyle.cpp\
--- a/demos/spreadsheet/main.cpp
+++ b/demos/spreadsheet/main.cpp
@ -39,7 +39,7 @@
 **
 ****************************************************************************/

-#include <QtGui/QApplication>
+#include <QtWidgets/QApplication>
 #include "spreadsheet.h"

 int main(int argc, char** argv) {
--- a/demos/spreadsheet/spreadsheet.cpp
+++ b/demos/spreadsheet/spreadsheet.cpp
@ -39,7 +39,7 @@
 **
 ****************************************************************************/

-#include <QtGui>
+#include <QtWidgets>
 #include "spreadsheet.h"
 #include "spreadsheetdelegate.h"
 #include "spreadsheetitem.h"
--- a/demos/spreadsheet/spreadsheet.pro
+++ b/demos/spreadsheet/spreadsheet.pro
@ -7,8 +7,9 @@ TARGET =
 DEPENDPATH += .
 INCLUDEPATH += .

+QT += widgets
 CONFIG += qt warn_on
-#unix:contains(QT_CONFIG, dbus):QT += dbus
+#unix:contains(QT_CONFIG, dbus):QT += dbus widgets

 # Input
 HEADERS += printview.h spreadsheet.h spreadsheetdelegate.h spreadsheetitem.h
--- a/demos/spreadsheet/spreadsheetdelegate.cpp
+++ b/demos/spreadsheet/spreadsheetdelegate.cpp
@ -40,7 +40,7 @@
 ****************************************************************************/

 #include "spreadsheetdelegate.h"
-#include <QtGui>
+#include <QtWidgets>

 SpreadSheetDelegate::SpreadSheetDelegate(QObject *parent)
        : QItemDelegate(parent) {}
--- a/demos/spreadsheet/spreadsheetitem.h
+++ b/demos/spreadsheet/spreadsheetitem.h
@ -43,7 +43,7 @@
 #define SPREADSHEETITEM_H

 #include <QTableWidgetItem>
-#include <QtGui>
+#include <QtWidgets>
 #include "spreadsheet.h"

 class SpreadSheetItem : public QTableWidgetItem
--- a/demos/sqlbrowser/browser.cpp
+++ b/demos/sqlbrowser/browser.cpp
@ -42,7 +42,7 @@
 #include "browser.h"
 #include "qsqlconnectiondialog.h"

-#include <QtGui>
+#include <QtWidgets>
 #include <QtSql>

 Browser::Browser(QWidget *parent)
--- a/demos/sqlbrowser/connectionwidget.cpp
+++ b/demos/sqlbrowser/connectionwidget.cpp
@ -41,7 +41,7 @@

 #include "connectionwidget.h"

-#include <QtGui>
+#include <QtWidgets>
 #include <QtSql>

 ConnectionWidget::ConnectionWidget(QWidget *parent)
--- a/demos/sqlbrowser/main.cpp
+++ b/demos/sqlbrowser/main.cpp
@ -42,7 +42,7 @@
 #include "browser.h"

 #include <QtCore>
-#include <QtGui>
+#include <QtWidgets>
 #include <QtSql>

 void addConnectionsFromCommandline(const QStringList &args, Browser *browser)
--- a/demos/sqlbrowser/sqlbrowser.pro
+++ b/demos/sqlbrowser/sqlbrowser.pro
@ -1,7 +1,7 @@
 TEMPLATE        = app
 TARGET          = sqlbrowser

-QT              += sql
+QT              += sql widgets

 HEADERS         = browser.h connectionwidget.h qsqlconnectiondialog.h
 SOURCES         = main.cpp browser.cpp connectionwidget.cpp qsqlconnectiondialog.cpp
--- a/demos/sub-attaq/boat_p.h
+++ b/demos/sub-attaq/boat_p.h
@ -58,7 +58,7 @@
 #include "graphicsscene.h"

 // Qt
-#include <QtGui/QKeyEventTransition>
+#include <QtWidgets/QKeyEventTransition>

 static const int MAX_BOMB = 5;

--- a/demos/sub-attaq/graphicsscene.cpp
+++ b/demos/sub-attaq/graphicsscene.cpp
@ -59,12 +59,12 @@
 #include <QtCore/QStateMachine>
 #include <QtCore/QFinalState>
 #include <QtCore/QPauseAnimation>
-#include <QtGui/QAction>
+#include <QtWidgets/QAction>
 #include <QtCore/QDir>
-#include <QtGui/QApplication>
-#include <QtGui/QMessageBox>
-#include <QtGui/QGraphicsView>
-#include <QtGui/QGraphicsSceneMouseEvent>
+#include <QtWidgets/QApplication>
+#include <QtWidgets/QMessageBox>
+#include <QtWidgets/QGraphicsView>
+#include <QtWidgets/QGraphicsSceneMouseEvent>
 #include <QtCore/QXmlStreamReader>

 GraphicsScene::GraphicsScene(int x, int y, int width, int height, Mode mode)
--- a/demos/sub-attaq/graphicsscene.h
+++ b/demos/sub-attaq/graphicsscene.h
@ -43,7 +43,7 @@
 #define __GRAPHICSSCENE__H__

 //Qt
-#include <QtGui/QGraphicsScene>
+#include <QtWidgets/QGraphicsScene>
 #include <QtCore/QSet>
 #include <QtCore/QState>

--- a/demos/sub-attaq/main.cpp
+++ b/demos/sub-attaq/main.cpp
@ -39,7 +39,7 @@
 **
 ****************************************************************************/

-#include <QtGui>
+#include <QtWidgets>

 #include "mainwindow.h"

--- a/demos/sub-attaq/mainwindow.h
+++ b/demos/sub-attaq/mainwindow.h
@ -43,7 +43,7 @@
 #define __MAINWINDOW__H__

 //Qt
-#include <QtGui/QMainWindow>
+#include <QtWidgets/QMainWindow>
 class GraphicsScene;
 QT_BEGIN_NAMESPACE
 class QGraphicsView;
--- a/demos/sub-attaq/pixmapitem.h
+++ b/demos/sub-attaq/pixmapitem.h
@ -46,7 +46,7 @@
 #include "graphicsscene.h"

 //Qt
-#include <QtGui/QGraphicsObject>
+#include <QtWidgets/QGraphicsObject>

 class PixmapItem : public QGraphicsObject
 {
--- a/demos/sub-attaq/progressitem.h
+++ b/demos/sub-attaq/progressitem.h
@ -43,7 +43,7 @@
 #define PROGRESSITEM_H

 //Qt
-#include <QtGui/QGraphicsTextItem>
+#include <QtWidgets/QGraphicsTextItem>

 class ProgressItem : public QGraphicsTextItem
 {
--- a/demos/sub-attaq/states.cpp
+++ b/demos/sub-attaq/states.cpp
@ -50,10 +50,10 @@
 #include "textinformationitem.h"

 //Qt
-#include <QtGui/QMessageBox>
-#include <QtGui/QGraphicsView>
+#include <QtWidgets/QMessageBox>
+#include <QtWidgets/QGraphicsView>
 #include <QtCore/QStateMachine>
-#include <QtGui/QKeyEventTransition>
+#include <QtWidgets/QKeyEventTransition>
 #include <QtCore/QFinalState>

 PlayState::PlayState(GraphicsScene *scene, QState *parent)
--- a/demos/sub-attaq/states.h
+++ b/demos/sub-attaq/states.h
@ -46,7 +46,7 @@
 #include <QtCore/QState>
 #include <QtCore/QSignalTransition>
 #include <QtCore/QPropertyAnimation>
-#include <QtGui/QKeyEventTransition>
+#include <QtWidgets/QKeyEventTransition>
 #include <QtCore/QSet>

 class GraphicsScene;
--- a/demos/sub-attaq/sub-attaq.pro
+++ b/demos/sub-attaq/sub-attaq.pro
@ -1,4 +1,4 @@
-contains(QT_CONFIG, opengl):QT += opengl
+contains(QT_CONFIG, opengl):QT += opengl widgets
 HEADERS += boat.h \
    bomb.h \
    mainwindow.h \
--- a/demos/sub-attaq/submarine.h
+++ b/demos/sub-attaq/submarine.h
@ -43,7 +43,7 @@
 #define __SUBMARINE__H__

 //Qt
-#include <QtGui/QGraphicsTransform>
+#include <QtWidgets/QGraphicsTransform>

 #include "pixmapitem.h"

--- a/demos/sub-attaq/submarine_p.h
+++ b/demos/sub-attaq/submarine_p.h
@ -60,7 +60,7 @@

 //Qt
 #include <QtCore/QPropertyAnimation>
-#include <QtGui/QGraphicsScene>
+#include <QtWidgets/QGraphicsScene>

 //This state is describing when the boat is moving right
 class MovementState : public QAnimationState
--- a/demos/sub-attaq/textinformationitem.h
+++ b/demos/sub-attaq/textinformationitem.h
@ -43,7 +43,7 @@
 #define TEXTINFORMATIONITEM_H

 //Qt
-#include <QtGui/QGraphicsTextItem>
+#include <QtWidgets/QGraphicsTextItem>

 class TextInformationItem : public QGraphicsTextItem
 {
--- a/demos/textedit/textedit.pro
+++ b/demos/textedit/textedit.pro
@ -20,3 +20,4 @@ sources.path = $$[QT_INSTALL_DEMOS]/qtbase/textedit
 INSTALLS += target sources

 symbian: CONFIG += qt_demo
+QT += widgets widgets
--- a/demos/undo/undo.pro
+++ b/demos/undo/undo.pro
@ -16,3 +16,4 @@ sources.path = $$[QT_INSTALL_DEMOS]/qtbase/undo
 INSTALLS += target sources

 symbian: CONFIG += qt_demo
+QT += widgets