diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2012-05-02 12:55:49 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-05-03 11:33:05 +0200 |
| commit | 9c75a547a0eddd8913ec5f1a49b5ba5749f50973 (patch) | |
| tree | 285dbfad626d3614b2757fe32fa03ca56ed04f91 /src/corelib/kernel/qvariant.cpp | |
| parent | d9f4b130aa1c529c50d1e7a9d55c13de7ea72b08 (diff) | |
Remove references to to/fromAscii in QString and QByteArray main docs
Those functions are about to be deprecated and shouldn't be referred
to in the main documentation. Since they were temporarily changed to
mean UTF-8, this is not a behaviour change.
The next commit will update the code to match the documentation.
Change-Id: Ia8c2843c7f2b478f5691fe0224d5e631d94b1af6
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Diffstat (limited to 'src/corelib/kernel/qvariant.cpp')
| -rw-r--r-- | src/corelib/kernel/qvariant.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/kernel/qvariant.cpp b/src/corelib/kernel/qvariant.cpp index 5e24ffebd1..768678c6c9 100644 --- a/src/corelib/kernel/qvariant.cpp +++ b/src/corelib/kernel/qvariant.cpp @@ -1969,7 +1969,7 @@ QEasingCurve QVariant::toEasingCurve() const \fn QByteArray QVariant::toByteArray() const Returns the variant as a QByteArray if the variant has type() \l - ByteArray or \l String (converted using QString::fromAscii()); + ByteArray or \l String (converted using QString::fromUtf8()); otherwise returns an empty byte array. \sa canConvert(), convert() |