From 6481deb8c8bac5631ea98139e3ac067b35340412 Mon Sep 17 00:00:00 2001 From: Nikolai Kosjar Date: Tue, 23 Oct 2012 12:10:08 +0200 Subject: [PATCH] C++: Fix crashes in tests with Qt5. tst_Semantic and tst_CodeFormatter crash with QTEST_APPLESS_MAIN since they need to access some font settings via QTextDocument / Q*Application. Use QTEST_MAIN instead. Change-Id: Id85228acb6006cfaee41c634c6a32b6c23a70105 Reviewed-by: Eike Ziller Reviewed-by: Erik Verbruggen --- tests/auto/cplusplus/codeformatter/tst_codeformatter.cpp | 2 +- tests/auto/cplusplus/semantic/tst_semantic.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/auto/cplusplus/codeformatter/tst_codeformatter.cpp b/tests/auto/cplusplus/codeformatter/tst_codeformatter.cpp index ee072b2ceaa..7e340d12020 100644 --- a/tests/auto/cplusplus/codeformatter/tst_codeformatter.cpp +++ b/tests/auto/cplusplus/codeformatter/tst_codeformatter.cpp @@ -2060,7 +2060,7 @@ void tst_CodeFormatter::attributeInAccessSpecifier() checkIndent(data); } -QTEST_APPLESS_MAIN(tst_CodeFormatter) +QTEST_MAIN(tst_CodeFormatter) #include "tst_codeformatter.moc" diff --git a/tests/auto/cplusplus/semantic/tst_semantic.cpp b/tests/auto/cplusplus/semantic/tst_semantic.cpp index df23ae319f1..1b30a95a043 100644 --- a/tests/auto/cplusplus/semantic/tst_semantic.cpp +++ b/tests/auto/cplusplus/semantic/tst_semantic.cpp @@ -732,5 +732,5 @@ void tst_Semantic::diagnostic_error() QCOMPARE(doc->globals->memberCount(), 1U); } -QTEST_APPLESS_MAIN(tst_Semantic) +QTEST_MAIN(tst_Semantic) #include "tst_semantic.moc"