3 files changed, 85 insertions, 1 deletions

diff --git a/tests/auto/gui/kernel/qclipboard/tst_qclipboard.cpp b/tests/auto/gui/kernel/qclipboard/tst_qclipboard.cpp
index 993ebbaac6..bff9f7d0e0 100644
--- a/tests/auto/gui/kernel/qclipboard/tst_qclipboard.cpp
+++ b/tests/auto/gui/kernel/qclipboard/tst_qclipboard.cpp
@@ -215,7 +215,7 @@ static bool runHelper(const QString &program, const QStringList &arguments, QByt
 {
 #if QT_CONFIG(process)
     QProcess process;
-    process.setReadChannelMode(QProcess::ForwardedChannels);
+    process.setProcessChannelMode(QProcess::ForwardedChannels);
     process.start(program, arguments);
     if (!process.waitForStarted()) {
         *errorMessage = "Unable to start '" + program.toLocal8Bit() + " ': "
diff --git a/tests/auto/gui/kernel/qguimetatype/tst_qguimetatype.cpp b/tests/auto/gui/kernel/qguimetatype/tst_qguimetatype.cpp
index cca0e95c29..b2572188b9 100644
--- a/tests/auto/gui/kernel/qguimetatype/tst_qguimetatype.cpp
+++ b/tests/auto/gui/kernel/qguimetatype/tst_qguimetatype.cpp
@@ -49,6 +49,8 @@ private slots:
     void construct();
     void constructCopy_data();
     void constructCopy();
+    void saveAndLoadBuiltin_data();
+    void saveAndLoadBuiltin();
 };
 
 #define FOR_EACH_GUI_METATYPE_BASE(F) \
@@ -442,5 +444,49 @@ FOR_EACH_GUI_METATYPE(RETURN_CONSTRUCT_COPY_FUNCTION)
     TypeTestFunctionGetter::get(type)();
 }
 
+template <typename T>
+struct StreamingTraits
+{
+    // Streamable by default, as currently all gui built-in types are streamable
+    enum { isStreamable = 1 };
+};
+
+void tst_QGuiMetaType::saveAndLoadBuiltin_data()
+{
+    QTest::addColumn<int>("type");
+    QTest::addColumn<bool>("isStreamable");
+
+#define ADD_METATYPE_TEST_ROW(MetaTypeName, MetaTypeId, RealType) \
+    QTest::newRow(#RealType) << MetaTypeId << bool(StreamingTraits<RealType>::isStreamable);
+    QT_FOR_EACH_STATIC_GUI_CLASS(ADD_METATYPE_TEST_ROW)
+#undef ADD_METATYPE_TEST_ROW
+}
+
+void tst_QGuiMetaType::saveAndLoadBuiltin()
+{
+    QFETCH(int, type);
+    QFETCH(bool, isStreamable);
+
+    void *value = QMetaType::create(type);
+
+    QByteArray ba;
+    QDataStream stream(&ba, QIODevice::ReadWrite);
+    QCOMPARE(QMetaType::save(stream, type, value), isStreamable);
+    QCOMPARE(stream.status(), QDataStream::Ok);
+
+    if (isStreamable)
+        QVERIFY(QMetaType::load(stream, type, value));
+
+    stream.device()->seek(0);
+    stream.resetStatus();
+    QCOMPARE(QMetaType::load(stream, type, value), isStreamable);
+    QCOMPARE(stream.status(), QDataStream::Ok);
+
+    if (isStreamable)
+        QVERIFY(QMetaType::load(stream, type, value));
+
+    QMetaType::destroy(type, value);
+}
+
 QTEST_MAIN(tst_QGuiMetaType)
 #include "tst_qguimetatype.moc"
diff --git a/tests/auto/gui/kernel/qpalette/tst_qpalette.cpp b/tests/auto/gui/kernel/qpalette/tst_qpalette.cpp
index a0ac1b3631..7f29b1c24e 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;