1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "QChar: assert on illegal construction"

Browse Source 
This reverts commit 915be6606ead25f4fbbbcb2687b33cf22a955177.

Reason for revert: This causes issues in other modules,
see QTBUG-88687, QTBUG-88710, QTBUG-88712. We should fix them,
but let's not block 6.0.0 until then.

Task-number: QTBUG-88687
Task-number: QTBUG-88710
Task-number: QTBUG-88712
Change-Id: I89425082c9c55aabb34283dfec5dfd421d91d269
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
(cherry picked from commit 64319ae45ebbd1bfb3fb741756c924e445516ac7)
Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
This commit is contained in:
Kai Koehne 2020-11-21 16:40:20 +00:00
parent 33f85891dc
commit 7cf781d075
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/corelib/text/qchar.h
View File

@ -111,8 +111,8 @@ public:
constexpr Q_IMPLICIT QChar(ushort rc) noexcept : ucs(rc) {}
constexpr QCHAR_MAYBE_IMPLICIT QChar(uchar c, uchar r) noexcept : ucs(char16_t((r << 8) | c)) {}
constexpr Q_IMPLICIT QChar(short rc) noexcept : ucs(char16_t(rc)) {}
constexpr QCHAR_MAYBE_IMPLICIT QChar(uint rc) noexcept : ucs((Q_ASSERT(rc <= 0xffff), char16_t(rc))) {}
constexpr QCHAR_MAYBE_IMPLICIT QChar(int rc) noexcept : QChar(uint(rc)) {}
constexpr QCHAR_MAYBE_IMPLICIT QChar(uint rc) noexcept : ucs(char16_t(rc & 0xffff)) {}
constexpr QCHAR_MAYBE_IMPLICIT QChar(int rc) noexcept : ucs(char16_t(rc & 0xffff)) {}
constexpr Q_IMPLICIT QChar(SpecialCharacter s) noexcept : ucs(char16_t(s)) {}
constexpr Q_IMPLICIT QChar(QLatin1Char ch) noexcept : ucs(ch.unicode()) {}
constexpr Q_IMPLICIT QChar(char16_t ch) noexcept : ucs(ch) {}