Merge branch 'Applications/17.12'

This commit is contained in:
Nathaniel Graham 2018-01-30 17:06:43 -07:00
commit 0dd0b65bf0

View file

@ -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);