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>bb10
parent
946c701883
commit
fd3db1dc3a
|
|
@ -2,7 +2,7 @@ CONFIG += testcase
|
||||||
TARGET = tst_qstring
|
TARGET = tst_qstring
|
||||||
QT = core-private testlib
|
QT = core-private testlib
|
||||||
SOURCES = tst_qstring.cpp
|
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
|
qtConfig(c++11): CONFIG += c++11
|
||||||
DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
|
DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue