Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-19 15:03:53 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #7541 from jherico/fix_simple_qml_message

Browse source 
Fix passing of simple string message types from QML to scripts
This commit is contained in:
Brad Hefta-Gaub 2016-04-01 15:20:39 -07:00
commit c4abec4fb2
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
libraries/ui/src/QmlWindowClass.cpp
View file

@ -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) {