diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-09-04 14:33:40 +0200 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-09-04 14:33:40 +0200 |
| commit | f255b1e8e297e7e1363921580007145cff574e0d (patch) | |
| tree | 9a799be282e6c0d6544d9f8c872073f83e6c0475 /src/corelib/text/qstring.h | |
| parent | 7e8705f6632428a8d9a937ab5fe087999347b3dd (diff) | |
| parent | bf8fcab8bb92ff534c5cec048d6dbebb3b73a348 (diff) | |
Merge remote-tracking branch 'origin/dev' into wip/qt6
Change-Id: I54741635460bb2d8f3fd0be535ee1968d6c442bb
Diffstat (limited to 'src/corelib/text/qstring.h')
| -rw-r--r-- | src/corelib/text/qstring.h | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/src/corelib/text/qstring.h b/src/corelib/text/qstring.h index 88286b902a..5def2c81a1 100644 --- a/src/corelib/text/qstring.h +++ b/src/corelib/text/qstring.h @@ -57,15 +57,6 @@ #include <string> #include <iterator> -#if defined(Q_OS_ANDROID) && !defined(ANDROID_HAS_WSTRING) -// std::wstring is disabled on android's glibc, as bionic lacks certain features -// that libstdc++ checks for (like mbcslen). -namespace std -{ - typedef basic_string<wchar_t> wstring; -} -#endif - #include <stdarg.h> #ifdef truncate @@ -229,7 +220,8 @@ Q_DECLARE_TYPEINFO(QLatin1String, Q_MOVABLE_TYPE); // Qt 4.x compatibility #if QT_DEPRECATED_SINCE(5, 14) -QT_DEPRECATED_X("Use QLatin1String") typedef QLatin1String QLatin1Literal; +QT_DEPRECATED_X("Use QLatin1String") +typedef QLatin1String QLatin1Literal; #endif // |