Merge remote-tracking branch 'origin/5.4' into 5.5

Change-Id: Ie8ea118ed0a1a9a1c3d81e1e34d85c03c695c9a4

1 files changed, 9 insertions, 18 deletions

diff --git a/src/quick/items/qquickscreen.cpp b/src/quick/items/qquickscreen.cpp
index 5bd6430f2d..3bf7229b33 100644
--- a/src/quick/items/qquickscreen.cpp
+++ b/src/quick/items/qquickscreen.cpp
@@ -351,24 +351,15 @@ void QQuickScreenAttached::screenChanged(QScreen *screen)
             emit orientationUpdateMaskChanged();
         }
 
-        if (!oldScreen || screen->size() != oldScreen->size()) {
-            emit widthChanged();
-            emit heightChanged();
-        }
-        if (!oldScreen || screen->name() != oldScreen->name())
-            emit nameChanged();
-        if (!oldScreen || screen->orientation() != oldScreen->orientation())
-            emit orientationChanged();
-        if (!oldScreen || screen->primaryOrientation() != oldScreen->primaryOrientation())
-            emit primaryOrientationChanged();
-        if (!oldScreen || screen->availableVirtualGeometry() != oldScreen->availableVirtualGeometry())
-            emit desktopGeometryChanged();
-        if (!oldScreen || screen->logicalDotsPerInch() != oldScreen->logicalDotsPerInch())
-            emit logicalPixelDensityChanged();
-        if (!oldScreen || screen->physicalDotsPerInch() != oldScreen->physicalDotsPerInch())
-            emit pixelDensityChanged();
-        if (!oldScreen || screen->devicePixelRatio() != oldScreen->devicePixelRatio())
-            emit devicePixelRatioChanged();
+        emit widthChanged();
+        emit heightChanged();
+        emit nameChanged();
+        emit orientationChanged();
+        emit primaryOrientationChanged();
+        emit desktopGeometryChanged();
+        emit logicalPixelDensityChanged();
+        emit pixelDensityChanged();
+        emit devicePixelRatioChanged();
 
         connect(screen, SIGNAL(geometryChanged(QRect)),
                 this, SIGNAL(widthChanged()));