From 35597f301480ffc59f598be4de2c2074543725be Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20Str=C3=B8mme?= <christian.stromme@qt.io>
Date: Thu, 2 Jun 2016 12:08:29 +0200
Subject: Fix char conversions in QML

This is a partial revert of 90b06e2773842, as it had unwanted side
effects. The original intention was to make assignment from char to
string possible, or more specifically, we wanted a solution where a
QChar could be assigned to a QString, as a character and not a string
representation of its value. While this behavior is desirable for
QChar, we most likely want the opposite for the regular character types.

Task-number: QTBUG-49232
Change-Id: I82d5f72b900fe984c4db1478fd52a9eb69ad2ee6
Reviewed-by: Michael Brasser <michael.brasser@live.com>
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
---
 tests/auto/qml/qqmlcontext/tst_qqmlcontext.cpp | 29 ++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

(limited to 'tests/auto/qml/qqmlcontext')

diff --git a/tests/auto/qml/qqmlcontext/tst_qqmlcontext.cpp b/tests/auto/qml/qqmlcontext/tst_qqmlcontext.cpp
index d338e6f5ad..739af3782e 100644
--- a/tests/auto/qml/qqmlcontext/tst_qqmlcontext.cpp
+++ b/tests/auto/qml/qqmlcontext/tst_qqmlcontext.cpp
@@ -66,6 +66,7 @@ private slots:
     void qtbug_22535();
     void evalAfterInvalidate();
     void qobjectDerived();
+    void qtbug_49232();
 
 private:
     QQmlEngine engine;
@@ -205,6 +206,8 @@ class TestObject : public QObject
     Q_PROPERTY(int a READ a NOTIFY aChanged)
     Q_PROPERTY(int b READ b NOTIFY bChanged)
     Q_PROPERTY(int c READ c NOTIFY cChanged)
+    Q_PROPERTY(char d READ d NOTIFY dChanged)
+    Q_PROPERTY(uchar e READ e NOTIFY eChanged)
 
 public:
     TestObject() : _a(10), _b(10), _c(10) {}
@@ -218,15 +221,25 @@ public:
     int c() const { return _c; }
     void setC(int c) { _c = c; emit cChanged(); }
 
+    char d() const { return _d; }
+    void setD(char d) { _d = d; emit dChanged(); }
+
+    uchar e() const { return _e; }
+    void setE(uchar e) { _e = e; emit eChanged(); }
+
 signals:
     void aChanged();
     void bChanged();
     void cChanged();
+    void dChanged();
+    void eChanged();
 
 private:
     int _a;
     int _b;
     int _c;
+    char _d;
+    uchar _e;
 };
 
 #define TEST_CONTEXT_PROPERTY(ctxt, name, value) \
@@ -699,6 +712,22 @@ void tst_qqmlcontext::qobjectDerived()
     QCOMPARE(command.count, 2);
 }
 
+void tst_qqmlcontext::qtbug_49232()
+{
+    TestObject testObject;
+    testObject.setD('a');
+    testObject.setE(97);
+
+    QQmlEngine engine;
+    engine.rootContext()->setContextProperty("TestObject", &testObject);
+    QQmlComponent component(&engine);
+    component.setData("import QtQuick 2.0; QtObject { property int valueOne: TestObject.d; property int valueTwo: TestObject.e }", QUrl());
+    QScopedPointer<QObject> obj(component.create());
+
+    QCOMPARE(obj->property("valueOne"), QVariant('a'));
+    QCOMPARE(obj->property("valueTwo"), QVariant(97));
+}
+
 QTEST_MAIN(tst_qqmlcontext)
 
 #include "tst_qqmlcontext.moc"
-- 
cgit v1.2.3