From 9100b85cc54bc26d1218623ad0f65978c1600b2c Mon Sep 17 00:00:00 2001 From: Lars Knoll Date: Fri, 7 Aug 2015 17:25:45 +0200 Subject: Don't call the test method assert Mac OS X apparently uses a macro for assert(), completely breaking compilation of this file Change-Id: I51379da6e0c702e4d021dcd9a84af39889d24c2d Reviewed-by: Simon Hausmann --- tests/auto/qml/qqmlconsole/tst_qqmlconsole.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'tests/auto/qml/qqmlconsole') diff --git a/tests/auto/qml/qqmlconsole/tst_qqmlconsole.cpp b/tests/auto/qml/qqmlconsole/tst_qqmlconsole.cpp index 1ee675a91d..98e3a53b81 100644 --- a/tests/auto/qml/qqmlconsole/tst_qqmlconsole.cpp +++ b/tests/auto/qml/qqmlconsole/tst_qqmlconsole.cpp @@ -47,7 +47,7 @@ private slots: void logging(); void tracing(); void profiling(); - void assert(); + void testAssert(); void exception(); private: @@ -122,7 +122,7 @@ void tst_qqmlconsole::profiling() delete object; } -void tst_qqmlconsole::assert() +void tst_qqmlconsole::testAssert() { QUrl testUrl = testFileUrl("assert.qml"); -- cgit v1.2.3