2 files changed, 15 insertions, 22 deletions

diff --git a/src/widgets/kernel/qdesktopwidget.cpp b/src/widgets/kernel/qdesktopwidget.cpp
index 67264133ef..6698c13270 100644
--- a/src/widgets/kernel/qdesktopwidget.cpp
+++ b/src/widgets/kernel/qdesktopwidget.cpp
@@ -72,29 +72,22 @@ void QDesktopWidgetPrivate::_q_updateScreens()
     const QList<QScreen *> screenList = QGuiApplication::screens();
     const int targetLength = screenList.length();
     const int oldLength = screens.length();
-    int currentLength = oldLength;
 
     // Add or remove screen widgets as necessary
-    if(currentLength > targetLength) {
-        QDesktopScreenWidget *screen;
-        while (currentLength-- > targetLength) {
-            screen = screens.takeLast();
-            delete screen;
-        }
-    }
-    else if (currentLength < targetLength) {
-        while (currentLength < targetLength) {
-            QScreen *qScreen = screenList.at(currentLength);
-            QDesktopScreenWidget *screenWidget = new QDesktopScreenWidget(currentLength++);
-            screenWidget->setGeometry(qScreen->geometry());
-            QObject::connect(qScreen, SIGNAL(geometryChanged(QRect)),
-                             q, SLOT(_q_updateScreens()), Qt::QueuedConnection);
-            QObject::connect(qScreen, SIGNAL(availableGeometryChanged(QRect)),
-                             q, SLOT(_q_availableGeometryChanged()), Qt::QueuedConnection);
-            QObject::connect(qScreen, SIGNAL(destroyed()),
-                             q, SLOT(_q_updateScreens()), Qt::QueuedConnection);
-            screens.append(screenWidget);
-        }
+    while (screens.size() > targetLength)
+        delete screens.takeLast();
+
+    for (int currentLength = screens.size(); currentLength < targetLength; ++currentLength) {
+        QScreen *qScreen = screenList.at(currentLength);
+        QDesktopScreenWidget *screenWidget = new QDesktopScreenWidget(currentLength);
+        screenWidget->setGeometry(qScreen->geometry());
+        QObject::connect(qScreen, SIGNAL(geometryChanged(QRect)),
+                         q, SLOT(_q_updateScreens()), Qt::QueuedConnection);
+        QObject::connect(qScreen, SIGNAL(availableGeometryChanged(QRect)),
+                         q, SLOT(_q_availableGeometryChanged()), Qt::QueuedConnection);
+        QObject::connect(qScreen, SIGNAL(destroyed()),
+                         q, SLOT(_q_updateScreens()), Qt::QueuedConnection);
+        screens.append(screenWidget);
     }
 
     QRegion virtualGeometry;
diff --git a/src/widgets/kernel/qdesktopwidget_p.h b/src/widgets/kernel/qdesktopwidget_p.h
index 62f4d8ed6f..9cd57e7110 100644
--- a/src/widgets/kernel/qdesktopwidget_p.h
+++ b/src/widgets/kernel/qdesktopwidget_p.h
@@ -65,7 +65,7 @@ class QDesktopWidgetPrivate : public QWidgetPrivate {
     Q_DECLARE_PUBLIC(QDesktopWidget)
 
 public:
-    ~QDesktopWidgetPrivate() {foreach(QDesktopScreenWidget *s, screens) delete s; }
+    ~QDesktopWidgetPrivate() { qDeleteAll(screens); }
     void _q_updateScreens();
     void _q_availableGeometryChanged();