From fd3db1dc3a9177cc155dc22fc14490b3ff5ad653 Mon Sep 17 00:00:00 2001 From: Edward Welbourne Date: Wed, 9 Oct 2019 12:10:54 +0200 Subject: 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 Reviewed-by: Thiago Macieira --- tests/auto/corelib/text/qstring/qstring.pro | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tests/auto/corelib/text/qstring') 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 -- cgit v1.2.3