fly/flightgear
1
0
Fork 0
Code Activity

TestSuite: Only include Qt components if FG_TESTLIB is not set.

Browse source 
This is a fix for abc4cdb4c0 that allows fgfs to
build, without having to expand the fgtestlib to include Qt GUI sources.
This commit is contained in:
Edward d'Auvergne 2018-03-29 17:19:13 +02:00
parent abc4cdb4c0
commit 28a77ed1d9
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
test_suite/helpers/globals.cxx
View file

@ -3,7 +3,7 @@
#include "globals.hxx" #include "globals.hxx"
#if defined(HAVE_QT) #if defined(HAVE_QT) && !defined(FG_TESTLIB)
#include <GUI/QtLauncher.hxx> #include <GUI/QtLauncher.hxx>
#endif #endif
@ -99,7 +99,7 @@ namespace fgtest
{ {
// The QApplication instance must be destroyed before exit() begins, see // The QApplication instance must be destroyed before exit() begins, see
// <https://bugreports.qt.io/browse/QTBUG-48709> (otherwise, segfault). // <https://bugreports.qt.io/browse/QTBUG-48709> (otherwise, segfault).
#if defined(HAVE_QT) #if defined(HAVE_QT) && !defined(FG_TESTLIB)
flightgear::shutdownQtApp(); flightgear::shutdownQtApp();
#endif #endif