From 82b22a552fdeb9c3818bab88612e0c11a208b09d Mon Sep 17 00:00:00 2001 From: Andre Hartmann Date: Thu, 5 Oct 2017 13:56:07 +0200 Subject: [PATCH] QMake: Fix build with b884f6fdbc1f and BUILD_TESTS enabled MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 --- tests/manual/proparser/testreader.pro | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/manual/proparser/testreader.pro b/tests/manual/proparser/testreader.pro index 022ac67667c..a7b7d74cd3c 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