From ca67c7335f61ebacee70c31a98a9a4a3a3ee4b30 Mon Sep 17 00:00:00 2001
From: Brad Davis <bdavis@saintandreas.org>
Date: Fri, 1 Apr 2016 11:04:01 -0700
Subject: [PATCH] Fix passing of simple string message types from QML to
 scripts

---
 libraries/ui/src/QmlWindowClass.cpp | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/libraries/ui/src/QmlWindowClass.cpp b/libraries/ui/src/QmlWindowClass.cpp
index 66667a0b2a..396d716cda 100644
--- a/libraries/ui/src/QmlWindowClass.cpp
+++ b/libraries/ui/src/QmlWindowClass.cpp
@@ -130,8 +130,13 @@ void QmlWindowClass::initQml(QVariantMap properties) {
 }
 
 void QmlWindowClass::qmlToScript(const QVariant& message) {
-    QJSValue js = qvariant_cast<QJSValue>(message);
-    emit fromQml(js.toVariant());
+    if (message.canConvert<QJSValue>()) {
+        emit fromQml(qvariant_cast<QJSValue>(message).toVariant());
+    } else if (message.canConvert<QString>()) {
+        emit fromQml(message.toString());
+    } else {
+        qWarning() << "Unsupported message type " << message;
+    }
 }
 
 void QmlWindowClass::sendToQml(const QVariant& message) {