From 05bd92734072e1b38a4fcb4b464ba76666a56d23 Mon Sep 17 00:00:00 2001 From: Don Gagne Date: Wed, 4 Mar 2015 18:08:08 -0800 Subject: [PATCH] Don't force visibility of toolbar Although this should theoretically be a no-op it causes a crash in Windows when running unit tests. Also parent toolbar in constructor. --- src/ui/MainWindow.cc | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/ui/MainWindow.cc b/src/ui/MainWindow.cc index 117913fcf..d86f53a64 100644 --- a/src/ui/MainWindow.cc +++ b/src/ui/MainWindow.cc @@ -171,9 +171,7 @@ MainWindow::MainWindow(QSplashScreen* splashScreen) QDockWidget* widget = new QDockWidget(this); widget->setObjectName("ToolBarDockWidget"); qmlRegisterType("QGroundControl.MainToolBar", 1, 0, "MainToolBar"); - _mainToolBar = new MainToolBar(); - _mainToolBar->setParent(widget); - _mainToolBar->setVisible(true); + _mainToolBar = new MainToolBar(widget); widget->setWidget(_mainToolBar); widget->setFeatures(QDockWidget::NoDockWidgetFeatures); widget->setTitleBarWidget(new QWidget(this)); // Disables the title bar -- 2.22.0