From e887f25dd6c4c9630a7367c3a2ed95a284191843 Mon Sep 17 00:00:00 2001
From: Maximilian Goldstein <max.goldstein@qt.io>
Date: Tue, 9 Feb 2021 11:37:45 +0100
Subject: Fix QJSValue string parameters used in signals

Pick-to: 6.1 6.0 5.15
Fixes: QTBUG-86482
Change-Id: If938fad22f51b08fe3cb20b94634efe46a1eed47
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
---
 tests/auto/qml/qqmllanguage/testtypes.h          | 11 +++++++++++
 tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp | 21 +++++++++++++++++++++
 2 files changed, 32 insertions(+)

(limited to 'tests/auto/qml')

diff --git a/tests/auto/qml/qqmllanguage/testtypes.h b/tests/auto/qml/qqmllanguage/testtypes.h
index 74cd608471..73da55ef3f 100644
--- a/tests/auto/qml/qqmllanguage/testtypes.h
+++ b/tests/auto/qml/qqmllanguage/testtypes.h
@@ -1703,6 +1703,17 @@ public:
     int g() const { return 44; }
 };
 
+class StringSignaler : public QObject
+{
+    Q_OBJECT
+    QML_ELEMENT
+public:
+    StringSignaler(QObject *parent = nullptr) : QObject(parent) {}
+    Q_INVOKABLE void call() { emit signal(QJSValue("Hello world!")); }
+signals:
+    void signal(QJSValue value);
+};
+
 void registerTypes();
 
 #endif // TESTTYPES_H
diff --git a/tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp b/tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp
index 401203401e..f174b78e9b 100644
--- a/tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp
+++ b/tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp
@@ -346,6 +346,7 @@ private slots:
     void factorySingleton();
     void extendedSingleton();
     void qtbug_85932();
+    void qtbug_86482();
 
     void multiExtension();
     void invalidInlineComponent();
@@ -6168,6 +6169,26 @@ void tst_qqmllanguage::invalidInlineComponent()
     QVERIFY(c.errorString().contains("\"Window.visibility\" is not available in QtQuick 2.0."));
 }
 
+void tst_qqmllanguage::qtbug_86482()
+{
+    QQmlEngine engine;
+    QQmlComponent component(&engine);
+    component.setData(QByteArray(R"(import QtQml 2.0
+                                 import StaticTest
+                                 QtObject {
+                                     id: root
+                                     property string result
+                                     property StringSignaler str: StringSignaler {
+                                        onSignal: function(value) { root.result = value; }
+                                     }
+                                     Component.onCompleted: str.call();
+                                 })"), QUrl());
+    VERIFY_ERRORS(0);
+    QScopedPointer<QObject> o(component.create());
+    QVERIFY2(component.isReady(), qPrintable(component.errorString()));
+    QCOMPARE(o->property("result").toString(), QStringLiteral("Hello world!"));
+}
+
 QTEST_MAIN(tst_qqmllanguage)
 
 #include "tst_qqmllanguage.moc"
-- 
cgit v1.2.3