diff --git a/applets/pager/plugin/pagermodel.cpp b/applets/pager/plugin/pagermodel.cpp
--- a/applets/pager/plugin/pagermodel.cpp
+++ b/applets/pager/plugin/pagermodel.cpp
@@ -32,8 +32,8 @@
 #include <QDBusConnection>
 #include <QDBusMessage>
 #include <QDBusPendingCall>
-#include <QDesktopWidget>
 #include <QMetaEnum>
+#include <QScreen>
 
 #include <KWindowSystem>
 
@@ -68,8 +68,6 @@
     QMetaObject::Connection virtualDesktopNumberConn;
     QMetaObject::Connection virtualDesktopNamesConn;
 
-    QDesktopWidget *desktopWidget = QApplication::desktop();
-
     QList<WindowModel *> windowModels;
 
 #if HAVE_X11
@@ -118,10 +116,14 @@
     QObject::connect(virtualDesktopInfo, &VirtualDesktopInfo::desktopLayoutRowsChanged,
         q, &PagerModel::layoutRowsChanged);
 
-    QObject::connect(desktopWidget, &QDesktopWidget::screenCountChanged,
-        q, &PagerModel::pagerItemSizeChanged);
-    QObject::connect(desktopWidget, &QDesktopWidget::resized,
-        q, &PagerModel::pagerItemSizeChanged);
+    auto configureScreen = [q](QScreen* screen) {
+        QObject::connect(screen, &QScreen::geometryChanged, q, &PagerModel::pagerItemSizeChanged);
+        q->pagerItemSizeChanged();
+    };
+    for (QScreen* screen : qGuiApp->screens())
+        configureScreen(screen);
+    QObject::connect(qGuiApp, &QGuiApplication::screenAdded, q, configureScreen);
+    QObject::connect(qGuiApp, &QGuiApplication::screenRemoved, q, &PagerModel::pagerItemSizeChanged);
 
 #if HAVE_X11
     QObject::connect(KWindowSystem::self(), &KWindowSystem::stackingOrderChanged, q,
@@ -380,8 +382,9 @@
 
     QRect totalRect;
 
-    for (int i = 0; i < d->desktopWidget->screenCount(); ++i) {
-        totalRect |= d->desktopWidget->screenGeometry(i);
+    const auto screens = QGuiApplication::screens();
+    for (auto screen : screens) {
+        totalRect |= screen->geometry();
     }
 
     return totalRect.size();
diff --git a/containments/desktop/plugins/folder/foldermodel.cpp b/containments/desktop/plugins/folder/foldermodel.cpp
--- a/containments/desktop/plugins/folder/foldermodel.cpp
+++ b/containments/desktop/plugins/folder/foldermodel.cpp
@@ -1637,7 +1637,7 @@
     m_actionCollection.addAction(QStringLiteral("restoreFromTrash"), restoreFromTrash);
     m_actionCollection.addAction(QStringLiteral("emptyTrash"), emptyTrash);
 
-    m_newMenu = new KNewFileMenu(&m_actionCollection, QStringLiteral("newMenu"), QApplication::desktop());
+    m_newMenu = new KNewFileMenu(&m_actionCollection, QStringLiteral("newMenu"), this);
     m_newMenu->setModal(false);
     connect(m_newMenu, &KNewFileMenu::directoryCreated, this, &FolderModel::newFileMenuItemCreated);
     connect(m_newMenu, &KNewFileMenu::fileCreated, this, &FolderModel::newFileMenuItemCreated);
diff --git a/kcms/desktoppaths/globalpaths.cpp b/kcms/desktoppaths/globalpaths.cpp
--- a/kcms/desktoppaths/globalpaths.cpp
+++ b/kcms/desktoppaths/globalpaths.cpp
@@ -44,7 +44,6 @@
 #include <QLabel>
 #include <QLayout>
 #include <QFormLayout>
-#include <QDesktopWidget>
 #include <QApplication>
 #include <QLoggingCategory>
 
diff --git a/kcms/fonts/previewrenderengine.cpp b/kcms/fonts/previewrenderengine.cpp
--- a/kcms/fonts/previewrenderengine.cpp
+++ b/kcms/fonts/previewrenderengine.cpp
@@ -24,8 +24,8 @@
 #include "Fc.h"
 
 #include <QApplication>
-#include <QDesktopWidget>
 #include <QX11Info>
+#include <QScreen>
 
 #include <X11/Xft/Xft.h>
 
@@ -128,7 +128,7 @@
     const quint32 style = qtToFcStyle(font);
     int faceNo = 0;
     
-    double ratio = QApplication::desktop()->screen()->devicePixelRatio();
+    double ratio = QGuiApplication::primaryScreen()->devicePixelRatio();
     double dpi = QX11Info::appDpiY();
     
     int fSize((int)(((font.pointSizeF()*dpi*ratio)/72.0)+0.5));