diff options
Diffstat (limited to 'examples/animation')
32 files changed, 44 insertions, 36 deletions
diff --git a/examples/animation/animatedtiles/animatedtiles.pro b/examples/animation/animatedtiles/animatedtiles.pro index 1287d8b3d0..791bbf6a22 100644 --- a/examples/animation/animatedtiles/animatedtiles.pro +++ b/examples/animation/animatedtiles/animatedtiles.pro @@ -11,4 +11,5 @@ symbian { TARGET.UID3 = 0xA000D7D1 CONFIG += qt_example } +QT += widgets maemo5: CONFIG += qt_example diff --git a/examples/animation/animatedtiles/main.cpp b/examples/animation/animatedtiles/main.cpp index 46b5d1ddc5..c59c981cb1 100644 --- a/examples/animation/animatedtiles/main.cpp +++ b/examples/animation/animatedtiles/main.cpp @@ -38,7 +38,7 @@ ** ****************************************************************************/ -#include <QtGui> +#include <QtWidgets> #include <QtCore/qstate.h> class Pixmap : public QObject, public QGraphicsPixmapItem diff --git a/examples/animation/animation.pro b/examples/animation/animation.pro index e5fa7c4a56..b17aa0e0fe 100644 --- a/examples/animation/animation.pro +++ b/examples/animation/animation.pro @@ -14,3 +14,4 @@ target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/animation sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS animation.pro README sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/animation INSTALLS += target sources +QT += widgets diff --git a/examples/animation/appchooser/appchooser.pro b/examples/animation/appchooser/appchooser.pro index 958b1710e3..3969b551e9 100644 --- a/examples/animation/appchooser/appchooser.pro +++ b/examples/animation/appchooser/appchooser.pro @@ -11,4 +11,5 @@ symbian { TARGET.UID3 = 0xA000E3F5 CONFIG += qt_example } +QT += widgets maemo5: CONFIG += qt_example diff --git a/examples/animation/appchooser/main.cpp b/examples/animation/appchooser/main.cpp index 3788533aa8..873054ce5f 100644 --- a/examples/animation/appchooser/main.cpp +++ b/examples/animation/appchooser/main.cpp @@ -39,7 +39,7 @@ ****************************************************************************/ #include <QtCore> -#include <QtGui> +#include <QtWidgets> class Pixmap : public QGraphicsWidget @@ -88,7 +88,7 @@ public: { } - virtual void resizeEvent(QResizeEvent *event) + virtual void resizeEvent(QResizeEvent *) { fitInView(sceneRect(), Qt::KeepAspectRatio); } diff --git a/examples/animation/easing/animation.h b/examples/animation/easing/animation.h index f0aef6560b..5f6c425827 100644 --- a/examples/animation/easing/animation.h +++ b/examples/animation/easing/animation.h @@ -41,7 +41,7 @@ #ifndef ANIMATION_H #define ANIMATION_H -#include <QtGui> +#include <QtWidgets> #include <QtCore/qpropertyanimation.h> diff --git a/examples/animation/easing/easing.pro b/examples/animation/easing/easing.pro index 0d5eaf4386..b26ce30083 100644 --- a/examples/animation/easing/easing.pro +++ b/examples/animation/easing/easing.pro @@ -17,5 +17,6 @@ symbian { TARGET.UID3 = 0xA000E3F6 CONFIG += qt_example } +QT += widgets maemo5: CONFIG += qt_example diff --git a/examples/animation/easing/main.cpp b/examples/animation/easing/main.cpp index 66a6958cf2..0d63a3136e 100644 --- a/examples/animation/easing/main.cpp +++ b/examples/animation/easing/main.cpp @@ -38,7 +38,7 @@ ** ****************************************************************************/ -#include <QtGui> +#include <QtWidgets> #include "window.h" int main(int argc, char **argv) diff --git a/examples/animation/easing/window.h b/examples/animation/easing/window.h index 17899a422e..51fa00d859 100644 --- a/examples/animation/easing/window.h +++ b/examples/animation/easing/window.h @@ -38,7 +38,8 @@ ** ****************************************************************************/ -#include <QtGui> +#include <QtWidgets> + #include "ui_form.h" #include "animation.h" diff --git a/examples/animation/moveblocks/main.cpp b/examples/animation/moveblocks/main.cpp index ca1876f95a..24e5f051d7 100644 --- a/examples/animation/moveblocks/main.cpp +++ b/examples/animation/moveblocks/main.cpp @@ -39,7 +39,7 @@ ****************************************************************************/ #include <QtCore> -#include <QtGui> +#include <QtWidgets> //![15] class StateSwitchEvent: public QEvent diff --git a/examples/animation/moveblocks/moveblocks.pro b/examples/animation/moveblocks/moveblocks.pro index ee60e8fcc0..b82370dff6 100644 --- a/examples/animation/moveblocks/moveblocks.pro +++ b/examples/animation/moveblocks/moveblocks.pro @@ -10,4 +10,5 @@ symbian { TARGET.UID3 = 0xA000E3F7 CONFIG += qt_example } +QT += widgets maemo5: CONFIG += qt_example diff --git a/examples/animation/states/main.cpp b/examples/animation/states/main.cpp index d49aa415a7..f37c2bdbbf 100644 --- a/examples/animation/states/main.cpp +++ b/examples/animation/states/main.cpp @@ -38,7 +38,7 @@ ** ****************************************************************************/ -#include <QtGui> +#include <QtWidgets> class Pixmap : public QGraphicsObject { @@ -69,7 +69,7 @@ public: { } - virtual void resizeEvent(QResizeEvent *event) + virtual void resizeEvent(QResizeEvent *) { fitInView(sceneRect(), Qt::KeepAspectRatio); } diff --git a/examples/animation/states/states.pro b/examples/animation/states/states.pro index 24d6976334..5c0d28163b 100644 --- a/examples/animation/states/states.pro +++ b/examples/animation/states/states.pro @@ -11,4 +11,5 @@ symbian { TARGET.UID3 = 0xA000E3F8 CONFIG += qt_example } +QT += widgets maemo5: CONFIG += qt_example diff --git a/examples/animation/stickman/graphicsview.cpp b/examples/animation/stickman/graphicsview.cpp index 0f7ce5f1c6..0d422ab1d2 100644 --- a/examples/animation/stickman/graphicsview.cpp +++ b/examples/animation/stickman/graphicsview.cpp @@ -42,8 +42,8 @@ #include "stickman.h" #include <QtGui/QKeyEvent> -#include <QtGui/QGraphicsScene> -#include <QtGui/QGraphicsView> +#include <QtWidgets/QGraphicsScene> +#include <QtWidgets/QGraphicsView> GraphicsView::GraphicsView(QWidget *parent) : QGraphicsView(parent), m_editor(0) {} @@ -54,7 +54,7 @@ void GraphicsView::keyPressEvent(QKeyEvent *e) emit keyPressed(Qt::Key(e->key())); } -void GraphicsView::resizeEvent(QResizeEvent *event) +void GraphicsView::resizeEvent(QResizeEvent *) { fitInView(scene()->sceneRect()); } diff --git a/examples/animation/stickman/graphicsview.h b/examples/animation/stickman/graphicsview.h index 400e4a63d4..abd621df43 100644 --- a/examples/animation/stickman/graphicsview.h +++ b/examples/animation/stickman/graphicsview.h @@ -41,7 +41,7 @@ #ifndef GRAPHICSVIEW_H #define GRAPHICSVIEW -#include <QtGui/QGraphicsView> +#include <QtWidgets/QGraphicsView> class MainWindow; class GraphicsView: public QGraphicsView diff --git a/examples/animation/stickman/lifecycle.cpp b/examples/animation/stickman/lifecycle.cpp index 8e9dbe1e8b..791b33eb2e 100644 --- a/examples/animation/stickman/lifecycle.cpp +++ b/examples/animation/stickman/lifecycle.cpp @@ -45,7 +45,7 @@ #include "graphicsview.h" #include <QtCore> -#include <QtGui> +#include <QtWidgets> class KeyPressTransition: public QSignalTransition { diff --git a/examples/animation/stickman/main.cpp b/examples/animation/stickman/main.cpp index 902e572a0e..c5c3eb316b 100644 --- a/examples/animation/stickman/main.cpp +++ b/examples/animation/stickman/main.cpp @@ -46,7 +46,7 @@ #include "rectbutton.h" #include <QtCore> -#include <QtGui> +#include <QtWidgets> int main(int argc, char **argv) { diff --git a/examples/animation/stickman/rectbutton.cpp b/examples/animation/stickman/rectbutton.cpp index d45e8abefe..d1bd9e42d1 100644 --- a/examples/animation/stickman/rectbutton.cpp +++ b/examples/animation/stickman/rectbutton.cpp @@ -51,7 +51,7 @@ RectButton::~RectButton() } -void RectButton::mousePressEvent (QGraphicsSceneMouseEvent *event) +void RectButton::mousePressEvent (QGraphicsSceneMouseEvent *) { emit clicked(); } @@ -63,7 +63,7 @@ QRectF RectButton::boundingRect() const } -void RectButton::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) +void RectButton::paint(QPainter *painter, const QStyleOptionGraphicsItem * /* option */, QWidget * /* widget */) { painter->setBrush(Qt::gray); painter->drawRoundedRect(boundingRect(), 5, 5); diff --git a/examples/animation/stickman/stickman.pro b/examples/animation/stickman/stickman.pro index ba31265055..340a502c90 100644 --- a/examples/animation/stickman/stickman.pro +++ b/examples/animation/stickman/stickman.pro @@ -24,4 +24,5 @@ symbian { TARGET.UID3 = 0xA000E3F9 CONFIG += qt_example } +QT += widgets maemo5: CONFIG += qt_example diff --git a/examples/animation/sub-attaq/boat_p.h b/examples/animation/sub-attaq/boat_p.h index 9022a4ca51..4141671eb0 100644 --- a/examples/animation/sub-attaq/boat_p.h +++ b/examples/animation/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/examples/animation/sub-attaq/graphicsscene.cpp b/examples/animation/sub-attaq/graphicsscene.cpp index f82d441068..d274ca3bde 100644 --- a/examples/animation/sub-attaq/graphicsscene.cpp +++ b/examples/animation/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/examples/animation/sub-attaq/graphicsscene.h b/examples/animation/sub-attaq/graphicsscene.h index e1220a5eb8..198b27101f 100644 --- a/examples/animation/sub-attaq/graphicsscene.h +++ b/examples/animation/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/examples/animation/sub-attaq/main.cpp b/examples/animation/sub-attaq/main.cpp index c8e534e7e7..6fdc47ca20 100644 --- a/examples/animation/sub-attaq/main.cpp +++ b/examples/animation/sub-attaq/main.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include <QtGui> +#include <QtWidgets> #include "mainwindow.h" diff --git a/examples/animation/sub-attaq/mainwindow.h b/examples/animation/sub-attaq/mainwindow.h index 933587a262..0514776b75 100644 --- a/examples/animation/sub-attaq/mainwindow.h +++ b/examples/animation/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/examples/animation/sub-attaq/pixmapitem.h b/examples/animation/sub-attaq/pixmapitem.h index 0a94aab7eb..f6fced9e97 100644 --- a/examples/animation/sub-attaq/pixmapitem.h +++ b/examples/animation/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/examples/animation/sub-attaq/progressitem.h b/examples/animation/sub-attaq/progressitem.h index bcf708c512..9a8a575111 100644 --- a/examples/animation/sub-attaq/progressitem.h +++ b/examples/animation/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/examples/animation/sub-attaq/states.cpp b/examples/animation/sub-attaq/states.cpp index 462e13b90e..db50938016 100644 --- a/examples/animation/sub-attaq/states.cpp +++ b/examples/animation/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/examples/animation/sub-attaq/states.h b/examples/animation/sub-attaq/states.h index cda9603196..4f322cbd57 100644 --- a/examples/animation/sub-attaq/states.h +++ b/examples/animation/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/examples/animation/sub-attaq/sub-attaq.pro b/examples/animation/sub-attaq/sub-attaq.pro index ff3040490c..e994694b54 100644 --- a/examples/animation/sub-attaq/sub-attaq.pro +++ b/examples/animation/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/examples/animation/sub-attaq/submarine.h b/examples/animation/sub-attaq/submarine.h index 0d6087dc26..852b63de36 100644 --- a/examples/animation/sub-attaq/submarine.h +++ b/examples/animation/sub-attaq/submarine.h @@ -43,7 +43,7 @@ #define __SUBMARINE__H__ //Qt -#include <QtGui/QGraphicsTransform> +#include <QtWidgets/QGraphicsTransform> #include "pixmapitem.h" diff --git a/examples/animation/sub-attaq/submarine_p.h b/examples/animation/sub-attaq/submarine_p.h index f0b370d878..eb81c6604b 100644 --- a/examples/animation/sub-attaq/submarine_p.h +++ b/examples/animation/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/examples/animation/sub-attaq/textinformationitem.h b/examples/animation/sub-attaq/textinformationitem.h index 4b5f71969f..1c62c8597e 100644 --- a/examples/animation/sub-attaq/textinformationitem.h +++ b/examples/animation/sub-attaq/textinformationitem.h @@ -43,7 +43,7 @@ #define TEXTINFORMATIONITEM_H //Qt -#include <QtGui/QGraphicsTextItem> +#include <QtWidgets/QGraphicsTextItem> class TextInformationItem : public QGraphicsTextItem { |