diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-08-19 16:14:00 +1000 |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-08-19 16:14:00 +1000 |
| commit | 2f5855e8d891a7e93bdb721243f1c0b10fcb5ad9 (patch) | |
| tree | 7e51853776d1c980955b432634f0f24a71643f1e /src/plugins | |
| parent | 0cb57328453c476b01b058d57211afee197d6a82 (diff) | |
| parent | 4e40c388aef3cb16a1492764c37ae8ba929e8aef (diff) | |
| download | qt4-tools-2f5855e8d891a7e93bdb721243f1c0b10fcb5ad9.tar.gz | |
Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration into master-integration
* 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration:
Fix non-ascii name issues in ICD.
Compile fix for Symbian 5th and earlier
fix copying webkit guide under windows
Symbian: Fix backspace on empty lines of multiline textedits
Diffstat (limited to 'src/plugins')
| -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 60e4640f22..62dec62a0c 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 a29e326a22..e326edf38f 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); |