diff options
-rw-r--r-- | src/plugins/platforms/eglfs/qeglfswindow.h | 2 | ||||
-rw-r--r-- | src/plugins/platforms/fontdatabases/basicunix/qbasicunixfontdatabase.cpp | 2 | ||||
-rw-r--r-- | src/plugins/platforms/minimal/qminimalwindowsurface.cpp | 4 | ||||
-rw-r--r-- | src/plugins/platforms/openkode/qopenkodewindow.cpp | 2 | ||||
-rw-r--r-- | src/plugins/platforms/vnc/qvncserver.cpp | 2 | ||||
-rw-r--r-- | src/plugins/platforms/wayland/qwaylanddisplay.cpp | 2 | ||||
-rw-r--r-- | src/plugins/platforms/xcb/qdri2context.cpp | 2 | ||||
-rw-r--r-- | src/uitools/quiloader.cpp | 24 | ||||
-rw-r--r-- | tools/uilib/formbuilder.cpp | 1 | ||||
-rw-r--r-- | tools/uilib/formbuilderextra.cpp | 6 | ||||
-rw-r--r-- | tools/uilib/formscriptrunner.cpp | 2 | ||||
-rw-r--r-- | tools/uilib/properties.cpp | 6 | ||||
-rw-r--r-- | tools/uilib/resourcebuilder.cpp | 2 |
13 files changed, 29 insertions, 28 deletions
diff --git a/src/plugins/platforms/eglfs/qeglfswindow.h b/src/plugins/platforms/eglfs/qeglfswindow.h index f125eab3c1..66079edacb 100644 --- a/src/plugins/platforms/eglfs/qeglfswindow.h +++ b/src/plugins/platforms/eglfs/qeglfswindow.h @@ -46,7 +46,7 @@ #include "qeglfsscreen.h" #include <QPlatformWindow> -#include <QtGui/QWidget> +#include <QtWidgets/QWidget> QT_BEGIN_NAMESPACE diff --git a/src/plugins/platforms/fontdatabases/basicunix/qbasicunixfontdatabase.cpp b/src/plugins/platforms/fontdatabases/basicunix/qbasicunixfontdatabase.cpp index 895f8af58e..c87dc497b4 100644 --- a/src/plugins/platforms/fontdatabases/basicunix/qbasicunixfontdatabase.cpp +++ b/src/plugins/platforms/fontdatabases/basicunix/qbasicunixfontdatabase.cpp @@ -41,7 +41,7 @@ #include "qbasicunixfontdatabase.h" -#include <QtGui/private/qapplication_p.h> +#include <QtGui/private/qguiapplication_p.h> #include <QtGui/QPlatformScreen> #include <QtCore/QFile> diff --git a/src/plugins/platforms/minimal/qminimalwindowsurface.cpp b/src/plugins/platforms/minimal/qminimalwindowsurface.cpp index 8e15da930f..b3f7532e37 100644 --- a/src/plugins/platforms/minimal/qminimalwindowsurface.cpp +++ b/src/plugins/platforms/minimal/qminimalwindowsurface.cpp @@ -42,7 +42,7 @@ #include "qminimalwindowsurface.h" #include <QtCore/qdebug.h> -#include <QtGui/private/qapplication_p.h> +#include <private/qguiapplication_p.h> QT_BEGIN_NAMESPACE @@ -78,7 +78,7 @@ void QMinimalWindowSurface::resize(const QSize &size) { //qDebug() << "QMinimalWindowSurface::setGeometry:" << (long)this << rect; QWindowSurface::resize(size); - QImage::Format format = QApplicationPrivate::platformIntegration()->screens().first()->format(); + QImage::Format format = QGuiApplicationPrivate::platformIntegration()->screens().first()->format(); if (mImage.size() != size) mImage = QImage(size, format); } diff --git a/src/plugins/platforms/openkode/qopenkodewindow.cpp b/src/plugins/platforms/openkode/qopenkodewindow.cpp index d34dff8a34..ef54ee63b9 100644 --- a/src/plugins/platforms/openkode/qopenkodewindow.cpp +++ b/src/plugins/platforms/openkode/qopenkodewindow.cpp @@ -53,7 +53,7 @@ #include <EGL/egl.h> -#include <QtGui/qwidget.h> +#include <QtWidgets/qwidget.h> #include <QtGui/private/qwidget_p.h> #include <QtGui/private/qapplication_p.h> diff --git a/src/plugins/platforms/vnc/qvncserver.cpp b/src/plugins/platforms/vnc/qvncserver.cpp index be2de7c007..38dea35bff 100644 --- a/src/plugins/platforms/vnc/qvncserver.cpp +++ b/src/plugins/platforms/vnc/qvncserver.cpp @@ -43,7 +43,7 @@ #include <QtCore/qtimer.h> #include <QtCore/qregexp.h> -#include <QtGui/qwidget.h> +#include <QtWidgets/qwidget.h> #include <QtGui/qpolygon.h> #include <QtGui/qpainter.h> diff --git a/src/plugins/platforms/wayland/qwaylanddisplay.cpp b/src/plugins/platforms/wayland/qwaylanddisplay.cpp index 876b46ae9a..3e8039fd9f 100644 --- a/src/plugins/platforms/wayland/qwaylanddisplay.cpp +++ b/src/plugins/platforms/wayland/qwaylanddisplay.cpp @@ -51,7 +51,7 @@ #endif #include <QtCore/QAbstractEventDispatcher> -#include <QtGui/QApplication> +#include <QtWidgets/QApplication> #include <unistd.h> #include <fcntl.h> diff --git a/src/plugins/platforms/xcb/qdri2context.cpp b/src/plugins/platforms/xcb/qdri2context.cpp index e208769336..8d436f1735 100644 --- a/src/plugins/platforms/xcb/qdri2context.cpp +++ b/src/plugins/platforms/xcb/qdri2context.cpp @@ -45,7 +45,7 @@ #include "qxcbconnection.h" #include <QtCore/QDebug> -#include <QtGui/QWidget> +#include <QtWidgets/QWidget> #include <xcb/dri2.h> #include <xcb/xfixes.h> diff --git a/src/uitools/quiloader.cpp b/src/uitools/quiloader.cpp index 13ee48aa45..9d5a9d3107 100644 --- a/src/uitools/quiloader.cpp +++ b/src/uitools/quiloader.cpp @@ -50,21 +50,21 @@ #include <ui4_p.h> #include <QtCore/qdebug.h> -#include <QtGui/QAction> -#include <QtGui/QActionGroup> -#include <QtGui/QApplication> +#include <QtWidgets/QAction> +#include <QtWidgets/QActionGroup> +#include <QtWidgets/QApplication> #include <QtCore/QDir> #include <QtCore/QLibraryInfo> -#include <QtGui/QLayout> -#include <QtGui/QWidget> +#include <QtWidgets/QLayout> +#include <QtWidgets/QWidget> #include <QtCore/QMap> -#include <QtGui/QTabWidget> -#include <QtGui/QTreeWidget> -#include <QtGui/QListWidget> -#include <QtGui/QTableWidget> -#include <QtGui/QToolBox> -#include <QtGui/QComboBox> -#include <QtGui/QFontComboBox> +#include <QtWidgets/QTabWidget> +#include <QtWidgets/QTreeWidget> +#include <QtWidgets/QListWidget> +#include <QtWidgets/QTableWidget> +#include <QtWidgets/QToolBox> +#include <QtWidgets/QComboBox> +#include <QtWidgets/QFontComboBox> QT_BEGIN_NAMESPACE diff --git a/tools/uilib/formbuilder.cpp b/tools/uilib/formbuilder.cpp index b997cc9bc0..ee5452561f 100644 --- a/tools/uilib/formbuilder.cpp +++ b/tools/uilib/formbuilder.cpp @@ -45,6 +45,7 @@ #include "ui4_p.h" #include <QtGui/QtGui> +#include <QtWidgets/QtWidgets> #include <QtCore/QCoreApplication> QT_BEGIN_NAMESPACE diff --git a/tools/uilib/formbuilderextra.cpp b/tools/uilib/formbuilderextra.cpp index ecc62886b9..75118a1a8b 100644 --- a/tools/uilib/formbuilderextra.cpp +++ b/tools/uilib/formbuilderextra.cpp @@ -45,9 +45,9 @@ #include "textbuilder_p.h" #include "ui4_p.h" -#include <QtGui/QLabel> -#include <QtGui/QBoxLayout> -#include <QtGui/QGridLayout> +#include <QtWidgets/QLabel> +#include <QtWidgets/QBoxLayout> +#include <QtWidgets/QGridLayout> #include <QtCore/QVariant> #include <QtCore/qdebug.h> diff --git a/tools/uilib/formscriptrunner.cpp b/tools/uilib/formscriptrunner.cpp index e349f6b318..fdc4201aec 100644 --- a/tools/uilib/formscriptrunner.cpp +++ b/tools/uilib/formscriptrunner.cpp @@ -44,7 +44,7 @@ #include "ui4_p.h" #include <QtScript/QScriptEngine> -#include <QtGui/QWidget> +#include <QtWidgets/QWidget> #include <QtCore/QDebug> #include <QtCore/QCoreApplication> diff --git a/tools/uilib/properties.cpp b/tools/uilib/properties.cpp index 67f4d11d22..9bf530b84c 100644 --- a/tools/uilib/properties.cpp +++ b/tools/uilib/properties.cpp @@ -49,11 +49,11 @@ #include <QtCore/QUrl> #include <QtCore/qdebug.h> -#include <QtGui/QIcon> +#include <QtWidgets/QIcon> #include <QtGui/QPixmap> #include <QtGui/QFont> -#include <QtGui/QFrame> -#include <QtGui/QAbstractScrollArea> +#include <QtWidgets/QFrame> +#include <QtWidgets/QAbstractScrollArea> QT_BEGIN_NAMESPACE diff --git a/tools/uilib/resourcebuilder.cpp b/tools/uilib/resourcebuilder.cpp index 0ea5d4cf75..3d59ef2c23 100644 --- a/tools/uilib/resourcebuilder.cpp +++ b/tools/uilib/resourcebuilder.cpp @@ -46,7 +46,7 @@ #include <QtCore/QDir> #include <QtCore/QDebug> #include <QtGui/QPixmap> -#include <QtGui/QIcon> +#include <QtWidgets/QIcon> QT_BEGIN_NAMESPACE |