diff options
Diffstat (limited to 'src/corelib/kernel')
| -rw-r--r-- | src/corelib/kernel/qobject.cpp | 2 | ||||
| -rw-r--r-- | src/corelib/kernel/qvariant.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/corelib/kernel/qobject.cpp b/src/corelib/kernel/qobject.cpp index 49a9beb298..e324fcb9ba 100644 --- a/src/corelib/kernel/qobject.cpp +++ b/src/corelib/kernel/qobject.cpp @@ -3236,7 +3236,7 @@ void QMetaObject::connectSlotsByName(QObject *o) bool foundIt = false; for(int j = 0; j < list.count(); ++j) { const QObject *co = list.at(j); - QByteArray objName = co->objectName().toAscii(); + QByteArray objName = co->objectName().toLatin1(); int len = objName.length(); if (!len || qstrncmp(slot + 3, objName.data(), len) || slot[len+3] != '_') continue; diff --git a/src/corelib/kernel/qvariant.cpp b/src/corelib/kernel/qvariant.cpp index 83d48d9330..0b3e0418d0 100644 --- a/src/corelib/kernel/qvariant.cpp +++ b/src/corelib/kernel/qvariant.cpp @@ -290,7 +290,7 @@ static bool convert(const QVariant::Private *d, int t, void *result, bool *ok) break; case QMetaType::Char: case QMetaType::UChar: - *str = QChar::fromAscii(d->data.c); + *str = QChar::fromLatin1(d->data.c); break; case QMetaType::Short: case QMetaType::Long: |