Preparing for upstream merge

src/config/configwindow.cpp

@@ -20,7 +20,6 @@
 #include "src/config/geneneralconf.h"
 #include "src/config/shortcutswidget.h"
 #include "src/config/strftimechooserwidget.h"
-#include "src/config/uploadstorageconfig.h"
 #include "src/config/visualseditor.h"
 #include "src/utils/colorutils.h"
 #include "src/utils/confighandler.h"
@@ -77,12 +76,6 @@ ConfigWindow::ConfigWindow(QWidget* parent)
     m_shortcuts = new ShortcutsWidget();
     addTab(m_shortcuts, QIcon(modifier + "shortcut.svg"), tr("Shortcuts"));
 
-    // upload storage configuration
-    m_uploadStorageConfig = new UploadStorageConfig();
-    addTab(m_uploadStorageConfig,
-           QIcon(modifier + "cloud-upload.svg"),
-           tr("Storage"));
-
     // connect update sigslots
     connect(this,
             &ConfigWindow::updateChildren,