Revert "Avoid calling potentially pure virtual method"

This reverts commit 2d34ed2e655d79bed95859f1d32c2abfacbfb6f1.

This change was only needed in Qt 5.4

Change-Id: Ica636da9a3deba68abbfda12e5ea72b296d9ad64
Reviewed-by: Dmitry Shachnev <mitya57@gmail.com>
Reviewed-by: Alan Alpert <aalpert@blackberry.com>

1 files changed, 18 insertions, 9 deletions

diff --git a/src/quick/items/qquickscreen.cpp b/src/quick/items/qquickscreen.cpp
index 3bf7229b33..5bd6430f2d 100644
--- a/src/quick/items/qquickscreen.cpp
+++ b/src/quick/items/qquickscreen.cpp
@@ -351,15 +351,24 @@ void QQuickScreenAttached::screenChanged(QScreen *screen)
             emit orientationUpdateMaskChanged();
         }
 
-        emit widthChanged();
-        emit heightChanged();
-        emit nameChanged();
-        emit orientationChanged();
-        emit primaryOrientationChanged();
-        emit desktopGeometryChanged();
-        emit logicalPixelDensityChanged();
-        emit pixelDensityChanged();
-        emit devicePixelRatioChanged();
+        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();
 
         connect(screen, SIGNAL(geometryChanged(QRect)),
                 this, SIGNAL(widthChanged()));