diff options
| author | Nathaniel Graham <[email protected]> | 2018-01-30 17:06:43 -0700 |
|---|---|---|
| committer | Nathaniel Graham <[email protected]> | 2018-01-30 17:06:43 -0700 |
| commit | 0dd0b65bf02f52da0d2e9d270160e69b81a357ca (patch) | |
| tree | c77d29aa41e254ba591045d94cfd94b8472538bc /src/dolphinmainwindow.cpp | |
| parent | 0b130dd57e594d7433141483aa162e4414a9d07b (diff) | |
| parent | 58f8b515b8efc19c1b78000e2691c40eeccee30f (diff) | |
Merge branch 'Applications/17.12'
Diffstat (limited to 'src/dolphinmainwindow.cpp')
| -rw-r--r-- | src/dolphinmainwindow.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/dolphinmainwindow.cpp b/src/dolphinmainwindow.cpp index 62b07f5a2..95b05785f 100644 --- a/src/dolphinmainwindow.cpp +++ b/src/dolphinmainwindow.cpp @@ -1299,7 +1299,6 @@ void DolphinMainWindow::setupDockWidgets() DolphinDockWidget* terminalDock = new DolphinDockWidget(i18nc("@title:window Shell terminal", "Terminal")); terminalDock->setLocked(lock); terminalDock->setObjectName(QStringLiteral("terminalDock")); - terminalDock->setAllowedAreas(Qt::TopDockWidgetArea | Qt::BottomDockWidgetArea); m_terminalPanel = new TerminalPanel(terminalDock); m_terminalPanel->setCustomContextMenuActions({lockLayoutAction}); terminalDock->setWidget(m_terminalPanel); |