Revert "Initialise Qt earlier, and whenever available"

Temporary workaround for
http://sourceforge.net/p/flightgear/codetickets/1819/

This reverts commit 3e67417bf009493f8f2ae1e362b6014028fc3cbf.

diff --git a/src/Main/bootstrap.cxx b/src/Main/bootstrap.cxx
index 5bad23257fedacdc1d6728dc45dd02664271fe52..f15c9098ad0efe40c99fe5125dc2a0365a50a194 100644 (file)
--- a/src/Main/bootstrap.cxx
+++ b/src/Main/bootstrap.cxx
@@ -67,9 +67,6 @@
 
 #include "fg_os.hxx"
 
-#ifdef HAVE_QT
-        #include <GUI/QtLauncher.hxx>
-#endif
 #if defined(HAVE_CRASHRPT)
        #include <CrashRpt.h>
 
@@ -230,9 +227,6 @@ int main ( int argc, char **argv )
         // when fg_terminate runs, which causes crashes.
         osg::Texture::getTextureObjectManager(0);
         osg::GLBufferObjectManager::getGLBufferObjectManager(0);
-#endif
-#ifdef HAVE_QT
-        flightgear::initApp(argc, argv);
 #endif
         std::set_terminate(fg_terminate);
         atexit(fgExitCleanup);

diff --git a/src/Main/main.cxx b/src/Main/main.cxx
index e67cb1804eef3f9657ec1841900ff2f15b804d68..2434d2058adcd3c46d4c18aeea3e09395ef427d1 100644 (file)
--- a/src/Main/main.cxx
+++ b/src/Main/main.cxx
@@ -449,6 +449,7 @@ int fgMainInit( int argc, char **argv )
     showLauncher |= (::getenv("FG_LAUNCHER") != 0);
 
     if (showLauncher) {
+        flightgear::initApp(argc, argv);
         if (!flightgear::runLauncherDialog()) {
             return EXIT_SUCCESS;
         }