Merge branch 'master' of github.com:highfidelity/hifi into parents

This commit is contained in:
Seth Alves 2015-11-30 09:41:28 -08:00
commit ded8a624ad

View file

@ -196,5 +196,9 @@ QScriptValue WebWindowClass::constructor(QScriptContext* context, QScriptEngine*
}
void WebWindowClass::setTitle(const QString& title) {
if (QThread::currentThread() != thread()) {
QMetaObject::invokeMethod(this, "setTitle", Qt::AutoConnection, Q_ARG(QString, title));
return;
}
_windowWidget->setWindowTitle(title);
}