Merge branch '1.2'

src/DockWidgetBase.h

@@ -457,6 +457,9 @@ protected:
     void onShown(bool spontaneous);
     void onHidden(bool spontaneous);
 
+    ///@reimp
+    bool eventFilter(QObject *, QEvent *) override;
+
 #ifndef PYTHON_BINDINGS //Pyside bug: https://bugreports.qt.io/projects/PYSIDE/issues/PYSIDE-1327
     void onCloseEvent(QCloseEvent *e) override;
     bool onResize(QSize newSize) override;
@@ -537,9 +540,6 @@ private:
     ///@brief Updates the floatAction state
     void updateFloatAction();
 
-    ///@reimp
-    bool eventFilter(QObject *, QEvent *) override;
-
     class Private;
     Private *const d;
 };