diff options
Diffstat (limited to 'tests/auto/widgets/widgets')
-rw-r--r-- | tests/auto/widgets/widgets/qmdiarea/tst_qmdiarea.cpp | 1 | ||||
-rw-r--r-- | tests/auto/widgets/widgets/qmenu/tst_qmenu.cpp | 1 | ||||
-rw-r--r-- | tests/auto/widgets/widgets/qopenglwidget/tst_qopenglwidget.cpp | 5 |
3 files changed, 2 insertions, 5 deletions
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())); |