diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2009-08-24 09:23:21 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2009-08-24 09:25:17 (GMT) |
| commit | 8260b28cbbc1103a20e9f920fad099922021e9c7 (patch) | |
| tree | 9a5554d486c7fad5dea6b95d9c1d6364833b83b9 | |
| parent | 6bc7af414219e92ccec45ec45d47e6fe432ad048 (diff) | |
| download | Qt-8260b28cbbc1103a20e9f920fad099922021e9c7.zip Qt-8260b28cbbc1103a20e9f920fad099922021e9c7.tar.gz Qt-8260b28cbbc1103a20e9f920fad099922021e9c7.tar.bz2 | |
Fix the last fix to QList.
Reviewed-by: TrustMe
| -rw-r--r-- | src/corelib/tools/qlist.cpp | 2 | ||||
| -rw-r--r-- | src/network/ssl/qsslcertificate.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/corelib/tools/qlist.cpp b/src/corelib/tools/qlist.cpp index 868bed1..1335c30 100644 --- a/src/corelib/tools/qlist.cpp +++ b/src/corelib/tools/qlist.cpp @@ -107,7 +107,7 @@ QListData::Data *QListData::detach2() Data* t = static_cast<Data *>(qMalloc(DataHeaderSize + x->alloc * sizeof(void *))); Q_CHECK_PTR(t); - ::memcpy(x, d, DataHeaderSize + d->alloc * sizeof(void *)); + ::memcpy(t, d, DataHeaderSize + d->alloc * sizeof(void *)); t->ref = 1; t->sharable = true; diff --git a/src/network/ssl/qsslcertificate.cpp b/src/network/ssl/qsslcertificate.cpp index a09b8c43..8d855b1 100644 --- a/src/network/ssl/qsslcertificate.cpp +++ b/src/network/ssl/qsslcertificate.cpp @@ -381,7 +381,7 @@ QMultiMap<QSsl::AlternateNameEntryType, QString> QSslCertificate::alternateSubje } const char *altNameStr = reinterpret_cast<const char *>(q_ASN1_STRING_data(genName->d.ia5)); - const QString altName = QLatin1String(QByteArray(altNameStr, len)); + const QString altName = QString::fromLatin1(altNameStr, len); if (genName->type == GEN_DNS) result.insert(QSsl::DnsEntry, altName); else if (genName->type == GEN_EMAIL) |