[composer] Allow floating docks

Now that composer windows are deleted on close, we no longer suffer from the Qt bug which keeps floating docks open when the window is hidden
qgis · Mar 21, 2017 · 8478b7a · 8478b7a
1 parent 9be22e1
commit 8478b7a
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/src/app/composer/qgscomposer.cpp b/src/app/composer/qgscomposer.cpp
@@ -115,7 +115,9 @@ QgsComposer::QgsComposer( QgsComposition *composition )
   setupUi( this );
   setWindowTitle( mComposition->name() );
   setAttribute( Qt::WA_DeleteOnClose );
-
+#if QT_VERSION >= 0x050600
+  setDockOptions( dockOptions() | QMainWindow::GroupedDragging ) ;
+#endif
   setupTheme();
 
   QgsSettings settings;
@@ -581,7 +583,6 @@ QgsComposer::QgsComposer( QgsComposition *composition )
   QList<QDockWidget *> docks = findChildren<QDockWidget *>();
   Q_FOREACH ( QDockWidget *dock, docks )
   {
-    dock->setFeatures( QDockWidget::DockWidgetMovable | QDockWidget::DockWidgetClosable );
     connect( dock, &QDockWidget::visibilityChanged, this, &QgsComposer::dockVisibilityChanged );
   }