diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-08-18 10:44:17 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-08-18 10:44:17 (GMT) |
| commit | c3000295bfbacbc853bcd5cd2b9cbc2784722093 (patch) | |
| tree | 2798c906cb340afb5e6f3cb1dcc2e7a5b75c50aa | |
| parent | 2126931461b948636e6ccd52d6db0fa541adeb6a (diff) | |
| parent | ad35bf83f9bd1d6b978243051e3d10a7fc61eec7 (diff) | |
| download | Qt-c3000295bfbacbc853bcd5cd2b9cbc2784722093.zip Qt-c3000295bfbacbc853bcd5cd2b9cbc2784722093.tar.gz Qt-c3000295bfbacbc853bcd5cd2b9cbc2784722093.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Fix non-ascii name issues in ICD.
| -rw-r--r-- | src/plugins/bearer/icd/dbusdispatcher.cpp | 4 | ||||
| -rw-r--r-- | src/plugins/bearer/icd/iapconf.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/plugins/bearer/icd/dbusdispatcher.cpp b/src/plugins/bearer/icd/dbusdispatcher.cpp index 60e4640..62dec62 100644 --- a/src/plugins/bearer/icd/dbusdispatcher.cpp +++ b/src/plugins/bearer/icd/dbusdispatcher.cpp @@ -195,7 +195,7 @@ static bool appendVariantToDBusMessage(const QVariant& argument, break; case QVariant::String: { - QByteArray data = argument.toString().toLatin1(); + QByteArray data = argument.toString().toUtf8(); str_data = data.data(); dbus_message_iter_append_basic(dbus_iter, DBUS_TYPE_STRING, &str_data); @@ -363,7 +363,7 @@ static QVariant getVariantFromDBusMessage(DBusMessageIter *iter) { case DBUS_TYPE_STRING: { dbus_message_iter_get_basic(iter, &str_data); - QString str(str_data); + QString str(QString::fromUtf8(str_data)); QVariant variant(str); return variant; } diff --git a/src/plugins/bearer/icd/iapconf.cpp b/src/plugins/bearer/icd/iapconf.cpp index a29e326..e326edf 100644 --- a/src/plugins/bearer/icd/iapconf.cpp +++ b/src/plugins/bearer/icd/iapconf.cpp @@ -143,7 +143,7 @@ QVariant IAPConfPrivate::valueToVariant(ConnSettingsValue *value) return QVariant(value->value.bool_val ? true : false); case CONN_SETTINGS_VALUE_STRING: - return QVariant(QString(value->value.string_val)); + return QVariant(QString::fromUtf8(value->value.string_val)); case CONN_SETTINGS_VALUE_DOUBLE: return QVariant(value->value.double_val); |