diff options
Diffstat (limited to 'tests/auto')
12 files changed, 3 insertions, 15 deletions
diff --git a/tests/auto/gui/image/qpixmap/tst_qpixmap.cpp b/tests/auto/gui/image/qpixmap/tst_qpixmap.cpp index 87d513bacb..24f10e559c 100644 --- a/tests/auto/gui/image/qpixmap/tst_qpixmap.cpp +++ b/tests/auto/gui/image/qpixmap/tst_qpixmap.cpp @@ -33,7 +33,6 @@ #include <qimage.h> #include <qimagereader.h> #ifndef QT_NO_WIDGETS -#include <qdesktopwidget.h> #include <qsplashscreen.h> #endif #include <qpaintengine.h> diff --git a/tests/auto/other/languagechange/tst_languagechange.cpp b/tests/auto/other/languagechange/tst_languagechange.cpp index fc3d0f1c06..632039ec5a 100644 --- a/tests/auto/other/languagechange/tst_languagechange.cpp +++ b/tests/auto/other/languagechange/tst_languagechange.cpp @@ -41,7 +41,6 @@ #include <QtWidgets/QColorDialog> #include <QtWidgets/QDialogButtonBox> #include <QtWidgets/QFileDialog> -#include <QtWidgets/QDesktopWidget> class tst_languageChange : public QObject { diff --git a/tests/auto/widgets/dialogs/qdialog/tst_qdialog.cpp b/tests/auto/widgets/dialogs/qdialog/tst_qdialog.cpp index d469b0f9bd..91d0c07efd 100644 --- a/tests/auto/widgets/dialogs/qdialog/tst_qdialog.cpp +++ b/tests/auto/widgets/dialogs/qdialog/tst_qdialog.cpp @@ -37,7 +37,6 @@ #include <qstyle.h> #include <QVBoxLayout> #include <QSizeGrip> -#include <QDesktopWidget> #include <QGraphicsProxyWidget> #include <QGraphicsView> #include <QWindow> diff --git a/tests/auto/widgets/effects/qgraphicseffect/tst_qgraphicseffect.cpp b/tests/auto/widgets/effects/qgraphicseffect/tst_qgraphicseffect.cpp index 19288d07a7..38181c8af0 100644 --- a/tests/auto/widgets/effects/qgraphicseffect/tst_qgraphicseffect.cpp +++ b/tests/auto/widgets/effects/qgraphicseffect/tst_qgraphicseffect.cpp @@ -28,7 +28,6 @@ #include <QtTest/QtTestWidgets> -#include <QtWidgets/qdesktopwidget.h> #include <QtWidgets/qgraphicseffect.h> #include <QtWidgets/qgraphicsview.h> #include <QtWidgets/qgraphicsscene.h> diff --git a/tests/auto/widgets/graphicsview/qgraphicsitem/tst_qgraphicsitem.cpp b/tests/auto/widgets/graphicsview/qgraphicsitem/tst_qgraphicsitem.cpp index e7a79d017b..9ae127dbe0 100644 --- a/tests/auto/widgets/graphicsview/qgraphicsitem/tst_qgraphicsitem.cpp +++ b/tests/auto/widgets/graphicsview/qgraphicsitem/tst_qgraphicsitem.cpp @@ -38,7 +38,6 @@ #include <QAbstractTextDocumentLayout> #include <QBitmap> #include <QCursor> -#include <QDesktopWidget> #include <QScreen> #include <QLabel> #include <QDial> diff --git a/tests/auto/widgets/itemviews/qheaderview/tst_qheaderview.cpp b/tests/auto/widgets/itemviews/qheaderview/tst_qheaderview.cpp index 1553b6e982..afb1b18af0 100644 --- a/tests/auto/widgets/itemviews/qheaderview/tst_qheaderview.cpp +++ b/tests/auto/widgets/itemviews/qheaderview/tst_qheaderview.cpp @@ -27,7 +27,6 @@ ** ****************************************************************************/ -#include <QDesktopWidget> #include <QHeaderView> #include <QProxyStyle> #include <QSignalSpy> diff --git a/tests/auto/widgets/itemviews/qtreeview/tst_qtreeview.cpp b/tests/auto/widgets/itemviews/qtreeview/tst_qtreeview.cpp index f85b885b34..531d1e823a 100644 --- a/tests/auto/widgets/itemviews/qtreeview/tst_qtreeview.cpp +++ b/tests/auto/widgets/itemviews/qtreeview/tst_qtreeview.cpp @@ -28,7 +28,6 @@ #include "../../../../shared/fakedirmodel.h" -#include <QDesktopWidget> #include <QHeaderView> #include <QLabel> #include <QLineEdit> diff --git a/tests/auto/widgets/kernel/qdesktopwidget/.gitignore b/tests/auto/widgets/kernel/qdesktopwidget/.gitignore deleted file mode 100644 index d6f7cc7ca9..0000000000 --- a/tests/auto/widgets/kernel/qdesktopwidget/.gitignore +++ /dev/null @@ -1 +0,0 @@ -tst_qdesktopwidget diff --git a/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp b/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp index 873d0460ff..b05d6cd96e 100644 --- a/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp +++ b/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp @@ -44,7 +44,6 @@ #include <qstyle.h> #include <qwidget.h> #include <qstylefactory.h> -#include <qdesktopwidget.h> #include <private/qwidget_p.h> #include <private/qwidgetrepaintmanager_p.h> #include <private/qapplication_p.h> @@ -9170,7 +9169,7 @@ void tst_QWidget::translucentWidget() QPixmap widgetSnapshot; #ifdef Q_OS_WIN - QWidget *desktopWidget = QApplication::desktop()->screen(0); + QWidget *desktopWidget = QApplication::desktop(); widgetSnapshot = grabWindow(desktopWidget->windowHandle(), labelPos.x(), labelPos.y(), label.width(), label.height()); #else widgetSnapshot = label.grab(QRect(QPoint(0, 0), label.size())); diff --git a/tests/auto/widgets/widgets/qmdiarea/tst_qmdiarea.cpp b/tests/auto/widgets/widgets/qmdiarea/tst_qmdiarea.cpp index f8a91e6ec6..7899f1f523 100644 --- a/tests/auto/widgets/widgets/qmdiarea/tst_qmdiarea.cpp +++ b/tests/auto/widgets/widgets/qmdiarea/tst_qmdiarea.cpp @@ -40,7 +40,6 @@ #include <QStyleOption> #include <QVBoxLayout> #include <QLineEdit> -#include <QDesktopWidget> #include <QDockWidget> #include <QScrollBar> #include <QTextEdit> diff --git a/tests/auto/widgets/widgets/qmenu/tst_qmenu.cpp b/tests/auto/widgets/widgets/qmenu/tst_qmenu.cpp index 8ce0ea2184..783476cf67 100644 --- a/tests/auto/widgets/widgets/qmenu/tst_qmenu.cpp +++ b/tests/auto/widgets/widgets/qmenu/tst_qmenu.cpp @@ -38,7 +38,6 @@ #include <QStatusBar> #include <QListWidget> #include <QWidgetAction> -#include <QDesktopWidget> #include <QScreen> #include <QSpinBox> #include <qdialog.h> diff --git a/tests/auto/widgets/widgets/qopenglwidget/tst_qopenglwidget.cpp b/tests/auto/widgets/widgets/qopenglwidget/tst_qopenglwidget.cpp index cb4fc201f6..ccd8d0ec05 100644 --- a/tests/auto/widgets/widgets/qopenglwidget/tst_qopenglwidget.cpp +++ b/tests/auto/widgets/widgets/qopenglwidget/tst_qopenglwidget.cpp @@ -31,7 +31,6 @@ #include <QtGui/QPainter> #include <QtGui/QScreen> #include <QtGui/QStaticText> -#include <QtWidgets/QDesktopWidget> #include <QtWidgets/QGraphicsView> #include <QtWidgets/QGraphicsScene> #include <QtWidgets/QGraphicsRectItem> @@ -504,8 +503,8 @@ static QPixmap grabWidgetWithoutRepaint(const QWidget *widget, QRect clipArea) // because GDI functions can't grab OpenGL layer content. // Instead the whole screen should be captured, with an adjusted clip area, which contains // the final composited content. - QDesktopWidget *desktopWidget = QApplication::desktop(); - const QWidget *mainScreenWidget = desktopWidget->screen(); + QWidget *desktopWidget = QApplication::desktop(QGuiApplication::primaryScreen()); + const QWidget *mainScreenWidget = desktopWidget; targetWidget = mainScreenWidget; clipArea = QRect(widget->mapToGlobal(clipArea.topLeft()), widget->mapToGlobal(clipArea.bottomRight())); |