Designer: remove usage of deprecated API

Change-Id: I6ca4d3ece78e87123e57865f446d9f14a1459c0a
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>

4 files changed, 11 insertions, 11 deletions

diff --git a/src/designer/src/lib/shared/actioneditor.cpp b/src/designer/src/lib/shared/actioneditor.cpp
index 954cf4019..66f3c46e2 100644
--- a/src/designer/src/lib/shared/actioneditor.cpp
+++ b/src/designer/src/lib/shared/actioneditor.cpp
@@ -469,7 +469,7 @@ void ActionEditor::slotNewAction()
 
 static inline bool isSameIcon(const QIcon &i1, const QIcon &i2)
 {
-    return i1.serialNumber() == i2.serialNumber();
+    return i1.cacheKey() == i2.cacheKey();
 }
 
 // return a FormWindow command to apply an icon or a reset command in case it
diff --git a/src/designer/src/lib/shared/connectionedit.cpp b/src/designer/src/lib/shared/connectionedit.cpp
index cb6ae00d4..e4d56f35e 100644
--- a/src/designer/src/lib/shared/connectionedit.cpp
+++ b/src/designer/src/lib/shared/connectionedit.cpp
@@ -738,18 +738,18 @@ QRegion Connection::region() const
     QRegion result;
 
     for (int i = 0; i < m_knee_list.size() - 1; ++i)
-        result = result.unite(lineRect(m_knee_list.at(i), m_knee_list.at(i + 1)));
+        result = result.united(lineRect(m_knee_list.at(i), m_knee_list.at(i + 1)));
 
     if (!m_arrow_head.isEmpty()) {
         QRect r = m_arrow_head.boundingRect().toRect();
         r = expand(r, 1);
-        result = result.unite(r);
+        result = result.united(r);
     } else if (ground()) {
-        result = result.unite(groundRect());
+        result = result.united(groundRect());
     }
 
-    result = result.unite(labelRect(EndPoint::Source));
-    result = result.unite(labelRect(EndPoint::Target));
+    result = result.united(labelRect(EndPoint::Source));
+    result = result.united(labelRect(EndPoint::Target));
 
     return result;
 }
diff --git a/src/designer/src/lib/shared/iconselector.cpp b/src/designer/src/lib/shared/iconselector.cpp
index caeba7944..e38213aba 100644
--- a/src/designer/src/lib/shared/iconselector.cpp
+++ b/src/designer/src/lib/shared/iconselector.cpp
@@ -625,7 +625,7 @@ void IconThemeEditor::updatePreview(const QString &t)
     // Update preview label with icon.
     if (t.isEmpty() || !QIcon::hasThemeIcon(t)) { // Empty
         const QPixmap *currentPixmap = d->m_themeLabel->pixmap();
-        if (currentPixmap == 0 || currentPixmap->serialNumber() != d->m_emptyPixmap.serialNumber())
+        if (currentPixmap == 0 || currentPixmap->cacheKey() != d->m_emptyPixmap.cacheKey())
             d->m_themeLabel->setPixmap(d->m_emptyPixmap);
     } else {
         const QIcon icon = QIcon::fromTheme(t);
diff --git a/src/designer/src/lib/shared/spacer_widget.cpp b/src/designer/src/lib/shared/spacer_widget.cpp
index 899d8054e..2ab7d4202 100644
--- a/src/designer/src/lib/shared/spacer_widget.cpp
+++ b/src/designer/src/lib/shared/spacer_widget.cpp
@@ -195,13 +195,13 @@ void Spacer::updateMask()
         if (m_orientation == Qt::Horizontal) {
             const int amplitude = qMin(3, h / 3);
             const int base = h / 2;
-            r = r.subtract(QRect(1, 0, w - 2, base - amplitude));
-            r = r.subtract(QRect(1, base + amplitude, w - 2, h - base - amplitude));
+            r = r.subtracted(QRect(1, 0, w - 2, base - amplitude));
+            r = r.subtracted(QRect(1, base + amplitude, w - 2, h - base - amplitude));
         } else {
             const int amplitude = qMin(3, w / 3);
             const int base = w / 2;
-            r = r.subtract(QRect(0, 1, base - amplitude, h - 2));
-            r = r.subtract(QRect(base + amplitude, 1, w - base - amplitude, h - 2));
+            r = r.subtracted(QRect(0, 1, base - amplitude, h - 2));
+            r = r.subtracted(QRect(base + amplitude, 1, w - base - amplitude, h - 2));
         }
     }
     setMask(r);