Merge branch 'release/20.12'

1 files changed, 7 insertions, 0 deletions

diff --git a/src/main.cpp b/src/main.cpp
index ef2905d77..a4b1b1963 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -21,6 +21,7 @@
 #include <KCrash>
 #include <KDBusService>
 #include <KLocalizedString>
+#include <KToolBar>
 #include <Kdelibs4ConfigMigrator>
 #include <KConfigGui>
 
@@ -213,6 +214,12 @@ extern "C" Q_DECL_EXPORT int kdemain(int argc, char **argv)
             }
         }
     }
+    Qt::ToolBarArea area = mainWindow->toolBarArea(mainWindow->toolBar());
+    if (area != Qt::TopToolBarArea && area != Qt::BottomToolBarArea) {
+        // Migrate users with disabled tool bar positions.
+        // Remove this a few years from now (2020).
+        mainWindow->addToolBar(Qt::TopToolBarArea, mainWindow->toolBar());
+    }
 
 #ifdef HAVE_KUSERFEEDBACK
     auto feedbackProvider = DolphinFeedbackProvider::instance();