Merge pull request #1746 from beigenmann/master

MainToolBar blank on Ubunto 15.04

src/GAudioOutput.cc

@@ -56,16 +56,14 @@ GAudioOutput::GAudioOutput(QObject *parent) :
     worker->moveToThread(thread);
     connect(this, &GAudioOutput::textToSpeak, worker, &QGCAudioWorker::say);
     connect(this, &GAudioOutput::beepOnce, worker, &QGCAudioWorker::beep);
+    connect(thread, &QThread::finished, thread, &QObject::deleteLater);
+    connect(thread, &QThread::finished, worker, &QObject::deleteLater);
     thread->start();
 }
 
 GAudioOutput::~GAudioOutput()
 {
     thread->quit();
-    thread->wait();
-
-    delete worker;
-    delete thread;
 }
 
 

src/ui/MainWindow.cc

@@ -143,6 +143,10 @@ MainWindow::MainWindow(QSplashScreen* splashScreen)
         connect(this, &MainWindow::initStatusChanged, splashScreen, &QSplashScreen::showMessage);
     }
 
+    // Qt 4/5 on Ubuntu does place the native menubar correctly so on Linux we revert back to in-window menu bar.
+#ifdef Q_OS_LINUX
+    menuBar()->setNativeMenuBar(false);
+#endif
     // Setup user interface
     loadSettings();
     emit initStatusChanged(tr("Setting up user interface"), Qt::AlignLeft | Qt::AlignBottom, QColor(62, 93, 141));
@@ -160,13 +164,6 @@ MainWindow::MainWindow(QSplashScreen* splashScreen)
     // Setup corners
     setCorner(Qt::BottomRightCorner, Qt::BottomDockWidgetArea);
 
-    // Qt 4 on Ubuntu does place the native menubar correctly so on Linux we revert back to in-window menu bar.
-    // TODO: Check that this is still necessary on Qt5 on Ubuntu
-
-#ifdef Q_OS_LINUX
-    menuBar()->setNativeMenuBar(false);
-#endif
-
     // On Mobile devices, we don't want any main menus at all.
 #ifdef __mobile__
     menuBar()->setNativeMenuBar(false);