1 files changed, 40 insertions, 2 deletions
diff --git a/tests/auto/gui/kernel/qpalette/tst_qpalette.cpp b/tests/auto/gui/kernel/qpalette/tst_qpalette.cpp
index a0ac1b3631..234793a7cf 100644
--- a/tests/auto/gui/kernel/qpalette/tst_qpalette.cpp
+++ b/tests/auto/gui/kernel/qpalette/tst_qpalette.cpp
@@ -37,6 +37,7 @@ class tst_QPalette : public QObject
 private Q_SLOTS:
     void roleValues_data();
     void roleValues();
+    void resolve();
     void copySemantics();
     void moveSemantics();
     void setBrush();
@@ -80,6 +81,43 @@ void tst_QPalette::roleValues()
     QCOMPARE(role, value);
 }
 
+void tst_QPalette::resolve()
+{
+    QPalette p1;
+    p1.setBrush(QPalette::WindowText, Qt::green);
+    p1.setBrush(QPalette::Button, Qt::green);
+
+    QVERIFY(p1.isBrushSet(QPalette::Active, QPalette::WindowText));
+    QVERIFY(p1.isBrushSet(QPalette::Active, QPalette::Button));
+
+    QPalette p2;
+    p2.setBrush(QPalette::WindowText, Qt::red);
+
+    QVERIFY(p2.isBrushSet(QPalette::Active, QPalette::WindowText));
+    QVERIFY(!p2.isBrushSet(QPalette::Active, QPalette::Button));
+
+    QPalette p1ResolvedTo2 = p1.resolve(p2);
+    // p1ResolvedTo2 gets everything from p1 and nothing copied from p2 because
+    // it already has a WindowText. That is two brushes, and to the same value
+    // as p1.
+    QCOMPARE(p1ResolvedTo2, p1);
+    QVERIFY(p1ResolvedTo2.isBrushSet(QPalette::Active, QPalette::WindowText));
+    QCOMPARE(p1.windowText(), p1ResolvedTo2.windowText());
+    QVERIFY(p1ResolvedTo2.isBrushSet(QPalette::Active, QPalette::Button));
+    QCOMPARE(p1.button(), p1ResolvedTo2.button());
+
+    QPalette p2ResolvedTo1 = p2.resolve(p1);
+    // p2ResolvedTo1 gets the WindowText set, and to the same value as the
+    // original p2, however, Button gets set from p1.
+    QVERIFY(p2ResolvedTo1.isBrushSet(QPalette::Active, QPalette::WindowText));
+    QCOMPARE(p2.windowText(), p2ResolvedTo1.windowText());
+    QVERIFY(p2ResolvedTo1.isBrushSet(QPalette::Active, QPalette::Button));
+    QCOMPARE(p1.button(), p2ResolvedTo1.button());
+
+    QVERIFY(p2ResolvedTo1 != p1);
+    QVERIFY(p2ResolvedTo1 != p2);
+}
+
 void tst_QPalette::copySemantics()
 {
     QPalette src(Qt::red), dst;
@@ -110,14 +148,14 @@ void tst_QPalette::moveSemantics()
     QCOMPARE(src, control);
     QVERIFY(!dst.isCopyOf(src));
     QVERIFY(!dst.isCopyOf(control));
-    dst = qMove(src); // move assignment
+    dst = std::move(src); // move assignment
     QVERIFY(!dst.isCopyOf(src)); // isCopyOf() works on moved-from palettes, too
     QVERIFY(dst.isCopyOf(control));
     QCOMPARE(dst, control);
     src = control; // check moved-from 'src' can still be assigned to (doesn't crash)
     QVERIFY(src.isCopyOf(dst));
     QVERIFY(src.isCopyOf(control));
-    QPalette dst2(qMove(src)); // move construction
+    QPalette dst2(std::move(src)); // move construction
     QVERIFY(!src.isCopyOf(dst));
     QVERIFY(!src.isCopyOf(dst2));
     QVERIFY(!src.isCopyOf(control));