diff options
| author | Allan Sandfeld Jensen <allan.jensen@digia.com> | 2013-09-18 14:56:50 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-19 20:50:05 +0200 |
| commit | 0c6d523c02dafb95b0683b88222e17a4fa6782a6 (patch) | |
| tree | d162284bb5f2b5791247db968b9fea1a85a3a356 /Source/WTF/wtf/text/WTFString.cpp | |
| parent | 2925efd2fcef1f8b9fd48979144877c1a5ec214b (diff) | |
| download | qtwebkit-0c6d523c02dafb95b0683b88222e17a4fa6782a6.tar.gz | |
QtWebKit should not require SQLite version to 3.6.16.
Revert r152134 which raised the minimum SQLite version,
and r152201 which removed a method the reverted code needed.
Change-Id: Ie028992137f3983d114f3491423afe6303173544
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com>
Diffstat (limited to 'Source/WTF/wtf/text/WTFString.cpp')
| -rw-r--r-- | Source/WTF/wtf/text/WTFString.cpp | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/Source/WTF/wtf/text/WTFString.cpp b/Source/WTF/wtf/text/WTFString.cpp index 29c13c10d..a61fe103f 100644 --- a/Source/WTF/wtf/text/WTFString.cpp +++ b/Source/WTF/wtf/text/WTFString.cpp @@ -409,6 +409,16 @@ Vector<UChar> String::charactersWithNullTermination() const return result; } +const UChar* String::deprecatedCharactersWithNullTermination() +{ + if (!m_impl) + return 0; + if (m_impl->hasTerminatingNullCharacter()) + return m_impl->characters(); + m_impl = StringImpl::createWithTerminatingNullCharacter(*m_impl); + return m_impl->characters(); +} + String String::format(const char *format, ...) { #if PLATFORM(QT) |