Fix compile warnings from deprecated QBitmap conversion

Simplify code a bit at the same time.

Change-Id: If09cf8dcb742e814408ee4145c43636d7f8d6142
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>

1 files changed, 3 insertions, 9 deletions

diff --git a/src/shared/deviceskin/deviceskin.cpp b/src/shared/deviceskin/deviceskin.cpp
index 6a0e6c9df..3d936cccd 100644
--- a/src/shared/deviceskin/deviceskin.cpp
+++ b/src/shared/deviceskin/deviceskin.cpp
@@ -784,15 +784,9 @@ CursorWindow::CursorWindow(const QImage &img, QPoint hot, QWidget* sk)
     QPixmap p;
     p = QPixmap::fromImage(img);
     if (!p.mask()) {
-        if (img.hasAlphaChannel()) {
-            QBitmap bm;
-            bm = QPixmap::fromImage(img.createAlphaMask());
-            p.setMask(bm);
-        } else {
-            QBitmap bm;
-            bm = QPixmap::fromImage(img.createHeuristicMask());
-            p.setMask(bm);
-        }
+        QBitmap bm = img.hasAlphaChannel() ? QBitmap::fromImage(img.createAlphaMask())
+                                           : QBitmap::fromImage(img.createHeuristicMask());
+        p.setMask(bm);
     }
     QPalette palette;
     palette.setBrush(backgroundRole(), QBrush(p));