diff options
| author | Jan-Arve Saether <jan-arve.saether@nokia.com> | 2011-09-07 06:20:24 (GMT) |
|---|---|---|
| committer | Jan-Arve Saether <jan-arve.saether@nokia.com> | 2011-09-07 06:20:24 (GMT) |
| commit | 9d34e9d705cf2f054a668d9e6aafb2efcd500913 (patch) | |
| tree | 68f2b626e84ba9772c0e7c81e48a1e300421f145 /src/plugins/bearer/icd/iapconf.cpp | |
| parent | 80f9451b605aa2eb181d76b79bc1869a3cd9e513 (diff) | |
| parent | 3927585b3c74c8ccf61b84a525947237f02ea485 (diff) | |
| download | Qt-9d34e9d705cf2f054a668d9e6aafb2efcd500913.zip Qt-9d34e9d705cf2f054a668d9e6aafb2efcd500913.tar.gz Qt-9d34e9d705cf2f054a668d9e6aafb2efcd500913.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-water-team
Diffstat (limited to 'src/plugins/bearer/icd/iapconf.cpp')
| -rw-r--r-- | src/plugins/bearer/icd/iapconf.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
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); |