path: root/tests/auto/corelib/io/qfile/tst_qfile.cpp
diff options
authorGiuseppe D'Angelo <>2020-11-04 15:19:26 +0100
committerVolker Hilsheimer <>2020-11-15 14:41:05 +0100
commit1869615fc959c70a334e666ebf95ff595a3d6e67 (patch)
treeb3940f0c18afcabd3c531f172b040a47d34c55d0 /tests/auto/corelib/io/qfile/tst_qfile.cpp
parent1aec96bffdce7e835aa33f01f44269594a955548 (diff)
QChar: make construction from integral explicit
QChar should not be convertible from any integral type except from char16_t, short and possibly char (since it's a direct superset). David provided the perfect example: if (str == 123) { ~~~ } compiles, with 123 implicitly converted to QChar (str == "123" was meant instead). But similarly one can construct other scenarios where QString(123) gets accidentally used (instead of QString::number(123)), like QString s; s += 123;. Add a macro to revert to the implicit constructors, for backwards compatibility. The breaks are mostly in tests that "abuse" of integers (arithmetic, etc.). Maybe it's time for user-defined literals for QChar/QString, but that is left for another commit. [ChangeLog][Potentially Source-Incompatible Changes][QChar] QChar constructors from integral types are now by default explicit. It is recommended to use explicit conversions, QLatin1Char, QChar::fromUcs4 instead of implicit conversions. The old behavior can be restored by defining the QT_IMPLICIT_QCHAR_CONSTRUCTION macro. Change-Id: I6175f6ab9bcf1956f6f97ab0c9d9d5aaf777296d Reviewed-by: Volker Hilsheimer <> Reviewed-by: Tor Arne Vestbø <>
Diffstat (limited to 'tests/auto/corelib/io/qfile/tst_qfile.cpp')
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/corelib/io/qfile/tst_qfile.cpp b/tests/auto/corelib/io/qfile/tst_qfile.cpp
index e5b7051997..e408cd3e48 100644
--- a/tests/auto/corelib/io/qfile/tst_qfile.cpp
+++ b/tests/auto/corelib/io/qfile/tst_qfile.cpp
@@ -3182,7 +3182,7 @@ void tst_QFile::mapResource()
QCOMPARE(file.error(), error);
QVERIFY((error == QFile::NoError) ? (memory != 0) : (memory == 0));
if (error == QFile::NoError)
- QCOMPARE(QString(memory[0]), QString::number(offset + 1));
+ QCOMPARE(QString(QChar(memory[0])), QString::number(offset + 1));