Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-05-07 07:20:14 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix passing of simple string message types from QML to scripts

Browse source
This commit is contained in:
Brad Davis 2016-04-01 11:04:01 -07:00
parent 5a665f9aef
commit ca67c7335f
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) { void QmlWindowClass::qmlToScript(const QVariant& message) {
QJSValue js = qvariant_cast<QJSValue>(message); if (message.canConvert<QJSValue>()) {
emit fromQml(js.toVariant()); 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) { void QmlWindowClass::sendToQml(const QVariant& message) {