diff options
| author | Ulf Hermann <ulf.hermann@theqtcompany.com> | 2015-07-30 11:51:02 +0200 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@theqtcompany.com> | 2015-09-15 10:20:43 +0000 |
| commit | 6e295437ca8c9ec0afcad52d4a865d6596e1e404 (patch) | |
| tree | 60bb080f123360b09aa43d9d31443bf36cd4117b /src/qml/qml | |
| parent | 9bc00f102ad415d987976f8b5a12d13216ec02e2 (diff) | |
Decode signal signatures as UTF-8 rather than Latin1
QML source code is supposed to be in UTF-8, including signal
specifications.
Change-Id: Ic2d0aef579addabf39b3910393a77989130bc11a
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
Diffstat (limited to 'src/qml/qml')
| -rw-r--r-- | src/qml/qml/qqmlboundsignal.cpp | 6 | ||||
| -rw-r--r-- | src/qml/qml/qqmlobjectcreator.cpp | 7 | ||||
| -rw-r--r-- | src/qml/qml/qqmlvmemetaobject.cpp | 6 |
3 files changed, 11 insertions, 8 deletions
diff --git a/src/qml/qml/qqmlboundsignal.cpp b/src/qml/qml/qqmlboundsignal.cpp index f88e844529..ff5f36bd9c 100644 --- a/src/qml/qml/qqmlboundsignal.cpp +++ b/src/qml/qml/qqmlboundsignal.cpp @@ -337,9 +337,9 @@ void QQmlBoundSignal_callback(QQmlNotifierEndpoint *e, void **a) QV4DebugService *service = QQmlDebugConnector::service<QV4DebugService>(); if (service) - service->signalEmitted(QString::fromLatin1(QMetaObjectPrivate::signal( - s->m_expression->target()->metaObject(), - s->signalIndex()).methodSignature())); + service->signalEmitted(QString::fromUtf8(QMetaObjectPrivate::signal( + s->m_expression->target()->metaObject(), + s->signalIndex()).methodSignature())); QQmlEngine *engine; if (s->m_expression && (engine = s->m_expression->engine())) { diff --git a/src/qml/qml/qqmlobjectcreator.cpp b/src/qml/qml/qqmlobjectcreator.cpp index b55973cdc8..0e7ce7fb7e 100644 --- a/src/qml/qml/qqmlobjectcreator.cpp +++ b/src/qml/qml/qqmlobjectcreator.cpp @@ -878,9 +878,10 @@ bool QQmlObjectCreator::setPropertyBinding(const QQmlPropertyData *property, con QMetaMethod signalMethod = _qobject->metaObject()->method(property->coreIndex); if (!QMetaObject::checkConnectArgs(signalMethod, method)) { - recordError(binding->valueLocation, tr("Cannot connect mismatched signal/slot %1 %vs. %2") - .arg(QString::fromLatin1(method.methodSignature().constData())) - .arg(QString::fromLatin1(signalMethod.methodSignature().constData()))); + recordError(binding->valueLocation, + tr("Cannot connect mismatched signal/slot %1 %vs. %2") + .arg(QString::fromUtf8(method.methodSignature())) + .arg(QString::fromUtf8(signalMethod.methodSignature()))); return false; } diff --git a/src/qml/qml/qqmlvmemetaobject.cpp b/src/qml/qml/qqmlvmemetaobject.cpp index 4b19d1af04..509bbf7039 100644 --- a/src/qml/qml/qqmlvmemetaobject.cpp +++ b/src/qml/qml/qqmlvmemetaobject.cpp @@ -782,8 +782,10 @@ int QQmlVMEMetaObject::metaCall(QObject *o, QMetaObject::Call c, int _id, void * // are not rewritten correctly but this bug is deemed out-of-scope to fix for // performance reasons; see QTBUG-24064) and thus compilation will have failed. QQmlError e; - e.setDescription(QString(QLatin1String("Exception occurred during compilation of function: %1")). - arg(QLatin1String(QMetaObject::method(_id).methodSignature().constData()))); + e.setDescription(QString::fromLatin1("Exception occurred during compilation of " + "function: %1") + .arg(QString::fromUtf8(QMetaObject::method(_id) + .methodSignature()))); ep->warning(e); return -1; // The dynamic method with that id is not available. } |