summaryrefslogtreecommitdiffstats
path: root/tests/auto/corelib/text/qstring/qstring.pro
diff options
context:
space:
mode:
authorMarc Mutz <marc.mutz@kdab.com>2020-06-22 11:44:34 +0200
committerMarc Mutz <marc.mutz@kdab.com>2020-06-23 06:31:28 +0000
commit44da43e8e42272c61cf12c05314387c785bd9749 (patch)
tree5a57ddebd03eb55e937e48fff310d08cedaf5f58 /tests/auto/corelib/text/qstring/qstring.pro
parent1304040e5d5af0575cac43aaf1424f72472c7b23 (diff)
QString: add char8_t overload of fromUtf8()
Use the overload-with-template trick from P1423 to avoid ambiguities when existing callers pass 0 or nullptr. Add a qdoc-ignored macro to hide the fact that the overload is a template. [ChangeLog][QtCore][QString] Added char8_t overload of fromUtf8(). Change-Id: Iaa2d365bfa161ef36cc73fa3bad50aabf34d01db Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'tests/auto/corelib/text/qstring/qstring.pro')
-rw-r--r--tests/auto/corelib/text/qstring/qstring.pro3
1 files changed, 2 insertions, 1 deletions
diff --git a/tests/auto/corelib/text/qstring/qstring.pro b/tests/auto/corelib/text/qstring/qstring.pro
index 5fff5530b7..9a478b134e 100644
--- a/tests/auto/corelib/text/qstring/qstring.pro
+++ b/tests/auto/corelib/text/qstring/qstring.pro
@@ -3,7 +3,8 @@ TARGET = tst_qstring
QT = core-private testlib
SOURCES = tst_qstring.cpp
# DEFINES += QT_NO_CAST_TO_ASCII # actively #undef-ed by tst_qstring.cpp
-qtConfig(c++11): CONFIG += c++11
+qtConfig(c++1z): CONFIG += c++1z
+qtConfig(c++2a): CONFIG += c++2a
DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
!qtConfig(doubleconversion):!qtConfig(system-doubleconversion) {