diff options
| author | Lars Knoll <lars.knoll@theqtcompany.com> | 2015-08-07 17:25:45 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2015-08-09 23:06:01 +0000 |
| commit | 9100b85cc54bc26d1218623ad0f65978c1600b2c (patch) | |
| tree | 0423add576810ae366d9f6da68782b2af3b54751 /tests/auto | |
| parent | 6503b4924f76673487e35994e2504c2a9d15bd97 (diff) | |
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 <simon.hausmann@theqtcompany.com>
Diffstat (limited to 'tests/auto')
| -rw-r--r-- | tests/auto/qml/qqmlconsole/tst_qqmlconsole.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
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"); |