diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2022-06-16 10:48:47 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2022-06-20 08:22:46 +0000 |
| commit | 30511947728d3eafaab1a190731d61dd653bbb0c (patch) | |
| tree | 05dfbaae74073f8de2a545d3066d26436425d7cd | |
| parent | 00d0f9a3b457bff3cca3c47966331a48cd590b03 (diff) | |
qtdiag: Fix missing output on Windows
Streaming passwordMaskCharacter.unicode() (char16_t) in the non-ASCII
branch caused weird effects on the terminal. Cast to int instead.
Change-Id: Ifca5cc8c8d83bb98bfbd220405fd9f714b59a63e
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
(cherry picked from commit 51edc6fd26153718217a2266b5b1592a6bc7ee97)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | src/qtdiag/qtdiag.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/qtdiag/qtdiag.cpp b/src/qtdiag/qtdiag.cpp index 8e5347c94..d1095494d 100644 --- a/src/qtdiag/qtdiag.cpp +++ b/src/qtdiag/qtdiag.cpp @@ -712,10 +712,13 @@ QString qtDiag(unsigned flags) << " showIsMaximized: " << styleHints->showIsMaximized() << '\n' << " passwordMaskDelay: " << styleHints->passwordMaskDelay() << '\n' << " passwordMaskCharacter: "; - if (passwordMaskCharacter.unicode() >= 32 && passwordMaskCharacter.unicode() < 128) + const int passwordMaskCharacterUc = passwordMaskCharacter.unicode(); + if (passwordMaskCharacterUc >= 32 && passwordMaskCharacterUc < 128) { str << '\'' << passwordMaskCharacter << '\''; - else - str << "U+" << qSetFieldWidth(4) << qSetPadChar('0') << Qt::uppercasedigits << Qt::hex << passwordMaskCharacter.unicode() << Qt::dec << qSetFieldWidth(0); + } else { + str << "U+" << qSetFieldWidth(4) << qSetPadChar('0') << Qt::uppercasedigits << Qt::hex + << passwordMaskCharacterUc << Qt::dec << qSetFieldWidth(0); + } str << '\n' << " fontSmoothingGamma: " << styleHints->fontSmoothingGamma() << '\n' << " useRtlExtensions: " << styleHints->useRtlExtensions() << '\n' |