diff options
78 files changed, 86 insertions, 73 deletions
diff --git a/demos/affine/affine.pro b/demos/affine/affine.pro index a3d6e30ad1..4e4eee8882 100644 --- 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 diff --git a/demos/books/bookdelegate.cpp b/demos/books/bookdelegate.cpp index eb5d95b7b5..0965120d85 100644 --- 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")) diff --git a/demos/books/books.pro b/demos/books/books.pro index 1588288f3e..39c5e1e257 100644 --- 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 diff --git a/demos/books/bookwindow.h b/demos/books/bookwindow.h index 96545d7e8b..21a8d3995b 100644 --- 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" diff --git a/demos/books/main.cpp b/demos/books/main.cpp index 3481c9a2a8..6f72efc938 100644 --- 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[]) { diff --git a/demos/boxes/boxes.pro b/demos/boxes/boxes.pro index d599a3a0ac..930e5aa51d 100644 --- 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 diff --git a/demos/boxes/glbuffers.h b/demos/boxes/glbuffers.h index fb6455b28c..1b4823dcf5 100644 --- 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)) diff --git a/demos/boxes/gltrianglemesh.h b/demos/boxes/gltrianglemesh.h index d0afa35295..68897c849b 100644 --- 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" diff --git a/demos/boxes/main.cpp b/demos/boxes/main.cpp index 568031ed41..67d112ce6f 100644 --- 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 diff --git a/demos/boxes/qtbox.h b/demos/boxes/qtbox.h index 71c1304a60..dd44902190 100644 --- 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" diff --git a/demos/boxes/roundedbox.h b/demos/boxes/roundedbox.h index a19f1a3acc..81227342e3 100644 --- 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" diff --git a/demos/boxes/scene.h b/demos/boxes/scene.h index d1c65268fb..9e105fa052 100644 --- 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" diff --git a/demos/boxes/trackball.h b/demos/boxes/trackball.h index e43b00d7b3..7eb51b1050 100644 --- 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> diff --git a/demos/chip/chip.cpp b/demos/chip/chip.cpp index 6f3b529f16..ae716b6904 100644 --- 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) { diff --git a/demos/chip/chip.h b/demos/chip/chip.h index dca63b71fc..08dfc585f0 100644 --- 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 { diff --git a/demos/chip/chip.pro b/demos/chip/chip.pro index 1e1a7de735..9b186b74a8 100644 --- 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 diff --git a/demos/chip/mainwindow.cpp b/demos/chip/mainwindow.cpp index 825c38823a..8a7e46af06 100644 --- 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) diff --git a/demos/chip/mainwindow.h b/demos/chip/mainwindow.h index 9c8ac03638..c365ad30a3 100644 --- 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) diff --git a/demos/chip/view.cpp b/demos/chip/view.cpp index 49d02ecb52..415ab1ecc8 100644 --- 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 diff --git a/demos/composition/composition.pro b/demos/composition/composition.pro index 59b91126b9..00c500ea3b 100644 --- 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 diff --git a/demos/deform/deform.pro b/demos/deform/deform.pro index 3393b8e83c..d1c8938ad0 100644 --- 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 diff --git a/demos/demos.pro b/demos/demos.pro index 81968fd61d..69ecca80f4 100644 --- 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 diff --git a/demos/embedded/digiflip/digiflip.cpp b/demos/embedded/digiflip/digiflip.cpp index d756f21776..1a450e8e97 100644 --- 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 { diff --git a/demos/embedded/digiflip/digiflip.pro b/demos/embedded/digiflip/digiflip.pro index 7fa06fa90a..acc1d56ce3 100644 --- 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 diff --git a/demos/embedded/embedded.pro b/demos/embedded/embedded.pro index e9a448b1e3..becdfe245f 100644 --- 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 diff --git a/demos/embedded/flickable/flickable.cpp b/demos/embedded/flickable/flickable.cpp index e2d240d64f..ec7e05b5f9 100644 --- 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 { diff --git a/demos/embedded/flickable/flickable.pro b/demos/embedded/flickable/flickable.pro index 6ee744bc63..32b8213e11 100644 --- 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 diff --git a/demos/embedded/flickable/main.cpp b/demos/embedded/flickable/main.cpp index 431a99bfa1..f914fb84cc 100644 --- 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" diff --git a/demos/embedded/flightinfo/flightinfo.cpp b/demos/embedded/flightinfo/flightinfo.cpp index 6f7c039973..76ca154019 100644 --- 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" diff --git a/demos/embedded/flightinfo/flightinfo.pro b/demos/embedded/flightinfo/flightinfo.pro index a33423f543..dfa4ae355f 100644 --- 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 diff --git a/demos/embedded/lightmaps/lightmaps.cpp b/demos/embedded/lightmaps/lightmaps.cpp index 8e64e7370c..62d38a81c8 100644 --- 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> diff --git a/demos/embedded/lightmaps/lightmaps.pro b/demos/embedded/lightmaps/lightmaps.pro index 2751c3a647..b7fa2d660f 100644 --- 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 diff --git a/demos/embedded/lightmaps/mapzoom.cpp b/demos/embedded/lightmaps/mapzoom.cpp index 6cafc59b1d..61da74d629 100644 --- 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" diff --git a/demos/embedded/lightmaps/slippymap.cpp b/demos/embedded/lightmaps/slippymap.cpp index 2c76f748bc..de58732c54 100644 --- 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" diff --git a/demos/embedded/raycasting/raycasting.cpp b/demos/embedded/raycasting/raycasting.cpp index 8ca4f8bf74..220bcf9341 100644 --- 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> diff --git a/demos/embedded/raycasting/raycasting.pro b/demos/embedded/raycasting/raycasting.pro index a4bb1826b9..552ebecf4c 100644 --- 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 diff --git a/demos/embedded/styledemo/styledemo.pro b/demos/embedded/styledemo/styledemo.pro index 60700dd1df..e8a428106c 100644 --- 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 diff --git a/demos/embeddeddialogs/customproxy.cpp b/demos/embeddeddialogs/customproxy.cpp index e56823dfbd..a93112b7b0 100644 --- 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) diff --git a/demos/embeddeddialogs/customproxy.h b/demos/embeddeddialogs/customproxy.h index 67d2152f98..723f0a0a21 100644 --- 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 { diff --git a/demos/embeddeddialogs/embeddeddialog.cpp b/demos/embeddeddialogs/embeddeddialog.cpp index e359afe555..f38fbf0eb5 100644 --- 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) diff --git a/demos/embeddeddialogs/embeddeddialog.h b/demos/embeddeddialogs/embeddeddialog.h index 54263f64e3..1c81575760 100644 --- 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); diff --git a/demos/embeddeddialogs/embeddeddialogs.pro b/demos/embeddeddialogs/embeddeddialogs.pro index 675a9889a2..30cde78751 100644 --- 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 diff --git a/demos/embeddeddialogs/main.cpp b/demos/embeddeddialogs/main.cpp index 01f1ca9c0e..970672e29c 100644 --- 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[]) { diff --git a/demos/gradients/gradients.h b/demos/gradients/gradients.h index bdd5c713ec..d400eea70b 100644 --- a/demos/gradients/gradients.h +++ b/demos/gradients/gradients.h @@ -44,7 +44,7 @@ #include "arthurwidgets.h" -#include <QtGui> +#include <QtWidgets> class HoverPoints; diff --git a/demos/gradients/gradients.pro b/demos/gradients/gradients.pro index ed4120e01c..ff292efba1 100644 --- 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 diff --git a/demos/interview/interview.pro b/demos/interview/interview.pro index a497fbc407..bf39328e99 100644 --- 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 diff --git a/demos/macmainwindow/macmainwindow.h b/demos/macmainwindow/macmainwindow.h index 4c2c638a20..1070981a89 100644 --- 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 diff --git a/demos/macmainwindow/macmainwindow.pro b/demos/macmainwindow/macmainwindow.pro index 435905612a..6773a669d0 100644 --- 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 diff --git a/demos/macmainwindow/main.cpp b/demos/macmainwindow/main.cpp index 0b513f8951..56c26b4645 100644 --- 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 diff --git a/demos/mainwindow/mainwindow.pro b/demos/mainwindow/mainwindow.pro index 6da113d722..bbb7c80a21 100644 --- 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 diff --git a/demos/pathstroke/pathstroke.h b/demos/pathstroke/pathstroke.h index c35c9e8d2b..687ed07fcb 100644 --- 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 { diff --git a/demos/pathstroke/pathstroke.pro b/demos/pathstroke/pathstroke.pro index 9bbf8a6f77..af6482fb48 100644 --- 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 diff --git a/demos/shared/hoverpoints.h b/demos/shared/hoverpoints.h index 9c10632d8d..4b126990a4 100644 --- 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) diff --git a/demos/shared/shared.pro b/demos/shared/shared.pro index 88d7fbedab..78aaaefe48 100644 --- 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\ diff --git a/demos/spreadsheet/main.cpp b/demos/spreadsheet/main.cpp index e197e75c44..73500c8801 100644 --- 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) { diff --git a/demos/spreadsheet/spreadsheet.cpp b/demos/spreadsheet/spreadsheet.cpp index 000c7898bc..2651cdd106 100644 --- 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" diff --git a/demos/spreadsheet/spreadsheet.pro b/demos/spreadsheet/spreadsheet.pro index 7179d98eba..dc079866a3 100644 --- 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 diff --git a/demos/spreadsheet/spreadsheetdelegate.cpp b/demos/spreadsheet/spreadsheetdelegate.cpp index f4aedaa5fc..9628234804 100644 --- 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) {} diff --git a/demos/spreadsheet/spreadsheetitem.h b/demos/spreadsheet/spreadsheetitem.h index 13566a7600..831b970481 100644 --- 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 diff --git a/demos/sqlbrowser/browser.cpp b/demos/sqlbrowser/browser.cpp index 479eaaaaa9..b84e3b980f 100644 --- 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) diff --git a/demos/sqlbrowser/connectionwidget.cpp b/demos/sqlbrowser/connectionwidget.cpp index 6d213f3036..9e6b19bced 100644 --- 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) diff --git a/demos/sqlbrowser/main.cpp b/demos/sqlbrowser/main.cpp index 875dd4815a..e9f93798ca 100644 --- 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) diff --git a/demos/sqlbrowser/sqlbrowser.pro b/demos/sqlbrowser/sqlbrowser.pro index dc6214622c..b2530b07fc 100644 --- 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 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 { diff --git a/demos/textedit/textedit.pro b/demos/textedit/textedit.pro index b37ac3036a..02561f82ba 100644 --- 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 diff --git a/demos/undo/undo.pro b/demos/undo/undo.pro index 84f1d7b326..89f06bdfc7 100644 --- 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 |