diff options
author | Andrei Golubev <andrei.golubev@qt.io> | 2021-03-04 17:20:52 +0100 |
---|---|---|
committer | Andrei Golubev <andrei.golubev@qt.io> | 2021-03-30 10:37:13 +0100 |
commit | c34f51d58c1e3333a663b09b974bbd7b145a2d1b (patch) | |
tree | a54ec602b1123a5721a1ef46eabd65846a9951bc /tests/auto | |
parent | b1377ed02dce9a173e345aab22af504de2b77d54 (diff) |
Remove meaningless QT_NO_UNICODE_LITERAL check in QString literal tests
This check doesn't really do anything useful anymore: QStringLiteral
is used in Qt without any extra QT_NO_UNICODE_LITERAL #if-ery
Additionally, clean the related (and outdated) comment in
{QString, QByteArray}::literals()
Change-Id: I65b1eac33c5470508997be24f9ba6cf56d8578ea
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'tests/auto')
-rw-r--r-- | tests/auto/corelib/text/qbytearray/tst_qbytearray.cpp | 1 | ||||
-rw-r--r-- | tests/auto/corelib/text/qstring/tst_qstring.cpp | 5 |
2 files changed, 0 insertions, 6 deletions
diff --git a/tests/auto/corelib/text/qbytearray/tst_qbytearray.cpp b/tests/auto/corelib/text/qbytearray/tst_qbytearray.cpp index 1ce92becee..382190567b 100644 --- a/tests/auto/corelib/text/qbytearray/tst_qbytearray.cpp +++ b/tests/auto/corelib/text/qbytearray/tst_qbytearray.cpp @@ -1968,7 +1968,6 @@ void tst_QByteArray::movablity() QVERIFY(true); } -// Only tested on c++0x compliant compiler or gcc void tst_QByteArray::literals() { QByteArray str(QByteArrayLiteral("abcd")); diff --git a/tests/auto/corelib/text/qstring/tst_qstring.cpp b/tests/auto/corelib/text/qstring/tst_qstring.cpp index f36da049f9..57885f596d 100644 --- a/tests/auto/corelib/text/qstring/tst_qstring.cpp +++ b/tests/auto/corelib/text/qstring/tst_qstring.cpp @@ -566,9 +566,7 @@ private slots: #if QT_CONFIG(icu) void toUpperLower_icu(); #endif -#if !defined(QT_NO_UNICODE_LITERAL) void literals(); -#endif void userDefinedLiterals(); void eightBitLiterals_data(); void eightBitLiterals(); @@ -6420,8 +6418,6 @@ void tst_QString::toUpperLower_icu() } #endif // icu -#if !defined(QT_NO_UNICODE_LITERAL) -// Only tested on c++0x compliant compiler or gcc void tst_QString::literals() { QString str(QStringLiteral("abcd")); @@ -6444,7 +6440,6 @@ void tst_QString::literals() QVERIFY(str2.data() != s); QVERIFY(str2.capacity() >= str2.length()); } -#endif void tst_QString::userDefinedLiterals() { |