mirror of
https://github.com/JulianGro/overte.git
synced 2025-04-25 16:55:07 +02:00
cleanup merge
This commit is contained in:
commit
aee11d4c06
2 changed files with 2 additions and 2 deletions
|
@ -127,7 +127,7 @@ void ToolWindow::addDockWidget(Qt::DockWidgetArea area, QDockWidget* dockWidget,
|
|||
QList<QDockWidget*> dockWidgets = findChildren<QDockWidget*>();
|
||||
|
||||
QMainWindow::addDockWidget(area, dockWidget, orientation);
|
||||
|
||||
|
||||
QDockWidget* lastDockWidget = dockWidget;
|
||||
|
||||
foreach(QDockWidget* nextDockWidget, dockWidgets) {
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue