Merge remote-tracking branch 'origin/KDE/4.9'

1 files changed, 4 insertions, 0 deletions

diff --git a/src/dolphindockwidget.cpp b/src/dolphindockwidget.cpp
index 72e06a656..0d8aea7bd 100644
--- a/src/dolphindockwidget.cpp
+++ b/src/dolphindockwidget.cpp
@@ -68,8 +68,12 @@ void DolphinDockWidget::setLocked(bool lock)
                 m_dockTitleBar = new DolphinDockTitleBar(this);
             }
             setTitleBarWidget(m_dockTitleBar);
+            setFeatures(QDockWidget::NoDockWidgetFeatures);
         } else {
             setTitleBarWidget(0);
+            setFeatures(QDockWidget::DockWidgetMovable |
+                        QDockWidget::DockWidgetFloatable |
+                        QDockWidget::DockWidgetClosable);
         }
     }
 }