From 8ef5e700b8471b865328472b52a790686507bb45 Mon Sep 17 00:00:00 2001
From: Stephen Kelly <stephen.kelly@kdab.com>
Date: Sat, 2 Nov 2013 17:31:12 +0100
Subject: QMetaType: Fix conversion between module types.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Change-Id: I7215b4599c3f0459139b32b6571f0a9e60182ee9
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
---
 .../auto/gui/kernel/qguivariant/test/tst_qguivariant.cpp | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

(limited to 'tests/auto')

diff --git a/tests/auto/gui/kernel/qguivariant/test/tst_qguivariant.cpp b/tests/auto/gui/kernel/qguivariant/test/tst_qguivariant.cpp
index 4b2cce63e5..42570751fc 100644
--- a/tests/auto/gui/kernel/qguivariant/test/tst_qguivariant.cpp
+++ b/tests/auto/gui/kernel/qguivariant/test/tst_qguivariant.cpp
@@ -118,6 +118,7 @@ private slots:
 
     void colorInteger();
     void invalidQColor();
+    void validQColor();
 
     void debugStream_data();
     void debugStream();
@@ -540,6 +541,21 @@ void tst_QGuiVariant::invalidQColor()
     QVERIFY(!qvariant_cast<QColor>(va).isValid());
 }
 
+void tst_QGuiVariant::validQColor()
+{
+    QColor col(Qt::red);
+    QVariant va(col.name());
+    QVERIFY(va.canConvert(QVariant::Color));
+
+    QVERIFY(va.convert(QVariant::Color));
+
+    QVERIFY(col.isValid());
+
+    QVERIFY(va.convert(QVariant::String));
+
+    QCOMPARE(qvariant_cast<QString>(va), col.name());
+}
+
 void tst_QGuiVariant::colorInteger()
 {
     QVariant v = QColor(Qt::red);
-- 
cgit v1.2.3