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

Remove meaningless QT_NO_UNICODE_LITERAL check in QString literal tests

Browse Source 
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>
This commit is contained in:
Andrei Golubev 2021-03-04 17:20:52 +01:00
parent b1377ed02d
commit c34f51d58c
2 changed files with 0 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
tests/auto/corelib/text/qbytearray/tst_qbytearray.cpp
View File

@ -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"));

5
tests/auto/corelib/text/qstring/tst_qstring.cpp
View File

@ -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()
{