diff options
Diffstat (limited to 'demos/sub-attaq')
-rw-r--r-- | demos/sub-attaq/boat_p.h | 2 | ||||
-rw-r--r-- | demos/sub-attaq/graphicsscene.cpp | 10 | ||||
-rw-r--r-- | demos/sub-attaq/graphicsscene.h | 2 | ||||
-rw-r--r-- | demos/sub-attaq/main.cpp | 2 | ||||
-rw-r--r-- | demos/sub-attaq/mainwindow.h | 2 | ||||
-rw-r--r-- | demos/sub-attaq/pixmapitem.h | 2 | ||||
-rw-r--r-- | demos/sub-attaq/progressitem.h | 2 | ||||
-rw-r--r-- | demos/sub-attaq/states.cpp | 6 | ||||
-rw-r--r-- | demos/sub-attaq/states.h | 2 | ||||
-rw-r--r-- | demos/sub-attaq/sub-attaq.pro | 2 | ||||
-rw-r--r-- | demos/sub-attaq/submarine.h | 2 | ||||
-rw-r--r-- | demos/sub-attaq/submarine_p.h | 2 | ||||
-rw-r--r-- | demos/sub-attaq/textinformationitem.h | 2 |
13 files changed, 19 insertions, 19 deletions
diff --git a/demos/sub-attaq/boat_p.h b/demos/sub-attaq/boat_p.h index 010dd0a6df..d64ad109a7 100644 --- 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; diff --git a/demos/sub-attaq/graphicsscene.cpp b/demos/sub-attaq/graphicsscene.cpp index d01c94f8eb..2b7455c03a 100644 --- 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) diff --git a/demos/sub-attaq/graphicsscene.h b/demos/sub-attaq/graphicsscene.h index 215ee71262..002de29bab 100644 --- 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> diff --git a/demos/sub-attaq/main.cpp b/demos/sub-attaq/main.cpp index 54f11e6a5f..4da920445b 100644 --- a/demos/sub-attaq/main.cpp +++ b/demos/sub-attaq/main.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include <QtGui> +#include <QtWidgets> #include "mainwindow.h" diff --git a/demos/sub-attaq/mainwindow.h b/demos/sub-attaq/mainwindow.h index 532a39a265..56311dd94e 100644 --- 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; diff --git a/demos/sub-attaq/pixmapitem.h b/demos/sub-attaq/pixmapitem.h index 8b615e7f79..1bab23e6e9 100644 --- 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 { diff --git a/demos/sub-attaq/progressitem.h b/demos/sub-attaq/progressitem.h index d4778cbdc1..e1bb1d4db9 100644 --- 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 { diff --git a/demos/sub-attaq/states.cpp b/demos/sub-attaq/states.cpp index e939641524..a54b232a0f 100644 --- 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) diff --git a/demos/sub-attaq/states.h b/demos/sub-attaq/states.h index 3a3c516871..f85a481b71 100644 --- 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; diff --git a/demos/sub-attaq/sub-attaq.pro b/demos/sub-attaq/sub-attaq.pro index 5575f5e65f..7b57baf19b 100644 --- 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 \ diff --git a/demos/sub-attaq/submarine.h b/demos/sub-attaq/submarine.h index 8bdd320e21..d1b5a5ed80 100644 --- 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" diff --git a/demos/sub-attaq/submarine_p.h b/demos/sub-attaq/submarine_p.h index 59b7c1db7b..a7bacd1fcf 100644 --- 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 diff --git a/demos/sub-attaq/textinformationitem.h b/demos/sub-attaq/textinformationitem.h index 5a9b52cf1d..db557fdd9d 100644 --- 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 { |