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/qqmlobjectcreator.cpp | |
| 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/qqmlobjectcreator.cpp')
| -rw-r--r-- | src/qml/qml/qqmlobjectcreator.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
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; } |