Merge branch '1.2'

2020-12-17 20:38:49 +00:00
parent be0f72ca25 4635405fb5
commit 3b1ac9a2d0
12 changed files with 123 additions and 83 deletions
--- a/src/MainWindowBase.cpp
+++ b/src/MainWindowBase.cpp
@@ -385,7 +385,7 @@ void MainWindowBase::overlayOnSideBar(DockWidgetBase *dw)
        return;

    const SideBar *sb = sideBarForDockWidget(dw);
-    if (sb == nullptr) {
+    if (!sb) {
        qWarning() << Q_FUNC_INFO << "You need to add the dock widget to the sidebar before you can overlay it";
        return;
    }