From 28a77ed1d9186698c77a8b7c8773ea5dc359bc46 Mon Sep 17 00:00:00 2001 From: Edward d'Auvergne Date: Thu, 29 Mar 2018 17:19:13 +0200 Subject: [PATCH] TestSuite: Only include Qt components if FG_TESTLIB is not set. This is a fix for abc4cdb4c0d1b234ea9507c3f88db82311d12389 that allows fgfs to build, without having to expand the fgtestlib to include Qt GUI sources. --- test_suite/helpers/globals.cxx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test_suite/helpers/globals.cxx b/test_suite/helpers/globals.cxx index 8d3aea0f9..094e01e0d 100644 --- a/test_suite/helpers/globals.cxx +++ b/test_suite/helpers/globals.cxx @@ -3,7 +3,7 @@ #include "globals.hxx" -#if defined(HAVE_QT) +#if defined(HAVE_QT) && !defined(FG_TESTLIB) #include #endif @@ -99,7 +99,7 @@ namespace fgtest { // The QApplication instance must be destroyed before exit() begins, see // (otherwise, segfault). -#if defined(HAVE_QT) +#if defined(HAVE_QT) && !defined(FG_TESTLIB) flightgear::shutdownQtApp(); #endif