diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-10-26 01:01:13 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-10-26 01:01:14 +0200 |
| commit | 86e74d60d2ab66a142a3ed02aabcadaab53b94ed (patch) | |
| tree | 11ebf7349863272acb4821ceeb99c394407c5121 /tests/auto/corelib/text/qstring/qstring.pro | |
| parent | 9d504e1150e4bd49d34aba5cee938d1fd9f7e80c (diff) | |
| parent | 48603baf949f12928476f11e17fd387b8903d971 (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15
Change-Id: I208a36bf1c88c8291baaa5ca8fe8e838bc9d7aea
Diffstat (limited to 'tests/auto/corelib/text/qstring/qstring.pro')
| -rw-r--r-- | tests/auto/corelib/text/qstring/qstring.pro | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/tests/auto/corelib/text/qstring/qstring.pro b/tests/auto/corelib/text/qstring/qstring.pro index ec8a9b5df5..5fff5530b7 100644 --- a/tests/auto/corelib/text/qstring/qstring.pro +++ b/tests/auto/corelib/text/qstring/qstring.pro @@ -2,8 +2,7 @@ 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 +# DEFINES += QT_NO_CAST_TO_ASCII # actively #undef-ed by tst_qstring.cpp qtConfig(c++11): CONFIG += c++11 DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 |