summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorAndre Hartmann <aha_1980@gmx.de>2017-10-05 13:56:07 +0200
committerAndré Hartmann <aha_1980@gmx.de>2017-10-05 12:47:05 +0000
commit82b22a552fdeb9c3818bab88612e0c11a208b09d (patch)
tree9be92327edb1d994ad034b1ba82ce82936efde7c /tests
parent2564e8d782d7fcf262084b6d5e15b13d395d22ad (diff)
downloadqt-creator-82b22a552fdeb9c3818bab88612e0c11a208b09d.tar.gz
QMake: Fix build with b884f6fdbc1f and BUILD_TESTS enabled
qchar.h: In member function ‘QMakeEvaluator::VisitReturn QMakeEvaluator::evaluateBuiltinConditional( int, const ProKey&, const ProStringList&)’: qchar.h:562:5: error: ‘QChar::QChar(char)’ is private QChar(char c) Q_DECL_NOTHROW; Change-Id: Idd25b20ecf68a2e801b73e916a5359ff3fc7a86f Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Diffstat (limited to 'tests')
-rw-r--r--tests/manual/proparser/testreader.pro2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/manual/proparser/testreader.pro b/tests/manual/proparser/testreader.pro
index 022ac67667..a7b7d74cd3 100644
--- a/tests/manual/proparser/testreader.pro
+++ b/tests/manual/proparser/testreader.pro
@@ -40,6 +40,6 @@ HEADERS += \
RESOURCES += proparser.qrc
DEFINES += QMAKE_BUILTIN_PRFS
-DEFINES += QT_NO_CAST_TO_ASCII QT_NO_CAST_FROM_ASCII
+DEFINES += QT_NO_CAST_TO_ASCII QT_RESTRICTED_CAST_FROM_ASCII
DEFINES += QT_USE_FAST_OPERATOR_PLUS QT_USE_FAST_CONCATENATION
DEFINES += PROEVALUATOR_FULL PROEVALUATOR_CUMULATIVE PROEVALUATOR_INIT_PROPS