diff options
| -rw-r--r-- | src/testlib/qtestblacklist.cpp | 4 | ||||
| -rw-r--r-- | tests/auto/network/access/http2/tst_http2.cpp | 4 | ||||
| -rw-r--r-- | tests/auto/sql/kernel/qsqlquery/tst_qsqlquery.cpp | 6 |
3 files changed, 9 insertions, 5 deletions
diff --git a/src/testlib/qtestblacklist.cpp b/src/testlib/qtestblacklist.cpp index 4ca3ec128f..58b60c2262 100644 --- a/src/testlib/qtestblacklist.cpp +++ b/src/testlib/qtestblacklist.cpp @@ -52,6 +52,8 @@ QT_BEGIN_NAMESPACE +using namespace Qt::StringLiterals; + /* The BLACKLIST file format is a grouped listing of keywords. @@ -320,7 +322,7 @@ void checkBlackLists(const char *slot, const char *data, const char *global) } if (!ignore && global) { - s = slot + ":"_qba + global; + s = slot + ":"_ba + global; ignore = ignoredTests->find(s) != ignoredTests->end(); if (!ignore && data) { s = (s + ':') + data; diff --git a/tests/auto/network/access/http2/tst_http2.cpp b/tests/auto/network/access/http2/tst_http2.cpp index 27f0b045a5..1a31959a42 100644 --- a/tests/auto/network/access/http2/tst_http2.cpp +++ b/tests/auto/network/access/http2/tst_http2.cpp @@ -62,6 +62,8 @@ Q_DECLARE_METATYPE(QNetworkRequest::Attribute) QT_BEGIN_NAMESPACE +using namespace Qt::StringLiterals; + QHttp2Configuration qt_defaultH2Configuration() { QHttp2Configuration config; @@ -1245,7 +1247,7 @@ void tst_Http2::redirect() QFETCH(const int, maxRedirects); QFETCH(const int, redirectCount); QFETCH(const bool, success); - const QByteArray redirectUrl = "/b.html"_qba; + const QByteArray redirectUrl = "/b.html"_ba; clearHTTP2State(); serverPort = 0; diff --git a/tests/auto/sql/kernel/qsqlquery/tst_qsqlquery.cpp b/tests/auto/sql/kernel/qsqlquery/tst_qsqlquery.cpp index 3ddecfe8cc..32dae3fb55 100644 --- a/tests/auto/sql/kernel/qsqlquery/tst_qsqlquery.cpp +++ b/tests/auto/sql/kernel/qsqlquery/tst_qsqlquery.cpp @@ -814,7 +814,7 @@ void tst_QSqlQuery::oraClob() .arg(clobby))); q.addBindValue(1); q.addBindValue("bubu"); - q.addBindValue("bubu"_qba); + q.addBindValue("bubu"_ba); QVERIFY_SQL(q, exec()); QVERIFY_SQL(q, exec(QLatin1String("select bl, cl from %1 where id = 1").arg(clobby))); @@ -827,7 +827,7 @@ void tst_QSqlQuery::oraClob() .arg(clobby))); q.addBindValue(2); q.addBindValue(u"lala"_s, QSql::Binary); - q.addBindValue("lala"_qba, QSql::Binary); + q.addBindValue("lala"_ba, QSql::Binary); QVERIFY_SQL(q, exec()); QVERIFY_SQL(q, exec(QLatin1String("select bl, cl from %1 where id = 2").arg(clobby))); @@ -1817,7 +1817,7 @@ void tst_QSqlQuery::writeNull() // QUuid. QMultiHash<QString, QVariant> nullableTypes = { {"varchar(20)", u"not null"_s}, - {"varchar(20)", "not null"_qba}, + {"varchar(20)", "not null"_ba}, {"date", QDateTime::currentDateTime()}, {"date", QDate::currentDate()}, {"date", QTime::currentTime()}, |