diff options
| author | Edward Welbourne <edward.welbourne@qt.io> | 2019-10-09 12:10:54 +0200 |
|---|---|---|
| committer | Edward Welbourne <edward.welbourne@qt.io> | 2019-10-25 11:41:44 +0200 |
| commit | fd3db1dc3a9177cc155dc22fc14490b3ff5ad653 (patch) | |
| tree | 9eb6bd5159035f9440a1bbf18d3d85154ba508cf /tests/auto/corelib/text | |
| parent | 946c7018838a1d6c62b0a1b1baf3ad6a960d2e00 (diff) | |
Don't try to define QT_NO_CAST_TO_ASCII when the test undefines it
The qmake config for tst_QString tried to impose QT_NO_CAST_TO_ASCII
on it, but the source file explicitly #undef-s this symbol and its
friends. Leave the define commented out in the .pro so that a comment
can explain why it's no good.
Change-Id: I7620f4e104f0cdab05fdc246b903c40026e63d76
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'tests/auto/corelib/text')
| -rw-r--r-- | tests/auto/corelib/text/qstring/qstring.pro | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/corelib/text/qstring/qstring.pro b/tests/auto/corelib/text/qstring/qstring.pro index 3a8c98cd6c..5fff5530b7 100644 --- a/tests/auto/corelib/text/qstring/qstring.pro +++ b/tests/auto/corelib/text/qstring/qstring.pro @@ -2,7 +2,7 @@ CONFIG += testcase TARGET = tst_qstring QT = core-private testlib SOURCES = tst_qstring.cpp -DEFINES += QT_NO_CAST_TO_ASCII +# 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 |