mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

tests: deactivate testQML

Browse source 
Qt 5.13 (and maybe 5.12) introduced new macros for QUICK_TEST_MAIN_WITH_SETUP
and as testQML is loosely based on this macro it needs to be redesigned.

Before Qt 5.11 it was not possible to do QML testing that depended on
classes being registred with the macro QUICK_TEST_MAIN_WITH_SETUP,
therefore it was nessecary to make an independent implementation of
main().

For now, let the main do a "return 0", to keep the test in the loop.

Signed-off-by: Jan Iversen <jan@casacondor.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
jan Iversen 2019-12-28 22:12:48 +01:00 • committed by Dirk Hohndel
parent d82840b468
commit 12dc98c359
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
tests/testqml.cpp
View file

@ -7,7 +7,8 @@
// main loosely copied from QUICK_TEST_MAIN_WITH_SETUP macro
int main(int argc, char **argv)
{
#if QT_VERSION < QT_VERSION_CHECK(5, 11, 0)
//#if QT_VERSION < QT_VERSION_CHECK(5, 11, 0)
#ifndef THIS_IS_REPAIRED
return 0;
#else
QTEST_ADD_GPU_BLACKLIST_SUPPORT