From 84973c590d2e5f9f7eb221c40f065782e91b0d29 Mon Sep 17 00:00:00 2001 From: "James B. Pollack" Date: Wed, 14 Oct 2015 21:17:19 -0700 Subject: [PATCH 1/2] Update ToolWindow.h --- interface/src/ui/ToolWindow.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/interface/src/ui/ToolWindow.h b/interface/src/ui/ToolWindow.h index 43ab1ac2ce..03ae85a418 100644 --- a/interface/src/ui/ToolWindow.h +++ b/interface/src/ui/ToolWindow.h @@ -7,7 +7,7 @@ // // Distributed under the Apache License, Version 2.0. // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html -// +// #ifndef hifi_ToolWindow_h #define hifi_ToolWindow_h From c8b6fed0e041de9e59192543a423e990f8614d19 Mon Sep 17 00:00:00 2001 From: "James B. Pollack" Date: Wed, 14 Oct 2015 21:18:17 -0700 Subject: [PATCH 2/2] Update ToolWindow.cpp --- interface/src/ui/ToolWindow.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/interface/src/ui/ToolWindow.cpp b/interface/src/ui/ToolWindow.cpp index f5dcf279c9..c7de8b7424 100644 --- a/interface/src/ui/ToolWindow.cpp +++ b/interface/src/ui/ToolWindow.cpp @@ -122,7 +122,6 @@ void ToolWindow::addDockWidget(Qt::DockWidgetArea area, QDockWidget* dockWidget, QMainWindow::addDockWidget(area, dockWidget, orientation); - QDockWidget* lastDockWidget = dockWidget; lastDockWidget->setTitleBarWidget(new QWidget());