diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2020-04-06 14:53:50 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@qt.io> | 2020-04-16 23:15:05 +0200 |
| commit | 0b12b7f5185839a3c1b0fccb10d66937ac884947 (patch) | |
| tree | 3cec597b37a2cad34d4eeb4d6362e582597c8b40 | |
| parent | 83f5c3c26a59849197bd8d3a661afc87893866ba (diff) | |
Fix compilation with QT_RESTRICTED_CAST_FROM_ASCII
Fix the QString constructor used for restricted casts
from char *.
Change-Id: Id7e71f6d0bcd4627bb44b2bd6d6790be2b6ed976
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| -rw-r--r-- | src/corelib/text/qstring.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/text/qstring.h b/src/corelib/text/qstring.h index ad6c481209..a841a0c123 100644 --- a/src/corelib/text/qstring.h +++ b/src/corelib/text/qstring.h @@ -804,7 +804,7 @@ public: #if defined(QT_RESTRICTED_CAST_FROM_ASCII) template <int N> inline QString(const char (&ch)[N]) - : d(fromAscii_helper(ch, N - 1)) + : QString(fromUtf8(ch)) {} template <int N> QString(char (&)[N]) = delete; |