diff options
| author | João Abecasis <joao.abecasis@nokia.com> | 2012-02-21 14:58:57 +0100 |
|---|---|---|
| committer | João Abecasis <joao.abecasis@nokia.com> | 2012-02-21 14:58:57 +0100 |
| commit | 31a0358afb4fde998d1eeeaa80fc32e4420266c7 (patch) | |
| tree | 938455353474196c1f49b0529b5b644e19c21f3e /src/corelib/tools/qstring.cpp | |
| parent | 4c8a4058c359c8d163c643120426079fc80c8214 (diff) | |
| parent | 69da8588d41bbf5ab785f5ad7c1fce76deefc7d0 (diff) | |
Merge remote-tracking branch 'gerrit/master' into containers
Conflicts:
src/corelib/tools/qbytearray.h
Change-Id: I03b1f3e05c9b7a45130887c522fcd9b7aa387129
Diffstat (limited to 'src/corelib/tools/qstring.cpp')
| -rw-r--r-- | src/corelib/tools/qstring.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/corelib/tools/qstring.cpp b/src/corelib/tools/qstring.cpp index 0f7d398972..57210901ee 100644 --- a/src/corelib/tools/qstring.cpp +++ b/src/corelib/tools/qstring.cpp @@ -936,7 +936,7 @@ int QString::grow(int size) systems). This method is only available if Qt is configured with STL - compatibility enabled. + compatibility enabled and if QT_NO_STL is not defined. \sa fromUtf16(), fromLatin1(), fromLocal8Bit(), fromUtf8(), fromUcs4() */ @@ -964,7 +964,7 @@ int QString::grow(int size) that accepts a std::wstring object. This operator is only available if Qt is configured with STL - compatibility enabled. + compatibility enabled and if QT_NO_STL is not defined. \sa utf16(), toAscii(), toLatin1(), toUtf8(), toLocal8Bit() */ @@ -7006,7 +7006,7 @@ bool QString::isRightToLeft() const can lead to loss of information. This operator is only available if Qt is configured with STL - compatibility enabled. + compatibility enabled and if QT_NO_STL is not defined. \sa toAscii(), toLatin1(), toUtf8(), toLocal8Bit() */ |