Merge remote-tracking branch 'origin/dev' into wip/qt6

Change-Id: Ib719a6249069e6bd6c9311bbec7f364855ab82ff

1 files changed, 17 insertions, 0 deletions

diff --git a/tests/auto/corelib/text/qstring/qstring.pro b/tests/auto/corelib/text/qstring/qstring.pro
new file mode 100644
index 0000000000..ec8a9b5df5
--- /dev/null
+++ b/tests/auto/corelib/text/qstring/qstring.pro
@@ -0,0 +1,17 @@
+CONFIG += testcase
+TARGET = tst_qstring
+QT = core-private testlib
+SOURCES = tst_qstring.cpp
+DEFINES += QT_NO_CAST_TO_ASCII
+qtConfig(icu): DEFINES += QT_USE_ICU
+qtConfig(c++11): CONFIG += c++11
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
+
+!qtConfig(doubleconversion):!qtConfig(system-doubleconversion) {
+    DEFINES += QT_NO_DOUBLECONVERSION
+}
+
+mac {
+    OBJECTIVE_SOURCES += tst_qstring_mac.mm
+    LIBS += -framework Foundation
+}